diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index 0df41d4c367..6123e3003ce 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -130,14 +130,14 @@ SetTilemapVideoram( int offset, UINT16 newword ) } } /* SetTilemapVideoram */ -WRITE16_HANDLER( namco_tilemapvideoram16_w ) +WRITE16_MEMBER( namcos2_state::namco_tilemapvideoram16_w ) { UINT16 newword = mTilemapInfo.videoram[offset]; COMBINE_DATA( &newword ); SetTilemapVideoram( offset, newword ); } -READ16_HANDLER( namco_tilemapvideoram16_r ) +READ16_MEMBER( namcos2_state::namco_tilemapvideoram16_r ) { return mTilemapInfo.videoram[offset]; } @@ -193,14 +193,14 @@ SetTilemapControl( int offset, UINT16 newword ) } } /* SetTilemapControl */ -WRITE16_HANDLER( namco_tilemapcontrol16_w ) +WRITE16_HANDLER( namcos2_state::namco_tilemapcontrol16_w ) { UINT16 newword = mTilemapInfo.control[offset]; COMBINE_DATA( &newword ); SetTilemapControl( offset, newword ); } -READ16_HANDLER( namco_tilemapcontrol16_r ) +READ16_HANDLER( namcos2_state::namco_tilemapcontrol16_r ) { return mTilemapInfo.control[offset]; } diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 227e9054112..3059fc9fc9e 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -36,7 +36,7 @@ known issues: Valkyrie No Densetsu - gives ADSMISS error on startup - Does a checksum on area 0x181000 - 0x183fff, in 0x20 bytes block chunks. Game doesn't init it properly so you'd have to go into service menu and do + Does a checksum on area 0x181000 - 0x183fff, in 0x20 bytes block chunks. Game doesn't init it properly so you either have to go into service menu and do an "all data clear" or play once to get rid of the message. Bubble Trouble (Golly Ghost II) @@ -590,9 +590,9 @@ WRITE8_MEMBER(namcos2_state::dpram_byte_w) */ static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, AS_PROGRAM, 16, namcos2_state ) - AM_RANGE(0x200000, 0x3fffff) AM_READ_LEGACY(namcos2_68k_data_rom_r) - AM_RANGE(0x400000, 0x41ffff) AM_READWRITE_LEGACY(namco_tilemapvideoram16_r,namco_tilemapvideoram16_w) - AM_RANGE(0x420000, 0x42003f) AM_READWRITE_LEGACY(namco_tilemapcontrol16_r,namco_tilemapcontrol16_w) + AM_RANGE(0x200000, 0x3fffff) AM_ROM AM_REGION("data_rom", 0) + AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(namco_tilemapvideoram16_r,namco_tilemapvideoram16_w) + AM_RANGE(0x420000, 0x42003f) AM_READWRITE(namco_tilemapcontrol16_r,namco_tilemapcontrol16_w) AM_RANGE(0x440000, 0x44ffff) AM_READWRITE(paletteram_word_r,paletteram_word_w) AM_SHARE("paletteram") AM_RANGE(0x460000, 0x460fff) AM_READWRITE(dpram_word_r,dpram_word_w) AM_RANGE(0x468000, 0x468fff) AM_READWRITE(dpram_word_r,dpram_word_w) /* mirror */ @@ -607,22 +607,22 @@ static ADDRESS_MAP_START( common_default_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0xc40000, 0xc40001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w) AM_RANGE(0xc80000, 0xc9ffff) AM_RAM_WRITE(rozram_word_w) AM_SHARE("rozram") AM_RANGE(0xcc0000, 0xcc000f) AM_RAM AM_SHARE("rozctrl") - AM_RANGE(0xd00000, 0xd0000f) AM_READWRITE_LEGACY(namcos2_68k_key_r,namcos2_68k_key_w) + AM_RANGE(0xd00000, 0xd0000f) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w) AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_default_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_default_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_default_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_default_am ) ADDRESS_MAP_END @@ -630,7 +630,7 @@ ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( common_finallap_am, AS_PROGRAM, 16, namcos2_state ) - AM_RANGE(0x300000, 0x33ffff) AM_READ_LEGACY(namcos2_flap_prot_r) + AM_RANGE(0x300000, 0x33ffff) AM_READ(namcos2_finallap_prot_r) AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x840000, 0x840001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w) AM_RANGE(0x880000, 0x89ffff) AM_DEVREADWRITE("c45_road", namco_c45_road_device, read, write) @@ -641,15 +641,15 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( master_finallap_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_finallap_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_finallap_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_finallap_am ) ADDRESS_MAP_END @@ -658,47 +658,47 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( common_sgunner_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(c355_obj_ram_r,c355_obj_ram_w) AM_RANGE(0x818000, 0x818001) AM_WRITENOP - AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE_LEGACY(namcos2_68k_key_r,namcos2_68k_key_w) + AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w) AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_sgunner_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_sgunner_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_sgunner_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_sgunner_am ) ADDRESS_MAP_END /*************************************************************/ static ADDRESS_MAP_START( common_metlhawk_am, AS_PROGRAM, 16, namcos2_state ) - AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_SHARE("spriteram") \ - AM_RANGE(0xc40000, 0xc4ffff) AM_READWRITE(c169_roz_videoram_r,c169_roz_videoram_w) AM_SHARE("rozvideoram") \ - AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(c169_roz_control_r,c169_roz_control_w) \ - AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w) /* ??? */ \ + AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_SHARE("spriteram") + AM_RANGE(0xc40000, 0xc4ffff) AM_READWRITE(c169_roz_videoram_r,c169_roz_videoram_w) AM_SHARE("rozvideoram") + AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(c169_roz_control_r,c169_roz_control_w) + AM_RANGE(0xe00000, 0xe00001) AM_READWRITE(gfx_ctrl_r, gfx_ctrl_w) /* ??? */ AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_metlhawk_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_metlhawk_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_metlhawk_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_metlhawk_am ) ADDRESS_MAP_END @@ -713,22 +713,22 @@ static ADDRESS_MAP_START( common_luckywld_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0xa00000, 0xa1ffff) AM_DEVREADWRITE("c45_road", namco_c45_road_device, read, write) AM_RANGE(0xc00000, 0xc0ffff) AM_READWRITE(c169_roz_videoram_r,c169_roz_videoram_w) AM_SHARE("rozvideoram") AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(c169_roz_control_r,c169_roz_control_w) - AM_RANGE(0xf00000, 0xf00007) AM_READWRITE_LEGACY(namcos2_68k_key_r,namcos2_68k_key_w) + AM_RANGE(0xf00000, 0xf00007) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w) AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( master_luckywld_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM) - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_IMPORT_FROM( common_luckywld_am ) ADDRESS_MAP_END static ADDRESS_MAP_START( slave_luckywld_am, AS_PROGRAM, 16, namcos2_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_IMPORT_FROM( common_luckywld_am ) ADDRESS_MAP_END @@ -744,7 +744,7 @@ static ADDRESS_MAP_START( sound_default_am, AS_PROGRAM, 8, namcos2_state ) AM_RANGE(0x7800, 0x7fff) AM_READWRITE(dpram_byte_r,dpram_byte_w) /* mirror */ AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xbfff) AM_WRITENOP /* Amplifier enable on 1st write */ - AM_RANGE(0xc000, 0xc001) AM_WRITE_LEGACY(namcos2_sound_bankselect_w) + AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos2_sound_bankselect_w) AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* Watchdog */ AM_RANGE(0xe000, 0xe000) AM_WRITENOP AM_RANGE(0xd000, 0xffff) AM_ROM @@ -758,17 +758,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_default_am, AS_PROGRAM, 8, namcos2_state ) /* input ports and dips are mapped here */ AM_RANGE(0x0000, 0x0000) AM_READNOP /* Keep logging quiet */ - AM_RANGE(0x0001, 0x0001) AM_READ_LEGACY(namcos2_input_port_0_r) + AM_RANGE(0x0001, 0x0001) AM_READ_PORT("MCUB") AM_RANGE(0x0002, 0x0002) AM_READ_PORT("MCUC") - AM_RANGE(0x0003, 0x0003) AM_READWRITE_LEGACY(namcos2_mcu_port_d_r,namcos2_mcu_port_d_w) - AM_RANGE(0x0007, 0x0007) AM_READ_LEGACY(namcos2_input_port_10_r) - AM_RANGE(0x0010, 0x0010) AM_READWRITE_LEGACY(namcos2_mcu_analog_ctrl_r,namcos2_mcu_analog_ctrl_w) - AM_RANGE(0x0011, 0x0011) AM_READWRITE_LEGACY(namcos2_mcu_analog_port_r,namcos2_mcu_analog_port_w) + AM_RANGE(0x0003, 0x0003) AM_READWRITE(namcos2_mcu_port_d_r,namcos2_mcu_port_d_w) + AM_RANGE(0x0007, 0x0007) AM_READ_PORT("MCUH") + AM_RANGE(0x0010, 0x0010) AM_READWRITE(namcos2_mcu_analog_ctrl_r,namcos2_mcu_analog_ctrl_w) + AM_RANGE(0x0011, 0x0011) AM_READWRITE(namcos2_mcu_analog_port_r,namcos2_mcu_analog_port_w) AM_RANGE(0x0000, 0x003f) AM_RAM /* Fill in register to stop logging */ AM_RANGE(0x0040, 0x01bf) AM_RAM AM_RANGE(0x01c0, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW") - AM_RANGE(0x3000, 0x3000) AM_READ_LEGACY(namcos2_input_port_12_r) + AM_RANGE(0x3000, 0x3000) AM_READ_PORT("MCUDI0") AM_RANGE(0x3001, 0x3001) AM_READ_PORT("MCUDI1") AM_RANGE(0x3002, 0x3002) AM_READ_PORT("MCUDI2") AM_RANGE(0x3003, 0x3003) AM_READ_PORT("MCUDI3") @@ -1584,7 +1584,7 @@ Master clock = 49.152MHz 63B05 Measured at 120ns = 8.333 MHz BUT 49.152MHz/6 = 8.192MHz = 122ns I've corrected all frequencies to be multiples of integer divisions of -the 49.152MHz master clock. Additionally the 6305 looks to hav an +the 49.152MHz master clock. Additionally the 6305 looks to have an internal divider. Soooo; @@ -2014,7 +2014,7 @@ ROM_START( assault ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) @@ -2068,7 +2068,7 @@ ROM_START( assaultj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) @@ -2122,7 +2122,7 @@ ROM_START( assaultp ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "atshape.bin", 0x000000, CRC(dfcad82b) SHA1(9c3826b8dc36fa0d71c0de7f8be3479d9a025803) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "at1dat0.bin", 0x000000, CRC(844890f4) SHA1(1be30760acd81fae836301d81d6adbb3e5941373) ) NAMCOS2_DATA_LOAD_O_128K( "at1dat1.bin", 0x000000, CRC(21715313) SHA1(97c6edae6a5f1df434f1dcf7be307b5e006e72a6) ) @@ -2175,7 +2175,7 @@ ROM_START( burnforc ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.bin", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.bin", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) @@ -2227,7 +2227,7 @@ ROM_START( burnforco ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "bu_shape.bin", 0x000000,CRC(80a6b722) SHA1(2c24327a890310c5e8086dc6821627108a88c62e) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "bu1_dat0.bin", 0x000000, CRC(e0a9d92f) SHA1(15042e6d7b31bec08ccdf36e89fdb4b6fb62fa4b) ) NAMCOS2_DATA_LOAD_O_128K( "bu1_dat1.bin", 0x000000, CRC(5fe54b73) SHA1(a5d4895f0a4523be20de40ccaa74f8fad0d5df7d) ) @@ -2272,7 +2272,7 @@ ROM_START( cosmogng ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "co1dat0.bin", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) NAMCOS2_DATA_LOAD_O_128K( "co1dat1.bin", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) @@ -2318,7 +2318,7 @@ ROM_START( cosmogngj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "co1sha0.bin", 0x000000, 0x80000, CRC(063a70cc) SHA1(c3179d55d57c47d3fef49d45e45b88c4d8250548) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "co1dat0.bin", 0x000000, CRC(b53da2ae) SHA1(a7fe63668d50928d5d2e2249a5f377c7e8dfc6a5) ) NAMCOS2_DATA_LOAD_O_128K( "co1dat1.bin", 0x000000, CRC(d21ad10b) SHA1(dcf2d4cc048ea57507952a9a35390af7de5cfe34) ) @@ -2371,7 +2371,7 @@ ROM_START( dirtfoxj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "df1_sha.bin", 0x000000, CRC(9a7c9a9b) SHA1(06221ae8d3f6bebbb5a7ab2eaaf35b9922389115) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "df1_dat0.bin", 0x000000, CRC(f5851c85) SHA1(e99c05891622cdaab394630b7b2678968e6761d7) ) NAMCOS2_DATA_LOAD_O_256K( "df1_dat1.bin", 0x000000, CRC(1a31e46b) SHA1(4be7115893b27d6a3dc38c97dcb41eafebb423cd) ) @@ -2415,7 +2415,7 @@ ROM_START( dsaber ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "data0.bin", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) NAMCOS2_DATA_LOAD_O_128K( "data1.bin", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) @@ -2465,7 +2465,7 @@ ROM_START( dsaberj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(698e7a3e) SHA1(4d41bf0242626ca1448d1f650c84b5987a7f6597) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "data0.bin", 0x000000, CRC(3e53331f) SHA1(3dd4c133f587361f30ab1b890f5b05749d5838e3) ) NAMCOS2_DATA_LOAD_O_128K( "data1.bin", 0x000000, CRC(d5427f11) SHA1(af8d8153dc60044616a6b0571831c53c09fefda1) ) @@ -2512,7 +2512,7 @@ ROM_START( finallap ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* No DAT files present in ZIP archive */ ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -2567,7 +2567,7 @@ ROM_START( finallapd ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* No DAT files present in ZIP archive */ ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -2622,7 +2622,7 @@ ROM_START( finallapc ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* No DAT files present in ZIP archive */ ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -2677,7 +2677,7 @@ ROM_START( finallapjc ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fl2-sha", 0x000000, CRC(5fda0b6d) SHA1(92c0410e159977ea73a8e8c0cb1321c3056f6c2f) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* No DAT files present in ZIP archive */ ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -2732,7 +2732,7 @@ ROM_START( finallapjb ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fl1_sha.bin", 0x000000, CRC(b7e1c7a3) SHA1(b82f9b340d95b80a12286647adba8c139b4d081a) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* No DAT files present in ZIP archive */ ROM_REGION( 0x100, "c45_road:clut", 0 ) /* prom for road colors */ @@ -2790,7 +2790,7 @@ ROM_START( finalap2 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fls2dat0", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) NAMCOS2_DATA_LOAD_O_256K( "fls2dat1", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) @@ -2847,7 +2847,7 @@ ROM_START( finalap2j ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "fls2sha", 0x000000, CRC(f7b40a85) SHA1(a458a1cc0dae757fe8a15cb5f5ae46d3c033df00) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fls2dat0", 0x000000, CRC(f1af432c) SHA1(c514261a49ceb5c3ba0246519ba5d02e9a20d950) ) NAMCOS2_DATA_LOAD_O_256K( "fls2dat1", 0x000000, CRC(8719533e) SHA1(98d2767da6f7f67da7af15e8cfed95adb04b7427) ) @@ -2904,7 +2904,7 @@ ROM_START( finalap3 ) // this set displays MOTION (Ver. 3) in the test mode menu ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.bin", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "flt1d0", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) NAMCOS2_DATA_LOAD_O_128K( "flt1d1", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) @@ -2965,7 +2965,7 @@ ROM_START( finalap3a ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.bin", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "flt1d0", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) NAMCOS2_DATA_LOAD_O_128K( "flt1d1", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) @@ -3029,7 +3029,7 @@ ROM_START( finalap3j ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "fltsha", 0x000000, CRC(211bbd83) SHA1(17502830d1af1e2cfbc17e2f3bb303f2a0c27e68) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "flt1d0", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) NAMCOS2_DATA_LOAD_O_128K( "flt1d1", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) @@ -3091,7 +3091,7 @@ ROM_START( finalap3jc ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "flt sha.7n", 0x000000, CRC(211bbd83) SHA1(17502830d1af1e2cfbc17e2f3bb303f2a0c27e68) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data ROMs */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data ROMs */ NAMCOS2_DATA_LOAD_E_128K( "flt1_d0.13s", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) NAMCOS2_DATA_LOAD_O_128K( "flt1_d1.13p", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) @@ -3150,7 +3150,7 @@ ROM_START( finalap3bl ) // bootleg set ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "flt2_sha.bin", 0x000000, CRC(6986565b) SHA1(df95f2ad5d1e938551d33153f2dcc4711ffd0eba) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "flt1d0", 0x000000, CRC(80004966) SHA1(112b2a9b0ea792d5dbff1b9cf904da788aeede29) ) NAMCOS2_DATA_LOAD_O_128K( "flt1d1", 0x000000, CRC(a2e93e8c) SHA1(9c8a5431a79153a70eb6939d16e0a5a6be235e75) ) @@ -3212,7 +3212,7 @@ ROM_START( finehour ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "fh1_sha.bin", 0x000000, CRC(15875eb0) SHA1(9225df6b01897938488461ebf0717e6d7b81d562) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "fh1_dt0.bin", 0x000000, CRC(2441c26f) SHA1(429c8f12f7bef3e62153ac8b9e00ea870db36a7b) ) NAMCOS2_DATA_LOAD_O_128K( "fh1_dt1.bin", 0x000000, CRC(48154deb) SHA1(d6fde316f90bc847f60fa8d997504da34337ffa4) ) NAMCOS2_DATA_LOAD_E_128K( "fh1_dt2.bin", 0x100000, CRC(12453ba4) SHA1(26ad0da6e56ece6f1ba0b0cf23d2fdae2ce24100) ) @@ -3435,7 +3435,7 @@ ROM_START( fourtrax ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "fx_sha.7n", 0x000000, CRC(f7aa4af7) SHA1(b18ffda9e35beb0f072825e2899691be370f33b1) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "fx_dat0.13s", 0x000000, CRC(63abf69b) SHA1(6776991eeff434bf9720f49ad6e62c37fc7ddf40) ) NAMCOS2_DATA_LOAD_O_256K( "fx_dat1.13r", 0x000000, CRC(725bed14) SHA1(bbf886ac7f8c2c7857bc0b5d7f8fc7e63e8e9559) ) NAMCOS2_DATA_LOAD_E_256K( "fx_dat2.13p", 0x100000, CRC(71e4a5a0) SHA1(a0188c920a43c5e69e25464627094b6b6ed26a59) ) @@ -3489,7 +3489,7 @@ ROM_START( marvland ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "mv2_dat0", 0x000000, CRC(62e6318b) SHA1(5c26bc054298f2a0980f7e82ba1844bc9f5eff98) ) NAMCOS2_DATA_LOAD_O_128K( "mv2_dat1", 0x000000, CRC(8a6902ca) SHA1(272e8699b872b3a50d72090b43c57493e6642bfe) ) NAMCOS2_DATA_LOAD_E_128K( "mv2_dat2", 0x100000, CRC(f5c6408c) SHA1(568fb08d0763dc91674d708fa2d15ca952956145) ) @@ -3540,7 +3540,7 @@ ROM_START( marvlandj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_256K( "mv1-sha.bin", 0x000000, CRC(a47db5d3) SHA1(110e26412aa84f229773049112709be457b7a6ff) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "mv1-dat0.bin", 0x000000, CRC(e15f412e) SHA1(d3ff006d4577540a690c912e94897a1b638ac265) ) NAMCOS2_DATA_LOAD_O_128K( "mv1-dat1.bin", 0x000000, CRC(73e1545a) SHA1(a04034e56fef69fb2a2eb88f2f392c376e52d00d) ) @@ -3599,7 +3599,7 @@ ROM_START( metlhawk ) ROM_REGION( 0x80000, "gfx5", 0 ) /* Mask shape (ROZ) */ ROM_LOAD( "mh-rzsh.bin", 0x000000, 0x40000, CRC(5090b1cf) SHA1(b814f8309a6133c6ece5f20161ebd02a981da66f) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "mh1d0.13s", 0x000000, CRC(8b178ac7) SHA1(210d31baf0aaba1af5efc15ec05714123f669030) ) NAMCOS2_DATA_LOAD_O_128K( "mh1d1.13p", 0x000000, CRC(10684fd6) SHA1(1e39d32dcf7ab9a146aa01f47e2737142874eede) ) @@ -3670,7 +3670,7 @@ ROM_START( metlhawkj ) ROM_REGION( 0x80000, "gfx5", 0 ) /* Mask shape (ROZ) */ ROM_LOAD( "mh-rzsh.bin", 0x000000, 0x40000, CRC(5090b1cf) SHA1(b814f8309a6133c6ece5f20161ebd02a981da66f) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "mh1d0.13s", 0x000000, CRC(8b178ac7) SHA1(210d31baf0aaba1af5efc15ec05714123f669030) ) NAMCOS2_DATA_LOAD_O_128K( "mh1d1.13p", 0x000000, CRC(10684fd6) SHA1(1e39d32dcf7ab9a146aa01f47e2737142874eede) ) @@ -3736,7 +3736,7 @@ ROM_START( mirninja ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "mn_sha.bin", 0x000000, CRC(c28af90f) SHA1(8b7f95375eb32c3e30c2a55b7f543235f56d3a13) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "mn1_dat0.bin", 0x000000, CRC(104bcca8) SHA1(e8368d0dc51bf0653143bf2261d7ed5b54d92941) ) NAMCOS2_DATA_LOAD_O_128K( "mn1_dat1.bin", 0x000000, CRC(d2a918fb) SHA1(032b7a7bcc60c41325e7b35df9a932e68cdd0788) ) @@ -3792,7 +3792,7 @@ ROM_START( ordyne ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "or1_sha.bin", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "or1_dt0.bin", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) NAMCOS2_DATA_LOAD_O_128K( "or1_dt1.bin", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) @@ -3848,7 +3848,7 @@ ROM_START( ordynej ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "or1_sha.bin", 0x000000, CRC(7aec9dee) SHA1(2e774e4cff69173b4524d6b25a6a449ba5498a6a) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "or1_dt0.bin", 0x000000, CRC(de214f7a) SHA1(59883c7886b403306c30e51d7f49225483792650) ) NAMCOS2_DATA_LOAD_O_128K( "or1_dt1.bin", 0x000000, CRC(25e3e6c8) SHA1(ad093f15edaea71f6c7226c6e4f3c2130d418013) ) @@ -3908,7 +3908,7 @@ ROM_START( phelios ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "ps1-sha.bin", 0x000000, CRC(58e26fcf) SHA1(9edc3b54964f923ed07ee878520ccf3f188f04ad) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "ps1dat0.bin", 0x000000, CRC(ee4194b0) SHA1(a0c2a807db70164ed761e5ad04301e5ae1173e7a) ) NAMCOS2_DATA_LOAD_O_128K( "ps1dat1.bin", 0x000000, CRC(5b22d714) SHA1(f6cb1fe661f7691269840245f06875845fd6eb33) ) @@ -3952,7 +3952,7 @@ ROM_START( rthun2 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "data0.bin", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) NAMCOS2_DATA_LOAD_O_128K( "data1.bin", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) NAMCOS2_DATA_LOAD_E_128K( "data2.bin", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) @@ -3998,7 +3998,7 @@ ROM_START( rthun2j ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "shape.bin", 0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "data0.bin", 0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) ) NAMCOS2_DATA_LOAD_O_128K( "data1.bin", 0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) ) NAMCOS2_DATA_LOAD_E_128K( "data2.bin", 0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) ) @@ -4047,7 +4047,7 @@ ROM_START( sgunner ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sn_sha0.8n", 0x000000, 0x80000, CRC(01e20999) SHA1(5f925b5b43aa8889e077f7854a89d0731052605d) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "sn1_dat0.13s", 0x000000, CRC(72bfeca8) SHA1(88a2f8959d803611b2f2e219cb8ff085a37d01fe) ) NAMCOS2_DATA_LOAD_O_128K( "sn1_dat1.13p", 0x000000, CRC(99b3e653) SHA1(d7e29ad4e059f5d5e03386d903428c879d591459) ) @@ -4098,7 +4098,7 @@ ROM_START( sgunnerj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sn_sha0.8n", 0x000000, 0x80000, CRC(01e20999) SHA1(5f925b5b43aa8889e077f7854a89d0731052605d) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "sn1_dat0.13s", 0x000000, CRC(72bfeca8) SHA1(88a2f8959d803611b2f2e219cb8ff085a37d01fe) ) NAMCOS2_DATA_LOAD_O_128K( "sn1_dat1.13p", 0x000000, CRC(99b3e653) SHA1(d7e29ad4e059f5d5e03386d903428c879d591459) ) @@ -4154,7 +4154,7 @@ ROM_START( sgunner2 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.bin", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.bin", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.bin", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) @@ -4212,7 +4212,7 @@ ROM_START( sgunner2j ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sns_sha0.bin", 0x000000, 0x80000, CRC(0374fd67) SHA1(2f09536ef4f8e1aa719108e73642feb376d6efff) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "sns_dat0.bin", 0x000000, CRC(48295d93) SHA1(2b314128d5ed7d30895967dbd2ecd8f1dfdc61ca) ) NAMCOS2_DATA_LOAD_O_128K( "sns_dat1.bin", 0x000000, CRC(b44cc656) SHA1(7126ef28bf174c6c560469fa6dc4cfb439811850) ) NAMCOS2_DATA_LOAD_E_128K( "sns_dat2.bin", 0x100000, CRC(ca2ae645) SHA1(8addc8ed8244d0ff4c03909e865e3f15934963f1) ) @@ -4262,7 +4262,7 @@ ROM_START( sws ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "ss1_sha0.7n", 0x000000, 0x80000, CRC(fea6952c) SHA1(3bf27ee1e7e4c5ee0d53f28d49ef063b3f8064ba) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "ss1_dat0.13s", 0x000000, CRC(6a360f91) SHA1(22597c6bf7c597cf554a27182b4748de43a87b0a) ) NAMCOS2_DATA_LOAD_O_256K( "ss1_dat1.13p", 0x000000, CRC(ab1e487d) SHA1(b40ea6c28dd9adae4939f69fcbf53414ae4703c6) ) @@ -4308,7 +4308,7 @@ ROM_START( sws92 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.bin", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.bin", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) @@ -4354,7 +4354,7 @@ ROM_START( sws92g ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sss_sha0.bin", 0x000000, 0x80000, CRC(b71a731a) SHA1(29eab0ad5618f54e6c790d20f7dc895afae6c709) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "sss1dat0.bin", 0x000000, CRC(db3e6aec) SHA1(928960e3dc9c8225e695d12e9b18fbb7f151c151) ) NAMCOS2_DATA_LOAD_O_256K( "sss1dat1.bin", 0x000000, CRC(463b5ba8) SHA1(029dce2e7ee50181392b6ef409bbd192105fb065) ) NAMCOS2_DATA_LOAD_E_256K( "ssg1dat2.bin", 0x080000, CRC(754128aa) SHA1(459ffb08bcd905644d6019e5b25870dcb1e2b418) ) @@ -4402,7 +4402,7 @@ ROM_START( sws93 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "sst_sha0.bin", 0x000000, 0x80000, CRC(4f64d4bd) SHA1(0eb5311448cfd91b1e139b64b2f35b5179237e58) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_512K( "sst1dat0.bin", 0x000000, CRC(b99c9656) SHA1(ac9e6bf46204dad70caf0d75614a20af0269a07f) ) NAMCOS2_DATA_LOAD_O_512K( "sst1dat1.bin", 0x000000, CRC(60cf6281) SHA1(c02a5bf8f4f94cbe8b0448c9457af53cd1c043d0) ) @@ -4449,7 +4449,7 @@ ROM_START( suzuka8h ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "eh2-sha0.bin", 0x000000, 0x80000, CRC(7F24619C) SHA1(0D19AB621CB42C5315BE9A6B56F6711FC46FFFF7) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.bin", 0x000000, CRC(B43E5DFA) SHA1(7E24EE46169532CDB5C504239F7961F8D17E86E4) ) NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.bin", 0x000000, CRC(9825D5BF) SHA1(720F0E90C69A2E0C48889D510A15102768226A67) ) NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.bin", 0x100000, CRC(F46D301F) SHA1(70797FD584735844539553EFCAD53E11239EC10E) ) @@ -4501,7 +4501,7 @@ ROM_START( suzuka8hj ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "eh1-sha0.bin", 0x000000, 0x80000, CRC(39585cf9) SHA1(8cc18b5745ab2cf50d4df0a17fc1a57771db28ab) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_256K( "eh1-d0.bin", 0x000000, CRC(b43e5dfa) SHA1(7e24ee46169532cdb5c504239f7961f8d17e86e4) ) NAMCOS2_DATA_LOAD_O_256K( "eh1-d1.bin", 0x000000, CRC(9825d5bf) SHA1(720f0e90c69a2e0c48889d510a15102768226a67) ) NAMCOS2_DATA_LOAD_O_256K( "eh1-d3.bin", 0x100000, CRC(f46d301f) SHA1(70797fd584735844539553efcad53e11239ec10e) ) @@ -4560,7 +4560,7 @@ ROM_START( suzuk8h2 ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "ehs1-sha0.7n", 0x000000, 0x80000, CRC(0f0e2dbf) SHA1(a4575fbdc868ba959d23204be7d659d40d8db4c2) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat0.13s", 0x000000, CRC(12a202fb) SHA1(dca1b88cb524d54a699d4f6003854cfc980e084b) ) NAMCOS2_DATA_LOAD_O_512K( "ehs1-dat1.13r", 0x000000, CRC(91790905) SHA1(988af294959dbb8636f808347b44897a133d3203) ) NAMCOS2_DATA_LOAD_E_512K( "ehs1-dat2.13p", 0x100000, CRC(087da1f3) SHA1(e9c4ba0383e883502c0f45ae6e6d5daba4eccb01) ) @@ -4620,7 +4620,7 @@ ROM_START( valkyrie ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "wdshape.bin", 0x000000, CRC(3b5e0249) SHA1(259bbabf57a8ad739c646c56aad6d0b92e10adcd) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "wd1dat0.bin", 0x000000, CRC(ea209f48) SHA1(5e73a745dc2faaa4ce6c633d4072d41e9e494276) ) NAMCOS2_DATA_LOAD_O_128K( "wd1dat1.bin", 0x000000, CRC(04b48ada) SHA1(aa046f8856bdd5b56d481c2c12ad2808c6517a5f) ) @@ -4673,7 +4673,7 @@ ROM_START( kyukaidk ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.bin", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.bin", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.bin", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) @@ -4723,7 +4723,7 @@ ROM_START( kyukaidko ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "ky1_sha.bin", 0x000000, CRC(380a20d7) SHA1(9627d2e0192779d50bfb25d5c19976275818c310) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ NAMCOS2_DATA_LOAD_E_128K( "ky1_d0.bin", 0x000000, CRC(c9cf399d) SHA1(90cba42781b1e03ecc3f5b802d740ace6b88baaa) ) NAMCOS2_DATA_LOAD_O_128K( "ky1_d1.bin", 0x000000, CRC(6d4f21b9) SHA1(f234a785f61969be684d2a4aed59616f125d72fc) ) NAMCOS2_DATA_LOAD_E_128K( "ky1_d2.bin", 0x100000, CRC(eb6d19c8) SHA1(c9fdb33fe191d3c4d284db7cbb05d852551a998d) ) @@ -4769,7 +4769,7 @@ ROM_START( gollygho ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ NAMCOS2_GFXROM_LOAD_128K( "gl1sha0.7n", 0x000000, CRC(8886f6f5) SHA1(3b311c5061449e1bbde1a1006fd967a6154326b8) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* All DAT ROM sockets unpopulated on PCB */ ROM_REGION16_BE( 0x2000, "user2", 0 ) /* sprite zoom */ @@ -4819,7 +4819,7 @@ ROM_START( bubbletr ) ROM_REGION( 0x080000, "gfx4", 0 ) /* Mask shape */ ROM_LOAD( "bt1-sha0.bin", 0x000000, 0x80000, CRC(dc4664df) SHA1(59818b14e74ee9b15a66e850658e4697d78b28d9) ) - ROM_REGION16_BE( 0x200000, "user1", ROMREGION_ERASEFF ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", ROMREGION_ERASEFF ) /* Shared data roms */ /* All DAT ROM sockets unpopulated on PCB */ ROM_REGION16_BE( 0x2000, "user2", 0 ) /* sprite zoom */ @@ -4989,7 +4989,7 @@ ROM_START( luckywld ) ROM_REGION( 0x80000, "gfx5", 0 ) /* 16x16 shape */ ROM_LOAD( "lw1rzs0.20z", 0x000000, 0x80000, CRC(a1071537) SHA1(bb8a97b82066d7838471e258d1c3c716ede7572c) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ ROM_LOAD16_BYTE( "lw1dat0.13s", 0x000000, 0x80000, CRC(5d387d47) SHA1(e40ef52d1403fa630294d736f35a6924fa4e762e) ) ROM_LOAD16_BYTE( "lw1dat1.13p", 0x000001, 0x80000, CRC(7ba94476) SHA1(cd4a964050e706f783450ace277e67586bf69e61) ) ROM_LOAD16_BYTE( "lw1dat2.13r", 0x100000, 0x80000, CRC(eeba7c62) SHA1(6468518d3a5499b3f9a066488d83252cfc804d69) ) @@ -5055,7 +5055,7 @@ ROM_START( luckywldj ) ROM_REGION( 0x80000, "gfx5", 0 ) /* 16x16 shape */ ROM_LOAD( "lw1rzs0.20z", 0x000000, 0x80000, CRC(a1071537) SHA1(bb8a97b82066d7838471e258d1c3c716ede7572c) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* Shared data roms */ + ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */ ROM_LOAD16_BYTE( "lw1dat0.13s", 0x000000, 0x80000, CRC(5d387d47) SHA1(e40ef52d1403fa630294d736f35a6924fa4e762e) ) ROM_LOAD16_BYTE( "lw1dat1.13p", 0x000001, 0x80000, CRC(7ba94476) SHA1(cd4a964050e706f783450ace277e67586bf69e61) ) ROM_LOAD16_BYTE( "lw1dat2.13r", 0x100000, 0x80000, CRC(eeba7c62) SHA1(6468518d3a5499b3f9a066488d83252cfc804d69) ) diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 13ae752510d..3aaf57bf924 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1088,15 +1088,15 @@ READ16_MEMBER(namcos21_state::NAMCO_C139_SCI_register_r){ return 0; } static ADDRESS_MAP_START( namcos21_68k_master, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) NAMCO21_68K_COMMON ADDRESS_MAP_END static ADDRESS_MAP_START( namcos21_68k_slave, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAM /* private work RAM */ - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) NAMCO21_68K_COMMON ADDRESS_MAP_END @@ -1318,8 +1318,8 @@ WRITE16_MEMBER(namcos21_state::winrun_dspcomram_control_w) static ADDRESS_MAP_START( am_master_winrun, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_RANGE(0x250000, 0x25ffff) AM_RAM AM_SHARE("winrun_polydata") AM_RANGE(0x260000, 0x26ffff) AM_RAM /* unused? */ AM_RANGE(0x280000, 0x281fff) AM_WRITE(winrun_dspbios_w) AM_SHARE("winrun_dspbios") @@ -1338,7 +1338,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( am_slave_winrun, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x13ffff) AM_RAM - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) AM_RANGE(0x600000, 0x60ffff) AM_READWRITE(winrun_gpucomram_r,winrun_gpucomram_w) AM_RANGE(0x800000, 0x87ffff) AM_READ(datarom_r) AM_RANGE(0x900000, 0x90ffff) AM_READWRITE(shareram1_r,shareram1_w) @@ -1351,7 +1351,7 @@ static ADDRESS_MAP_START( am_gpu_winrun, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x100001) AM_READWRITE(winrun_gpu_color_r,winrun_gpu_color_w) /* ? */ AM_RANGE(0x180000, 0x19ffff) AM_RAM /* work RAM */ - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_gpu_C148_r,namcos2_68k_gpu_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos21_68k_gpu_C148_r,namcos21_68k_gpu_C148_w) AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("winrun_comram") AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(paletteram16_r,paletteram16_w) AM_SHARE("paletteram") AM_RANGE(0x600000, 0x6fffff) AM_READ(gpu_data_r) @@ -1374,7 +1374,7 @@ static ADDRESS_MAP_START( am_sound_winrun, AS_PROGRAM, 8, namcos21_state ) AM_RANGE(0x7800, 0x7fff) AM_READWRITE(namcos2_dualportram_byte_r,namcos2_dualportram_byte_w) /* mirror */ AM_RANGE(0x8000, 0x9fff) AM_RAM AM_RANGE(0xa000, 0xbfff) AM_WRITENOP /* amplifier enable on 1st write */ - AM_RANGE(0xc000, 0xc001) AM_WRITE_LEGACY(namcos2_sound_bankselect_w) + AM_RANGE(0xc000, 0xc001) AM_WRITE(namcos2_sound_bankselect_w) AM_RANGE(0xd001, 0xd001) AM_WRITENOP /* watchdog */ AM_RANGE(0xd000, 0xffff) AM_ROM AM_RANGE(0xc000, 0xffff) AM_WRITENOP /* avoid debug log noise; games write frequently to 0xe000 */ @@ -1389,10 +1389,10 @@ static ADDRESS_MAP_START( am_mcu_winrun, AS_PROGRAM, 8, namcos21_state ) AM_RANGE(0x0000, 0x0000) AM_READNOP AM_RANGE(0x0001, 0x0001) AM_READ_PORT("PORTB") /* p1,p2 start */ AM_RANGE(0x0002, 0x0002) AM_READ_PORT("PORTC") /* coins */ - AM_RANGE(0x0003, 0x0003) AM_READWRITE_LEGACY(namcos2_mcu_port_d_r,namcos2_mcu_port_d_w) + AM_RANGE(0x0003, 0x0003) AM_READWRITE(namcos2_mcu_port_d_r,namcos2_mcu_port_d_w) AM_RANGE(0x0007, 0x0007) AM_READ_PORT("PORTH") /* fire buttons */ - AM_RANGE(0x0010, 0x0010) AM_READWRITE_LEGACY(namcos2_mcu_analog_ctrl_r,namcos2_mcu_analog_ctrl_w) - AM_RANGE(0x0011, 0x0011) AM_READWRITE_LEGACY(namcos2_mcu_analog_port_r,namcos2_mcu_analog_port_w) + AM_RANGE(0x0010, 0x0010) AM_READWRITE(namcos2_mcu_analog_ctrl_r,namcos2_mcu_analog_ctrl_w) + AM_RANGE(0x0011, 0x0011) AM_READWRITE(namcos2_mcu_analog_port_r,namcos2_mcu_analog_port_w) AM_RANGE(0x0000, 0x003f) AM_RAM AM_RANGE(0x0040, 0x01bf) AM_RAM AM_RANGE(0x01c0, 0x1fff) AM_ROM @@ -1426,8 +1426,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( driveyes_68k_master, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */ - AM_RANGE(0x180000, 0x183fff) AM_READWRITE_LEGACY(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W) - AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE_LEGACY(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) + AM_RANGE(0x180000, 0x183fff) AM_READWRITE8(namcos2_68k_eeprom_r,namcos2_68k_eeprom_w,0x00ff) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_master_C148_r,namcos2_68k_master_C148_w) AM_RANGE(0x250000, 0x25ffff) AM_RAM AM_SHARE("winrun_polydata") AM_RANGE(0x280000, 0x281fff) AM_WRITE(winrun_dspbios_w) AM_SHARE("winrun_dspbios") AM_RANGE(0x380000, 0x38000f) AM_READWRITE(winrun_dspcomram_control_r,winrun_dspcomram_control_w) @@ -1440,7 +1440,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( driveyes_68k_slave, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */ - AM_RANGE(0x1c0000, 0x1fffff) AM_READ_LEGACY(namcos2_68k_slave_C148_r) AM_WRITE_LEGACY(namcos2_68k_slave_C148_w) + AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w) DRIVEYES_68K_COMMON ADDRESS_MAP_END diff --git a/src/mame/includes/namcoic.h b/src/mame/includes/namcoic.h index 637c0cb8ba1..2083933af76 100644 --- a/src/mame/includes/namcoic.h +++ b/src/mame/includes/namcoic.h @@ -159,10 +159,6 @@ extern const device_type NAMCO_C45_ROAD; void namco_tilemap_draw( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); void namco_tilemap_invalidate( void ); -DECLARE_WRITE16_HANDLER( namco_tilemapvideoram16_w ); -DECLARE_READ16_HANDLER( namco_tilemapvideoram16_r ); -DECLARE_WRITE16_HANDLER( namco_tilemapcontrol16_w ); -DECLARE_READ16_HANDLER( namco_tilemapcontrol16_r ); DECLARE_READ32_HANDLER( namco_tilemapvideoram32_r ); DECLARE_WRITE32_HANDLER( namco_tilemapvideoram32_w ); diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index d81bc6e3d41..d168cbb7d84 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -182,6 +182,26 @@ public: INTERRUPT_GEN_MEMBER(namcos2_68k_slave_vblank); INTERRUPT_GEN_MEMBER(namcos2_68k_gpu_vblank); TIMER_CALLBACK_MEMBER(namcos2_posirq_tick); + + DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w ); + DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r ); + DECLARE_WRITE16_MEMBER( namcos2_68k_master_C148_w ); + DECLARE_READ16_MEMBER( namcos2_68k_master_C148_r ); + + DECLARE_WRITE16_MEMBER( namcos2_68k_slave_C148_w ); + DECLARE_READ16_MEMBER( namcos2_68k_slave_C148_r ); + + DECLARE_WRITE8_MEMBER( namcos2_mcu_port_d_w ); + DECLARE_READ8_MEMBER( namcos2_mcu_port_d_r ); + DECLARE_WRITE8_MEMBER( namcos2_mcu_analog_ctrl_w ); + DECLARE_READ8_MEMBER( namcos2_mcu_analog_ctrl_r ); + DECLARE_WRITE8_MEMBER( namcos2_mcu_analog_port_w ); + DECLARE_READ8_MEMBER( namcos2_mcu_analog_port_r ); + DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w ); + + /* TODO: this should belong to namcos21_state */ + DECLARE_WRITE16_MEMBER( namcos21_68k_gpu_C148_w ); + DECLARE_READ16_MEMBER( namcos21_68k_gpu_C148_r ); }; class namcos2_state : public namcos2_shared_state @@ -281,6 +301,15 @@ public: UINT16 m_serial_comms_ctrl[0x8]; optional_device m_c45_road; + + DECLARE_READ16_MEMBER( namcos2_68k_key_r ); + DECLARE_WRITE16_MEMBER( namcos2_68k_key_w ); + DECLARE_WRITE16_MEMBER( namco_tilemapvideoram16_w ); + DECLARE_READ16_MEMBER( namco_tilemapvideoram16_r ); + DECLARE_WRITE16_MEMBER( namco_tilemapcontrol16_w ); + DECLARE_READ16_MEMBER( namco_tilemapcontrol16_r ); + DECLARE_READ16_MEMBER( namcos2_finallap_prot_r ); + }; /*----------- defined in video/namcos2.c -----------*/ @@ -301,26 +330,6 @@ public: extern void (*namcos2_kickstart)(running_machine &machine, int internal); -DECLARE_READ16_HANDLER( namcos2_flap_prot_r ); - -/**************************************************************/ -/* EEPROM memory function handlers */ -/**************************************************************/ -#define NAMCOS2_68K_eeprom_W namcos2_68k_eeprom_w -#define NAMCOS2_68K_eeprom_R namcos2_68k_eeprom_r -DECLARE_WRITE16_HANDLER( namcos2_68k_eeprom_w ); -DECLARE_READ16_HANDLER( namcos2_68k_eeprom_r ); - -/**************************************************************/ -/* Shared data ROM memory handlerhandlers */ -/**************************************************************/ -DECLARE_READ16_HANDLER( namcos2_68k_data_rom_r ); - -/**************************************************************/ -/* Shared protection/random number generator */ -/**************************************************************/ -DECLARE_READ16_HANDLER( namcos2_68k_key_r ); -DECLARE_WRITE16_HANDLER( namcos2_68k_key_w ); /**************************************************************/ /* Non-shared memory custom IO device - IRQ/Inputs/Outputs */ @@ -335,15 +344,6 @@ DECLARE_WRITE16_HANDLER( namcos2_68k_key_w ); #define NAMCOS2_C148_SERIRQ 6 /* 0x1cc000 */ #define NAMCOS2_C148_VBLANKIRQ 7 /* 0x1ce000 */ -DECLARE_WRITE16_HANDLER( namcos2_68k_master_C148_w ); -DECLARE_READ16_HANDLER( namcos2_68k_master_C148_r ); - -DECLARE_WRITE16_HANDLER( namcos2_68k_slave_C148_w ); -DECLARE_READ16_HANDLER( namcos2_68k_slave_C148_r ); - -DECLARE_WRITE16_HANDLER( namcos2_68k_gpu_C148_w ); -DECLARE_READ16_HANDLER( namcos2_68k_gpu_C148_r ); - void namcos2_adjust_posirq_timer( running_machine &machine, int scanline ); /**************************************************************/ @@ -367,21 +367,3 @@ void namcos2_adjust_posirq_timer( running_machine &machine, int scanline ); /* Sound CPU support handlers - 6809 */ /**************************************************************/ -DECLARE_WRITE8_HANDLER( namcos2_sound_bankselect_w ); - -/**************************************************************/ -/* MCU Specific support handlers - HD63705 */ -/**************************************************************/ - -DECLARE_WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w ); -DECLARE_READ8_HANDLER( namcos2_mcu_analog_ctrl_r ); - -DECLARE_WRITE8_HANDLER( namcos2_mcu_analog_port_w ); -DECLARE_READ8_HANDLER( namcos2_mcu_analog_port_r ); - -DECLARE_WRITE8_HANDLER( namcos2_mcu_port_d_w ); -DECLARE_READ8_HANDLER( namcos2_mcu_port_d_r ); - -DECLARE_READ8_HANDLER( namcos2_input_port_0_r ); -DECLARE_READ8_HANDLER( namcos2_input_port_10_r ); -DECLARE_READ8_HANDLER( namcos2_input_port_12_r ); diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index b64ba3358d6..8ca6c9a1355 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -146,6 +146,7 @@ public: DECLARE_WRITE16_MEMBER(winrun_gpu_register_w); DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w); DECLARE_READ16_MEMBER(winrun_gpu_videoram_r); + DECLARE_DRIVER_INIT(driveyes); DECLARE_DRIVER_INIT(winrun); DECLARE_DRIVER_INIT(starblad); diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index c85f2c2c01c..2de065a033f 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -30,8 +30,7 @@ static UINT8 *namcos2_eeprom; static int sendval; -// not shared -READ16_HANDLER( namcos2_flap_prot_r ) +READ16_MEMBER( namcos2_state::namcos2_finallap_prot_r ) { static const UINT16 table0[8] = { 0x0000,0x0040,0x0440,0x2440,0x2480,0xa080,0x8081,0x8041 }; static const UINT16 table1[8] = { 0x0040,0x0060,0x0060,0x0860,0x0864,0x08e4,0x08e5,0x08a5 }; @@ -113,7 +112,9 @@ MACHINE_START_MEMBER(namcos2_shared_state,namcos2) MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2) { - address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); +// address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM); + address_space &audio_space = machine().device("audiocpu")->memory().space(AS_PROGRAM); + mFinalLapProtCount = 0; namcos2_mcu_analog_ctrl = 0; namcos2_mcu_analog_data = 0xaa; @@ -121,7 +122,7 @@ MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2) sendval = 0; /* Initialise the bank select in the sound CPU */ - namcos2_sound_bankselect_w(space, 0, 0); /* Page in bank 0 */ + namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */ machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE ); @@ -139,25 +140,16 @@ MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2) /* EEPROM Load/Save and read/write handling */ /*************************************************************/ -WRITE16_HANDLER( namcos2_68k_eeprom_w ){ - if( ACCESSING_BITS_0_7 ) - { - namcos2_eeprom[offset] = data; - } +WRITE8_MEMBER( namcos2_shared_state::namcos2_68k_eeprom_w ) +{ + namcos2_eeprom[offset] = data; } -READ16_HANDLER( namcos2_68k_eeprom_r ){ +READ8_MEMBER( namcos2_shared_state::namcos2_68k_eeprom_r ) +{ return namcos2_eeprom[offset]; } -/*************************************************************/ -/* 68000 Shared memory area - Data ROM area */ -/*************************************************************/ -READ16_HANDLER( namcos2_68k_data_rom_r ){ - UINT16 *ROM = (UINT16 *)space.machine().root_device().memregion("user1")->base(); - return ROM[offset]; -} - /**************************************************************/ @@ -227,9 +219,9 @@ suzuk8h2 1993 sws93 1993 334 $014e *************************************************************/ -READ16_HANDLER( namcos2_68k_key_r ) +READ16_MEMBER( namcos2_state::namcos2_68k_key_r ) { - switch (space.machine().driver_data()->m_gametype) + switch (machine().driver_data()->m_gametype) { case NAMCOS2_ORDYNE: switch(offset) @@ -401,9 +393,9 @@ READ16_HANDLER( namcos2_68k_key_r ) return space.machine().rand()&0xffff; } -WRITE16_HANDLER( namcos2_68k_key_w ) +WRITE16_MEMBER( namcos2_state::namcos2_68k_key_w ) { - int gametype = space.machine().driver_data()->m_gametype; + int gametype = machine().driver_data()->m_gametype; if( gametype == NAMCOS2_MARVEL_LAND && offset == 5 ) { if (data == 0x615E) sendval = 1; @@ -619,32 +611,32 @@ ReadWriteC148( address_space &space, offs_t offset, UINT16 data, int bWrite ) return result; } -WRITE16_HANDLER( namcos2_68k_master_C148_w ) +WRITE16_MEMBER( namcos2_shared_state::namcos2_68k_master_C148_w ) { (void)ReadWriteC148(space, offset, data, 1); } -READ16_HANDLER( namcos2_68k_master_C148_r ) +READ16_MEMBER( namcos2_shared_state::namcos2_68k_master_C148_r ) { return ReadWriteC148(space, offset, 0, 0); } -WRITE16_HANDLER( namcos2_68k_slave_C148_w ) +WRITE16_MEMBER( namcos2_shared_state::namcos2_68k_slave_C148_w ) { (void)ReadWriteC148(space, offset, data, 1); } -READ16_HANDLER( namcos2_68k_slave_C148_r ) +READ16_MEMBER( namcos2_shared_state::namcos2_68k_slave_C148_r ) { return ReadWriteC148(space, offset, 0, 0); } -WRITE16_HANDLER( namcos2_68k_gpu_C148_w ) +WRITE16_MEMBER( namcos2_shared_state::namcos21_68k_gpu_C148_w ) { (void)ReadWriteC148(space, offset, data, 1); } -READ16_HANDLER( namcos2_68k_gpu_C148_r ) +READ16_MEMBER( namcos2_shared_state::namcos21_68k_gpu_C148_r ) { return ReadWriteC148(space, offset, 0, 0); } @@ -706,12 +698,12 @@ INTERRUPT_GEN_MEMBER(namcos2_shared_state::namcos2_68k_gpu_vblank) /* Sound sub-system */ /**************************************************************/ -WRITE8_HANDLER( namcos2_sound_bankselect_w ) +WRITE8_MEMBER( namcos2_shared_state::namcos2_sound_bankselect_w ) { - UINT8 *RAM=space.machine().root_device().memregion("audiocpu")->base(); - UINT32 max = (space.machine().root_device().memregion("audiocpu")->bytes() - 0x10000) / 0x4000; + UINT8 *RAM= machine().root_device().memregion("audiocpu")->base(); + UINT32 max = (machine().root_device().memregion("audiocpu")->bytes() - 0x10000) / 0x4000; int bank = ( data >> 4 ) % max; /* 991104.CAB */ - space.machine().root_device().membank(BANKED_SOUND_ROM)->set_base(&RAM[ 0x10000 + ( 0x4000 * bank ) ] ); + machine().root_device().membank(BANKED_SOUND_ROM)->set_base(&RAM[ 0x10000 + ( 0x4000 * bank ) ] ); } /**************************************************************/ @@ -720,7 +712,7 @@ WRITE8_HANDLER( namcos2_sound_bankselect_w ) /* */ /**************************************************************/ -WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w ) +WRITE8_MEMBER( namcos2_shared_state::namcos2_mcu_analog_ctrl_w ) { namcos2_mcu_analog_ctrl = data & 0xff; @@ -735,28 +727,28 @@ WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w ) switch((data>>2) & 0x07) { case 0: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN0")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN0")->read(); break; case 1: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN1")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN1")->read(); break; case 2: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN2")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN2")->read(); break; case 3: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN3")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN3")->read(); break; case 4: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN4")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN4")->read(); break; case 5: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN5")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN5")->read(); break; case 6: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN6")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN6")->read(); break; case 7: - namcos2_mcu_analog_data=space.machine().root_device().ioport("AN7")->read(); + namcos2_mcu_analog_data=machine().root_device().ioport("AN7")->read(); break; default: output_set_value("anunk",data); @@ -773,12 +765,12 @@ WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w ) /* If the interrupt enable bit is set trigger an A/D IRQ */ if(data & 0x20) { - generic_pulse_irq_line(space.machine().device("mcu"), HD63705_INT_ADCONV, 1); + generic_pulse_irq_line(machine().device("mcu")->execute(), HD63705_INT_ADCONV, 1); } } } -READ8_HANDLER( namcos2_mcu_analog_ctrl_r ) +READ8_MEMBER( namcos2_shared_state::namcos2_mcu_analog_ctrl_r ) { int data=0; @@ -792,55 +784,38 @@ READ8_HANDLER( namcos2_mcu_analog_ctrl_r ) return data; } -WRITE8_HANDLER( namcos2_mcu_analog_port_w ) +WRITE8_MEMBER( namcos2_shared_state::namcos2_mcu_analog_port_w ) { } -READ8_HANDLER( namcos2_mcu_analog_port_r ) +READ8_MEMBER( namcos2_shared_state::namcos2_mcu_analog_port_r ) { if(namcos2_mcu_analog_complete==1) namcos2_mcu_analog_complete=0; return namcos2_mcu_analog_data; } -WRITE8_HANDLER( namcos2_mcu_port_d_w ) +WRITE8_MEMBER( namcos2_shared_state::namcos2_mcu_port_d_w ) { /* Undefined operation on write */ } -READ8_HANDLER( namcos2_mcu_port_d_r ) +READ8_MEMBER( namcos2_shared_state::namcos2_mcu_port_d_r ) { /* Provides a digital version of the analog ports */ int threshold = 0x7f; int data = 0; /* Read/convert the bits one at a time */ - if(space.machine().root_device().ioport("AN0")->read() > threshold) data |= 0x01; - if(space.machine().root_device().ioport("AN1")->read() > threshold) data |= 0x02; - if(space.machine().root_device().ioport("AN2")->read() > threshold) data |= 0x04; - if(space.machine().root_device().ioport("AN3")->read() > threshold) data |= 0x08; - if(space.machine().root_device().ioport("AN4")->read() > threshold) data |= 0x10; - if(space.machine().root_device().ioport("AN5")->read() > threshold) data |= 0x20; - if(space.machine().root_device().ioport("AN6")->read() > threshold) data |= 0x40; - if(space.machine().root_device().ioport("AN7")->read() > threshold) data |= 0x80; + if(machine().root_device().ioport("AN0")->read() > threshold) data |= 0x01; + if(machine().root_device().ioport("AN1")->read() > threshold) data |= 0x02; + if(machine().root_device().ioport("AN2")->read() > threshold) data |= 0x04; + if(machine().root_device().ioport("AN3")->read() > threshold) data |= 0x08; + if(machine().root_device().ioport("AN4")->read() > threshold) data |= 0x10; + if(machine().root_device().ioport("AN5")->read() > threshold) data |= 0x20; + if(machine().root_device().ioport("AN6")->read() > threshold) data |= 0x40; + if(machine().root_device().ioport("AN7")->read() > threshold) data |= 0x80; /* Return the result */ return data; } -READ8_HANDLER( namcos2_input_port_0_r ) -{ - int data = space.machine().root_device().ioport("MCUB")->read(); - return data; -} - -READ8_HANDLER( namcos2_input_port_10_r ) -{ - int data = space.machine().root_device().ioport("MCUH")->read(); - return data; -} - -READ8_HANDLER( namcos2_input_port_12_r ) -{ - int data = space.machine().root_device().ioport("MCUDI0")->read(); - return data; -}