summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/nmk16.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/nmk16.cpp')
-rw-r--r--src/mame/drivers/nmk16.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index 990aeefedc7..bafad7598b8 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -321,7 +321,7 @@ WRITE16_MEMBER(nmk16_state::afega_soundlatch_w)
/***************************************************************************/
-static ADDRESS_MAP_START( vandyke_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::vandyke_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( vandyke_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vandykeb_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::vandykeb_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -358,7 +358,7 @@ static ADDRESS_MAP_START( vandykeb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( manybloc_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::manybloc_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( manybloc_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::tharrier_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ(tharrier_mcu_r) // AM_READ_PORT("IN1")
@@ -395,7 +395,7 @@ static ADDRESS_MAP_START( tharrier_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_sound_map, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::tharrier_sound_map)
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_DEVWRITE("soundlatch2", generic_latch_8_device, write)
@@ -405,7 +405,7 @@ static ADDRESS_MAP_START( tharrier_sound_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xf700, 0xf700) AM_WRITE(tharrier_oki6295_bankswitch_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_sound_io_map, AS_IO, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::tharrier_sound_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
ADDRESS_MAP_END
@@ -413,7 +413,7 @@ ADDRESS_MAP_END
//Read input port 1 030c8/ BAD
//3478 GOOD
-static ADDRESS_MAP_START( mustang_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::mustang_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( mustang_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mustangb_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::mustangb_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -448,7 +448,7 @@ static ADDRESS_MAP_START( mustangb_map, AS_PROGRAM, 16, nmk16_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( twinactn_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::twinactn_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( twinactn_map, AS_PROGRAM, 16, nmk16_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( acrobatm_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::acrobatm_map)
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x80000, 0x8ffff) AM_RAM AM_SHARE("mainram")
AM_RANGE(0xc0000, 0xc0001) AM_READ_PORT("IN0")
@@ -484,7 +484,7 @@ static ADDRESS_MAP_START( acrobatm_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0xd4000, 0xd47ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_SHARE("nmk_txvideoram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bioship_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::bioship_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -662,7 +662,7 @@ WRITE16_MEMBER(nmk16_state::hachamf_mainram_w)
}
-static ADDRESS_MAP_START( hachamf_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::hachamf_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
/* I/O Region */
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
@@ -889,7 +889,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::hachamf_mcu_sim)
mcu_run(0);
}
-static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::tdragon_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044022, 0x044023) AM_READNOP /* No Idea */
// AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM /* Work RAM */
@@ -919,7 +919,7 @@ READ16_MEMBER(nmk16_state::tdragonb_prot_r)
return 0x0003;
}
-static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::tdragonb_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044022, 0x044023) AM_READ(tdragonb_prot_r)
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_SHARE("mainram")
@@ -936,7 +936,7 @@ static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_SHARE("nmk_txvideoram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::ssmissin_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_SHARE("mainram")
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN0")
@@ -952,7 +952,7 @@ static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0d0000, 0x0d07ff) AM_MIRROR(0x1800) AM_RAM_WRITE(nmk_txvideoram_w) AM_SHARE("nmk_txvideoram") //mirror for airattck
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssmissin_sound_map, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::ssmissin_sound_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(ssmissin_soundbank_w)
@@ -960,17 +960,17 @@ static ADDRESS_MAP_START( ssmissin_sound_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki1_map, 0, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::oki1_map)
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki2_map, 0, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::oki2_map)
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( strahl_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::strahl_map)
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x80000, 0x80001) AM_READ_PORT("IN0")
AM_RANGE(0x80002, 0x80003) AM_READ_PORT("IN1")
@@ -989,7 +989,7 @@ static ADDRESS_MAP_START( strahl_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0xf0000, 0xfffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::macross_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -1007,7 +1007,7 @@ static ADDRESS_MAP_START( macross_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gunnail_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::gunnail_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -1027,7 +1027,7 @@ static ADDRESS_MAP_START( gunnail_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::macross2_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN0")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("IN1")
@@ -1053,13 +1053,13 @@ static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tdragon3h_map, AS_PROGRAM, 16, nmk16_state ) // bootleg has these 2 swapped
+ADDRESS_MAP_START(nmk16_state::tdragon3h_map) // bootleg has these 2 swapped
AM_IMPORT_FROM(macross2_map)
AM_RANGE(0x10000e, 0x10000f) AM_READ_PORT("DSW2")
AM_RANGE(0x10000a, 0x10000b) AM_DEVREAD8("soundlatch2", generic_latch_8_device, read, 0x00ff) /* from Z80 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::raphero_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN0")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("IN1")
@@ -1086,7 +1086,7 @@ static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raphero_sound_mem_map, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::raphero_sound_mem_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
@@ -1098,7 +1098,7 @@ static ADDRESS_MAP_START( raphero_sound_mem_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_sound_map, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::macross2_sound_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked ROM */
AM_RANGE(0xa000, 0xa000) AM_READNOP /* IRQ ack? watchdog? */
@@ -1107,7 +1107,7 @@ static ADDRESS_MAP_START( macross2_sound_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xf000, 0xf000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_DEVWRITE("soundlatch2", generic_latch_8_device, write) /* from 68000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_sound_io_map, AS_IO, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::macross2_sound_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("oki1", okim6295_device, read, write)
@@ -1115,7 +1115,7 @@ static ADDRESS_MAP_START( macross2_sound_io_map, AS_IO, 8, nmk16_state )
AM_RANGE(0x90, 0x97) AM_DEVWRITE("nmk112", nmk112_device, okibank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::bjtwin_map)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -1132,7 +1132,7 @@ static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16, nmk16_state )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atombjt_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::atombjt_map)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080014, 0x080015) AM_NOP // always 1 in this bootleg. Flip-screen switch not present according to dip sheet.
AM_RANGE(0x088000, 0x0887ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette")
@@ -5024,7 +5024,7 @@ WRITE16_MEMBER(nmk16_state::afega_scroll1_w)
*/
-static ADDRESS_MAP_START( afega_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::afega_map)
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // Buttons
@@ -5049,7 +5049,7 @@ static ADDRESS_MAP_START( afega_map, AS_PROGRAM, 16, nmk16_state )
ADDRESS_MAP_END
// firehawk has 0x100000 bytes of program rom (at least the switchable version) so the above can't work.
-static ADDRESS_MAP_START( firehawk_map, AS_PROGRAM, 16, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::firehawk_map)
ADDRESS_MAP_GLOBAL_MASK(0x3fffff)
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x280000, 0x280001) AM_READ_PORT("IN0") // Buttons
@@ -5089,7 +5089,7 @@ WRITE8_MEMBER(nmk16_state::spec2k_oki1_banking_w)
m_oki2->set_rom_bank(1);
}
-static ADDRESS_MAP_START( afega_sound_cpu, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::afega_sound_cpu)
AM_RANGE(0x0003, 0x0003) AM_WRITENOP // bug in sound prg?
AM_RANGE(0x0004, 0x0004) AM_WRITENOP // bug in sound prg?
AM_RANGE(0x0000, 0xefff) AM_ROM
@@ -5099,7 +5099,7 @@ static ADDRESS_MAP_START( afega_sound_cpu, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE("oki1", okim6295_device, read, write) // M6295
ADDRESS_MAP_END
-static ADDRESS_MAP_START( firehawk_sound_cpu, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::firehawk_sound_cpu)
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xffff) AM_RAM // not used, only tested
@@ -5120,7 +5120,7 @@ WRITE8_MEMBER(nmk16_state::twinactn_oki_bank_w)
// logerror("%04x: oki bank %02x\n", m_audiocpu->pc(), data);
}
-static ADDRESS_MAP_START( twinactn_sound_cpu, AS_PROGRAM, 8, nmk16_state )
+ADDRESS_MAP_START(nmk16_state::twinactn_sound_cpu)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(twinactn_oki_bank_w)