diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index e429beb2de5..197dda9cc41 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -167,7 +167,7 @@ static ADDRESS_MAP_START( gijoe_map, AS_PROGRAM, 16, gijoe_state ) AM_RANGE(0x1e8000, 0x1e8001) AM_READWRITE(control2_r, control2_w) AM_RANGE(0x1f0000, 0x1f0001) AM_DEVREAD("k053246", k053247_device, k053246_word_r) #if JOE_DEBUG - AM_RANGE(0x110000, 0x110007) AM_DEVREAD_LEGACY("k053246", k053246_reg_word_r) + AM_RANGE(0x110000, 0x110007) AM_DEVREAD("k053246", k053247_device, k053246_reg_word_r) AM_RANGE(0x160000, 0x160007) AM_DEVREAD("k056832", k056832_device, b_word_r) AM_RANGE(0x1a0000, 0x1a001f) AM_DEVREAD("k053251", k053251_device, lsb_r) AM_RANGE(0x1b0000, 0x1b003f) AM_DEVREAD("k056832", k056832_device, word_r) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 36d53a5ac91..e8c6be28299 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1173,9 +1173,9 @@ static ADDRESS_MAP_START( gx_base_memmap, AS_PROGRAM, 32, konamigx_state ) AM_RANGE(0xda0000, 0xda1fff) AM_DEVREADWRITE("k056832", k056832_device, ram_long_r, ram_long_w) AM_RANGE(0xda2000, 0xda3fff) AM_DEVREADWRITE("k056832", k056832_device, ram_long_r, ram_long_w) #if GX_DEBUG - AM_RANGE(0xd40000, 0xd4003f) AM_READ_LEGACY(altK056832_long_r) - AM_RANGE(0xd50000, 0xd500ff) AM_READ_LEGACY(K055555_long_r) - AM_RANGE(0xd4a010, 0xd4a01f) AM_READ_LEGACY(k053247_reg_long_r) + AM_RANGE(0xd40000, 0xd4003f) AM_DEVREAD("k056832", k056832_device, long_r) + AM_RANGE(0xd50000, 0xd500ff) AM_DEVREAD("k055555", k055555_device, k055555_long_r) + AM_RANGE(0xd4a010, 0xd4a01f) AM_DEVREAD("k055673", k055673_device, k053247_reg_long_r) #endif ADDRESS_MAP_END diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 0a927b7964e..fad3f675583 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -271,7 +271,7 @@ static ADDRESS_MAP_START( moo_map, AS_PROGRAM, 16, moo_state ) AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram") #if MOO_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD("k056832", k056832_device, word_r) - AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD_LEGACY("k053246", k053246_reg_word_r) + AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD("k053246", k053247_device, k053246_reg_word_r) AM_RANGE(0x0ca000, 0x0ca01f) AM_DEVREAD("k054338", k054338_device, word_r) AM_RANGE(0x0cc000, 0x0cc01f) AM_DEVREAD("k053251", k053251_device, lsb_r) AM_RANGE(0x0d8000, 0x0d8007) AM_DEVREAD("k056832", k056832_device, b_word_r) @@ -336,7 +336,7 @@ static ADDRESS_MAP_START( bucky_map, AS_PROGRAM, 16, moo_state ) AM_RANGE(0x200000, 0x23ffff) AM_ROM /* data */ #if MOO_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD("k056832", k056832_device, word_r) - AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD_LEGACY("k053246", k053246_reg_word_r) + AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD("k053246", k053247_device, k053246_reg_word_r) AM_RANGE(0x0ca000, 0x0ca01f) AM_DEVREAD("k054338", k054338_device, word_r) AM_RANGE(0x0cc000, 0x0cc01f) AM_DEVREAD("k053251", k053251_device, lsb_r) AM_RANGE(0x0d8000, 0x0d8007) AM_DEVREAD("k056832", k056832_device, b_word_r) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index df149bb9624..7639de9a404 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -247,11 +247,11 @@ static ADDRESS_MAP_START( mystwarr_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0x680000, 0x683fff) AM_DEVREAD("k056832", k056832_device, mw_rom_word_r) AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram") #if MW_DEBUG - AM_RANGE(0x480000, 0x4800ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x482010, 0x48201f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x484000, 0x484007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x48a000, 0x48a01f) AM_READ_LEGACY(K054338_word_r) - AM_RANGE(0x48c000, 0x48c03f) AM_READ_LEGACY(m_word_r) + AM_RANGE(0x480000, 0x4800ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x482010, 0x48201f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x484000, 0x484007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x48a000, 0x48a01f) AM_DEVREAD("k054338", k054338_device, word_r) + AM_RANGE(0x48c000, 0x48c03f) AM_DEVREAD("k056832", k056832_device, word_r) #endif ADDRESS_MAP_END @@ -288,12 +288,12 @@ static ADDRESS_MAP_START( metamrph_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0x320000, 0x321fff) AM_DEVREAD("k053250_1", k053250_device, rom_r) AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram") #if MW_DEBUG - AM_RANGE(0x240000, 0x240007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x244010, 0x24401f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x254000, 0x25401f) AM_READ_LEGACY(K054338_word_r) - AM_RANGE(0x258000, 0x2580ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x26C000, 0x26C007) AM_READ_LEGACY(altK056832_b_word_r) - AM_RANGE(0x270000, 0x27003f) AM_READ_LEGACY(m_word_r) + AM_RANGE(0x240000, 0x240007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x244010, 0x24401f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x254000, 0x25401f) AM_DEVREAD("k054338", k054338_device, word_r) + AM_RANGE(0x258000, 0x2580ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x26C000, 0x26C007) AM_DEVREAD("k056832", k056832_device, b_word_r) + AM_RANGE(0x270000, 0x27003f) AM_DEVREAD("k056832", k056832_device, word_r) #endif ADDRESS_MAP_END @@ -331,12 +331,12 @@ static ADDRESS_MAP_START( viostorm_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0x310000, 0x311fff) AM_DEVREAD("k056832", k056832_device, mw_rom_word_r) AM_RANGE(0x330000, 0x331fff) AM_RAM_WRITE(paletteram_xrgb_word_be_w) AM_SHARE("paletteram") #if MW_DEBUG - AM_RANGE(0x240000, 0x240007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x244010, 0x24401f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x254000, 0x25401f) AM_READ_LEGACY(K054338_word_r) - AM_RANGE(0x258000, 0x2580ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x26C000, 0x26C007) AM_READ_LEGACY(altK056832_b_word_r) - AM_RANGE(0x270000, 0x27003f) AM_READ_LEGACY(m_word_r) + AM_RANGE(0x240000, 0x240007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x244010, 0x24401f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x254000, 0x25401f) AM_DEVREAD("k054338", k054338_device, word_r) + AM_RANGE(0x258000, 0x2580ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x26C000, 0x26C007) AM_DEVREAD("k056832", k056832_device, b_word_r) + AM_RANGE(0x270000, 0x27003f) AM_DEVREAD("k056832", k056832_device, word_r) #endif ADDRESS_MAP_END @@ -421,13 +421,12 @@ static ADDRESS_MAP_START( martchmp_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0x682000, 0x683fff) AM_DEVREADWRITE("k056832", k056832_device,ram_word_r,ram_word_w) // tilemap RAM mirror read/write (essential) AM_RANGE(0x700000, 0x703fff) AM_DEVREAD("k056832", k056832_device, mw_rom_word_r) // tile ROM readback #if MW_DEBUG - AM_RANGE(0x400000, 0x4000ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x402010, 0x40201f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x404000, 0x404007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x40a000, 0x40a01f) AM_READ_LEGACY(K054338_word_r) - AM_RANGE(0x40c000, 0x40c03f) AM_READ_LEGACY(m_word_r) - AM_RANGE(0x41c000, 0x41c01f) AM_READ_LEGACY(K053252_word_r) - AM_RANGE(0x41e000, 0x41e007) AM_READ_LEGACY(altK056832_b_word_r) + AM_RANGE(0x400000, 0x4000ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x402010, 0x40201f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x404000, 0x404007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x40a000, 0x40a01f) AM_DEVREAD("k054338", k054338_device, word_r) + AM_RANGE(0x40c000, 0x40c03f) AM_DEVREAD("k056832", k056832_device, word_r) + AM_RANGE(0x41e000, 0x41e007) AM_DEVREAD("k056832", k056832_device, b_word_r) #endif ADDRESS_MAP_END @@ -466,12 +465,12 @@ static ADDRESS_MAP_START( dadandrn_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0xc00000, 0xdfffff) AM_READ(ddd_053936_tilerom_2_r) // tile character readback AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // watchdog #if MW_DEBUG - AM_RANGE(0x430000, 0x430007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x450010, 0x45001f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x480000, 0x48003f) AM_READ_LEGACY(m_word_r) - AM_RANGE(0x482000, 0x482007) AM_READ_LEGACY(altK056832_b_word_r) - AM_RANGE(0x488000, 0x4880ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x48c000, 0x48c01f) AM_READ_LEGACY(K054338_word_r) + AM_RANGE(0x430000, 0x430007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x450010, 0x45001f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x480000, 0x48003f) AM_DEVREAD("k056832", k056832_device, word_r) + AM_RANGE(0x482000, 0x482007) AM_DEVREAD("k056832", k056832_device, b_word_r) + AM_RANGE(0x488000, 0x4880ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x48c000, 0x48c01f) AM_DEVREAD("k054338", k054338_device, word_r) #endif ADDRESS_MAP_END @@ -513,12 +512,12 @@ static ADDRESS_MAP_START( gaiapols_map, AS_PROGRAM, 16, mystwarr_state ) AM_RANGE(0xc00000, 0xdfffff) AM_READ(gai_053936_tilerom_2_r) // tile character readback AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // watchdog #if MW_DEBUG - AM_RANGE(0x430000, 0x430007) AM_READ_LEGACY(k053246_reg_word_r) - AM_RANGE(0x450010, 0x45001f) AM_READ_LEGACY(k053247_reg_word_r) - AM_RANGE(0x480000, 0x48003f) AM_READ_LEGACY(m_word_r) - AM_RANGE(0x482000, 0x482007) AM_READ_LEGACY(altK056832_b_word_r) - AM_RANGE(0x488000, 0x4880ff) AM_READ_LEGACY(K055555_word_r) - AM_RANGE(0x48c000, 0x48c01f) AM_READ_LEGACY(K054338_word_r) + AM_RANGE(0x430000, 0x430007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) + AM_RANGE(0x450010, 0x45001f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x480000, 0x48003f) AM_DEVREAD("k056832", k056832_device, word_r) + AM_RANGE(0x482000, 0x482007) AM_DEVREAD("k056832", k056832_device, b_word_r) + AM_RANGE(0x488000, 0x4880ff) AM_DEVREAD("k055555", k055555_device, k055555_word_r) + AM_RANGE(0x48c000, 0x48c01f) AM_DEVREAD("k054338", k054338_device, word_r) #endif ADDRESS_MAP_END diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 6a73179cb34..b48f140382e 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -185,8 +185,8 @@ static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16, rungun_state ) AM_RANGE(0x740000, 0x741fff) AM_READWRITE(rng_ttl_ram_r, rng_ttl_ram_w) // text plane RAM AM_RANGE(0x7c0000, 0x7c0001) AM_WRITENOP // watchdog #if RNG_DEBUG - AM_RANGE(0x5c0010, 0x5c001f) AM_DEVREAD_LEGACY("k055673", k053247_reg_word_r) - AM_RANGE(0x640000, 0x640007) AM_DEVREAD_LEGACY("k055673", k053246_reg_word_r) + AM_RANGE(0x5c0010, 0x5c001f) AM_DEVREAD("k055673", k055673_device, k053247_reg_word_r) + AM_RANGE(0x640000, 0x640007) AM_DEVREAD("k055673", k055673_device, k053246_reg_word_r) #endif ADDRESS_MAP_END diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 42c093d6732..5fc2b78595c 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -327,7 +327,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, xexex_state ) #if XE_DEBUG AM_RANGE(0x0c0000, 0x0c003f) AM_DEVREAD("k056832", k056832_device, word_r) - AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD_LEGACY("k053246", k053246_reg_word_r) + AM_RANGE(0x0c2000, 0x0c2007) AM_DEVREAD("k053246", k053247_device, k053246_reg_word_r) AM_RANGE(0x0ca000, 0x0ca01f) AM_DEVREAD("k054338", k054338_device, word_r) AM_RANGE(0x0cc000, 0x0cc01f) AM_DEVREAD("k053251", k053251_device, lsb_r) AM_RANGE(0x0d8000, 0x0d8007) AM_DEVREAD("k056832", k056832_device, b_word_r)