summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2015-08-16 13:10:55 +0200
committer Dirk Best <mail@dirk-best.de>2015-08-16 19:34:14 +0200
commit1298f9e6ed305c470e9bc8e692f0f3fa1c4a79d6 (patch)
tree1e3dcba5bcd58ac535d4c82b95fcc6d3d85735d7 /src
parent089104a9865b29805df2ba784cc793ec85e07f75 (diff)
ajax: raw screen params, use new k051960 irq support
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/ajax.c12
-rw-r--r--src/mame/includes/ajax.h1
-rw-r--r--src/mame/machine/ajax.c6
3 files changed, 6 insertions, 13 deletions
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 00f89e2a64d..f9a8bcb9e6c 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -167,9 +167,8 @@ WRITE8_MEMBER(ajax_state::volume_callback1)
static MACHINE_CONFIG_START( ajax, ajax_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 12/4 MHz*/
MCFG_CPU_PROGRAM_MAP(ajax_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ajax_state, ajax_interrupt) /* IRQs triggered by the 051960 */
MCFG_CPU_ADD("sub", M6809, 3000000) /* ? */
MCFG_CPU_PROGRAM_MAP(ajax_sub_map)
@@ -181,10 +180,9 @@ static MACHINE_CONFIG_START( ajax, ajax_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MCFG_SCREEN_SIZE(64*8, 32*8)
- MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240)
+// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
+// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(ajax_state, screen_update_ajax)
MCFG_SCREEN_PALETTE("palette")
@@ -198,7 +196,9 @@ static MACHINE_CONFIG_START( ajax, ajax_state )
MCFG_DEVICE_ADD("k051960", K051960, 0)
MCFG_GFX_PALETTE("palette")
+ MCFG_K051960_SCREEN_TAG("screen")
MCFG_K051960_CB(ajax_state, sprite_callback)
+ MCFG_K051960_IRQ_HANDLER(INPUTLINE("maincpu", KONAMI_IRQ_LINE))
MCFG_DEVICE_ADD("k051316", K051316, 0)
MCFG_GFX_PALETTE("palette")
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index 42cdb55ae98..e8197eea633 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -47,7 +47,6 @@ public:
virtual void machine_start();
virtual void machine_reset();
UINT32 screen_update_ajax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- INTERRUPT_GEN_MEMBER(ajax_interrupt);
DECLARE_WRITE8_MEMBER(volume_callback0);
DECLARE_WRITE8_MEMBER(volume_callback1);
K051316_CB_MEMBER(zoom_callback);
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index f684fd5ca28..15d4ca3415b 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -214,9 +214,3 @@ void ajax_state::machine_reset()
m_priority = 0;
m_firq_enable = 0;
}
-
-INTERRUPT_GEN_MEMBER(ajax_state::ajax_interrupt)
-{
- if (m_k051960->k051960_is_irq_enabled())
- device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE);
-}