From ebf67199ce514549e2b3123d9835314da4bca4a5 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 24 Aug 2017 22:04:18 -0400 Subject: Clock all Video System GGAs; remove device from bootlegs (nw) --- src/mame/drivers/aerofgt.cpp | 36 ++++++++++++++++++------------------ src/mame/drivers/f1gp.cpp | 6 +++--- src/mame/drivers/pipedrm.cpp | 6 ++++-- src/mame/drivers/rpunch.cpp | 2 +- src/mame/drivers/tail2nos.cpp | 2 +- src/mame/drivers/welltris.cpp | 2 +- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 3c4c8575375..894f46424c3 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -158,7 +158,7 @@ static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w) AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(pspikesb_oki_banking_w) - AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state ) @@ -194,7 +194,7 @@ static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_RANGE(0xfff004, 0xfff005) AM_WRITE(aerofgt_bg1scrolly_w) AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) - AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state ) @@ -238,7 +238,7 @@ static ADDRESS_MAP_START( karatblzbl_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff00a, 0x0ff00b) AM_READ8(pending_command_r, 0x00ff) AM_WRITE(aerofgt_bg1scrolly_w) AM_RANGE(0x0ff00c, 0x0ff00d) AM_WRITE(aerofgt_bg2scrollx_w) AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(aerofgt_bg2scrolly_w) - AM_RANGE(0x0ff400, 0x0ff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0x0ff400, 0x0ff403) AM_WRITENOP // GGA access ADDRESS_MAP_END static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) @@ -342,7 +342,7 @@ static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0fe00e, 0x0fe00f) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0xff00) AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP AM_RANGE(0x0fe012, 0x0fe013) AM_WRITENOP // MSB = watchdog? - AM_RANGE(0x0fe400, 0x0fe403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0x0fe400, 0x0fe403) AM_WRITENOP // GGA access AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ AM_RANGE(0x100000, 0x107fff) AM_WRITENOP AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("spriteram3") @@ -372,7 +372,7 @@ static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0fe01e, 0x0fe01f) AM_WRITE(aerfboo2_okim6295_banking_w) // AM_RANGE(0x0fe010, 0x0fe011) AM_WRITENOP // AM_RANGE(0x0fe012, 0x0fe013) AM_WRITE(aerfboot_soundlatch_w) - AM_RANGE(0x0fe400, 0x0fe403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0x0fe400, 0x0fe403) AM_WRITENOP // GGA access AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ ADDRESS_MAP_END @@ -390,7 +390,7 @@ static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w) AM_RANGE(0xfff006, 0xfff007) AM_READ8(pending_command_r, 0x00ff) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x00ff) AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(wbbc97_bitmap_enable_w) - AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, aerofgt_state ) @@ -1388,7 +1388,7 @@ static MACHINE_CONFIG_START( pspikes ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(1) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) @@ -1432,7 +1432,7 @@ static MACHINE_CONFIG_START( spikes91 ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) @@ -1468,7 +1468,7 @@ static MACHINE_CONFIG_START( pspikesb ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes) @@ -1502,7 +1502,7 @@ static MACHINE_CONFIG_START( pspikesc ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback ) @@ -1546,7 +1546,7 @@ static MACHINE_CONFIG_START( karatblz ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback ) @@ -1612,7 +1612,7 @@ static MACHINE_CONFIG_START( karatblzbl ) MCFG_VSYSTEM_SPR2_SET_GFXREGION(3) MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode") - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(aerofgt_state,karatblz) @@ -1659,7 +1659,7 @@ static MACHINE_CONFIG_START( spinlbrk ) MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) // doesn't fully initialize palette at start-up ... MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_PRITYPE(1) @@ -1717,7 +1717,7 @@ static MACHINE_CONFIG_START( turbofrc ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback ) @@ -1775,7 +1775,7 @@ static MACHINE_CONFIG_START( aerofgtb ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback ) @@ -1894,7 +1894,7 @@ static MACHINE_CONFIG_START( aerfboot ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) @@ -1934,7 +1934,7 @@ static MACHINE_CONFIG_START( aerfboo2 ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc) @@ -1970,7 +1970,7 @@ static MACHINE_CONFIG_START( wbbc97 ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback ) diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp index d52c8c6f779..93a33a8172e 100644 --- a/src/mame/drivers/f1gp.cpp +++ b/src/mame/drivers/f1gp.cpp @@ -174,7 +174,7 @@ static ADDRESS_MAP_START( f1gpb_cpu1_map, AS_PROGRAM, 16, f1gp_state ) AM_RANGE(0xfff00e, 0xfff00f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xfff00c, 0xfff00d) AM_WRITE(f1gpb_misc_w) AM_RANGE(0xfff010, 0xfff011) AM_WRITENOP - AM_RANGE(0xfff020, 0xfff023) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) + AM_RANGE(0xfff020, 0xfff023) AM_WRITENOP // GGA access AM_RANGE(0xfff050, 0xfff051) AM_READ_PORT("DSW3") AM_RANGE(0xfff800, 0xfff809) AM_RAM AM_SHARE("rozregs") ADDRESS_MAP_END @@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( f1gp ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( f1gp_state, f1gp_old_tile_callback ) @@ -491,7 +491,7 @@ static MACHINE_CONFIG_START( f1gpb ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + //MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) MCFG_VIDEO_START_OVERRIDE(f1gp_state,f1gpb) diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp index bda7aa2d6cc..8dcdf17f17a 100644 --- a/src/mame/drivers/pipedrm.cpp +++ b/src/mame/drivers/pipedrm.cpp @@ -592,7 +592,8 @@ static MACHINE_CONFIG_START( pipedrm ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified + MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w)) MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) @@ -646,7 +647,8 @@ static MACHINE_CONFIG_START( hatris ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified + MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w)) MCFG_VIDEO_START_OVERRIDE(pipedrm_state,hatris) diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp index e9e3f94bc40..c0144e388a1 100644 --- a/src/mame/drivers/rpunch.cpp +++ b/src/mame/drivers/rpunch.cpp @@ -482,7 +482,7 @@ static MACHINE_CONFIG_START( rpunch ) MCFG_PALETTE_ADD("palette", 1024) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2) // verified from rpunch schematics MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(rpunch_state, rpunch_gga_data_w)) MCFG_VIDEO_START_OVERRIDE(rpunch_state,rpunch) diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp index d6f6753ae2d..56b6d9daa1f 100644 --- a/src/mame/drivers/tail2nos.cpp +++ b/src/mame/drivers/tail2nos.cpp @@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( tail2nos ) MCFG_K051316_WRAP(1) MCFG_K051316_CB(tail2nos_state, zoom_callback) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp index 1a57fca55e3..8d0cb8556c0 100644 --- a/src/mame/drivers/welltris.cpp +++ b/src/mame/drivers/welltris.cpp @@ -691,7 +691,7 @@ static MACHINE_CONFIG_START( welltris ) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) + MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0) MCFG_VSYSTEM_SPR2_SET_GFXREGION(1) -- cgit v1.2.3