diff options
Diffstat (limited to 'src/mame/drivers')
2096 files changed, 11299 insertions, 7934 deletions
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index b2cdaf43952..2a0de5e5280 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -180,7 +180,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(_1942_state::c1942_scanline) -static ADDRESS_MAP_START( c1942_map, AS_PROGRAM, 8, _1942_state ) +ADDRESS_MAP_START(_1942_state::c1942_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") @@ -215,7 +215,7 @@ WRITE8_MEMBER(_1942_state::c1942p_palette_w) m_palette->set_indirect_color(offset, rgb_t(r<<5,g<<5,b<<6)); } -static ADDRESS_MAP_START( c1942p_map, AS_PROGRAM, 8, _1942_state ) +ADDRESS_MAP_START(_1942_state::c1942p_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") @@ -244,13 +244,13 @@ static ADDRESS_MAP_START( c1942p_map, AS_PROGRAM, 8, _1942_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START(c1942p_sound_map, AS_PROGRAM, 8, _1942_state ) +ADDRESS_MAP_START(_1942_state::c1942p_sound_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0xc000, 0xc000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( c1942p_sound_io, AS_IO, 8, _1942_state ) +ADDRESS_MAP_START(_1942_state::c1942p_sound_io) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x0000, 0x0000) AM_WRITENOP AM_RANGE(0x0014, 0x0015) AM_DEVWRITE("ay1", ay8910_device, address_data_w) @@ -259,7 +259,7 @@ ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, _1942_state ) +ADDRESS_MAP_START(_1942_state::sound_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index 4ff2f24c5de..9414b112bc1 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -102,7 +102,7 @@ READ8_MEMBER(_1943_state::_1943b_c007_r) /* Memory Maps */ -static ADDRESS_MAP_START( c1943_map, AS_PROGRAM, 8, _1943_state ) +ADDRESS_MAP_START(_1943_state::c1943_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM") @@ -129,7 +129,7 @@ static ADDRESS_MAP_START( c1943_map, AS_PROGRAM, 8, _1943_state ) AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram") ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, _1943_state ) +ADDRESS_MAP_START(_1943_state::sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index c6efa99b79b..c28a286a876 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -93,6 +93,9 @@ public: required_device<palette_device> m_palette; void flagrall(machine_config &config); void k3(machine_config &config); + void flagrall_map(address_map &map); + void k3_base_map(address_map &map); + void k3_map(address_map &map); }; @@ -185,7 +188,7 @@ WRITE16_MEMBER(k3_state::flagrall_soundbanks_w) } -static ADDRESS_MAP_START( k3_base_map, AS_PROGRAM, 16, k3_state ) +ADDRESS_MAP_START(k3_state::k3_base_map) AM_RANGE(0x0009ce, 0x0009cf) AM_WRITENOP // k3 - bug in code? (clean up log) AM_RANGE(0x0009d2, 0x0009d3) AM_WRITENOP // l3 - bug in code? (clean up log) @@ -203,7 +206,7 @@ static ADDRESS_MAP_START( k3_base_map, AS_PROGRAM, 16, k3_state ) AM_RANGE(0x480000, 0x480001) AM_READ_PORT("DSW") ADDRESS_MAP_END -static ADDRESS_MAP_START( k3_map, AS_PROGRAM, 16, k3_state ) +ADDRESS_MAP_START(k3_state::k3_map) AM_IMPORT_FROM( k3_base_map ) AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(k3_soundbanks_w) @@ -214,7 +217,7 @@ static ADDRESS_MAP_START( k3_map, AS_PROGRAM, 16, k3_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( flagrall_map, AS_PROGRAM, 16, k3_state ) +ADDRESS_MAP_START(k3_state::flagrall_map) AM_IMPORT_FROM( k3_base_map ) AM_RANGE(0x3c0000, 0x3c0001) AM_WRITE(flagrall_soundbanks_w) diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index b1656b5952d..571f6111e80 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -186,7 +186,7 @@ WRITE8_MEMBER(_20pacgal_state::sprite_lookup_w) // where does the clut (sprite_lookup_w) get uploaded? even if I set a WP on that data in ROM it isn't hit? // likewise the sound table.. is it being uploaded in a different format at 0x0c000? // we also need the palette data because there is only a single rom on this pcb? -static ADDRESS_MAP_START( 25pacman_map, AS_PROGRAM, 8, _25pacman_state ) +ADDRESS_MAP_START(_25pacman_state::_25pacman_map) AM_RANGE(0x00000, 0x3ffff) AM_DEVREADWRITE("flash", amd_29lv200t_device, read, write ) // (always fall through if nothing else is mapped?) AM_RANGE(0x04000, 0x047ff) AM_RAM AM_SHARE("video_ram") @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( 25pacman_map, AS_PROGRAM, 8, _25pacman_state ) AM_RANGE(0x1c000, 0x1ffff) AM_WRITENOP ADDRESS_MAP_END -static ADDRESS_MAP_START( 20pacgal_map, AS_PROGRAM, 8, _20pacgal_state ) +ADDRESS_MAP_START(_20pacgal_state::_20pacgal_map) AM_RANGE(0x00000, 0x03fff) AM_ROM AM_RANGE(0x04000, 0x07fff) AM_ROM AM_RANGE(0x08000, 0x09fff) AM_ROM @@ -232,7 +232,7 @@ READ8_MEMBER( _25pacman_state::_25pacman_io_87_r ) return 0xff; } - static ADDRESS_MAP_START( 25pacman_io_map, AS_IO, 8, _25pacman_state ) +ADDRESS_MAP_START(_25pacman_state::_25pacman_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_NOP /* Z180 internal registers */ AM_RANGE(0x40, 0x7f) AM_NOP /* Z180 internal registers */ @@ -254,7 +254,7 @@ READ8_MEMBER( _25pacman_state::_25pacman_io_87_r ) AM_RANGE(0x8f, 0x8f) AM_WRITE(_20pacgal_coin_counter_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( 20pacgal_io_map, AS_IO, 8, _20pacgal_state ) +ADDRESS_MAP_START(_20pacgal_state::_20pacgal_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x3f) AM_NOP /* Z180 internal registers */ AM_RANGE(0x40, 0x7f) AM_NOP /* Z180 internal registers */ @@ -393,8 +393,8 @@ MACHINE_CONFIG_START(_20pacgal_state::_20pacgal) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(20pacgal_map) - MCFG_CPU_IO_MAP(20pacgal_io_map) + MCFG_CPU_PROGRAM_MAP(_20pacgal_map) + MCFG_CPU_IO_MAP(_20pacgal_io_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", _20pacgal_state, vblank_irq) MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom") @@ -421,8 +421,8 @@ MACHINE_CONFIG_DERIVED(_25pacman_state::_25pacman, _20pacgal) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(25pacman_map) - MCFG_CPU_IO_MAP(25pacman_io_map) + MCFG_CPU_PROGRAM_MAP(_25pacman_map) + MCFG_CPU_IO_MAP(_25pacman_io_map) MCFG_AMD_29LV200T_ADD("flash") MACHINE_CONFIG_END diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp index b326b4f499d..a87690c45cb 100644 --- a/src/mame/drivers/24cdjuke.cpp +++ b/src/mame/drivers/24cdjuke.cpp @@ -87,6 +87,8 @@ public: DECLARE_READ8_MEMBER(unknown_r) { return machine().rand(); } void midcoin24cdjuke(machine_config &config); + void midcoin24cdjuke_io(address_map &map); + void midcoin24cdjuke_map(address_map &map); private: uint8_t m_kb_col; }; @@ -123,13 +125,13 @@ WRITE8_MEMBER(midcoin24cdjuke_state::digit_w) } -static ADDRESS_MAP_START( midcoin24cdjuke_map, AS_PROGRAM, 8, midcoin24cdjuke_state ) +ADDRESS_MAP_START(midcoin24cdjuke_state::midcoin24cdjuke_map) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x7800, 0x780f) AM_WRITE(digit_w) AM_RANGE(0x8000, 0xffff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( midcoin24cdjuke_io, AS_IO, 8, midcoin24cdjuke_state ) +ADDRESS_MAP_START(midcoin24cdjuke_state::midcoin24cdjuke_io) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ic31", i8255_device, read, write) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ic11", i8255_device, read, write) diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 2a398f93978..2c53c24d638 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -72,6 +72,8 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); void drill(machine_config &config); + void drill_map(address_map &map); + #ifdef UNUSED_FUNCTION enum { @@ -192,7 +194,7 @@ WRITE16_MEMBER(_2mindril_state::drill_irq_w) COMBINE_DATA(&m_irq_reg); } -static ADDRESS_MAP_START( drill_map, AS_PROGRAM, 16, _2mindril_state ) +ADDRESS_MAP_START(_2mindril_state::drill_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_RANGE(0x300000, 0x3000ff) AM_RAM diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp index 0535b081243..2c25f09ee04 100644 --- a/src/mame/drivers/30test.cpp +++ b/src/mame/drivers/30test.cpp @@ -75,6 +75,8 @@ public: required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; void _30test(machine_config &config); + void namco_30test_io(address_map &map); + void namco_30test_map(address_map &map); }; @@ -137,7 +139,7 @@ WRITE8_MEMBER(namco_30test_state::hc11_okibank_w) } -static ADDRESS_MAP_START( namco_30test_map, AS_PROGRAM, 8, namco_30test_state ) +ADDRESS_MAP_START(namco_30test_state::namco_30test_map) AM_RANGE(0x0000, 0x003f) AM_RAM // internal I/O AM_RANGE(0x0040, 0x007f) AM_RAM // more internal I/O, HC11 change pending AM_RANGE(0x007c, 0x007c) AM_READWRITE(hc11_mux_r,hc11_mux_w) @@ -157,7 +159,7 @@ static ADDRESS_MAP_START( namco_30test_map, AS_PROGRAM, 8, namco_30test_state ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( namco_30test_io, AS_IO, 8, namco_30test_state ) +ADDRESS_MAP_START(namco_30test_state::namco_30test_io) AM_RANGE(MC68HC11_IO_PORTA,MC68HC11_IO_PORTA) AM_READ(namco_30test_mux_r) // AM_RANGE(MC68HC11_IO_PORTD,MC68HC11_IO_PORTD) AM_RAM AM_RANGE(MC68HC11_IO_PORTE,MC68HC11_IO_PORTE) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index 1d0a56c2d4c..d8ab13950e0 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -100,6 +100,7 @@ public: required_device<palette_device> m_palette; void _60in1(machine_config &config); void _39in1(machine_config &config); + void _39in1_map(address_map &map); }; @@ -1453,7 +1454,7 @@ DRIVER_INIT_MEMBER(_39in1_state,39in1) -static ADDRESS_MAP_START( 39in1_map, AS_PROGRAM, 32, _39in1_state ) +ADDRESS_MAP_START(_39in1_state::_39in1_map) AM_RANGE(0x00000000, 0x0007ffff) AM_ROM AM_RANGE(0x00400000, 0x005fffff) AM_ROM AM_REGION("data", 0) AM_RANGE(0x04000000, 0x047fffff) AM_READWRITE(cpld_r, cpld_w ) @@ -1577,7 +1578,7 @@ MACHINE_START_MEMBER(_39in1_state,60in1) MACHINE_CONFIG_START(_39in1_state::_39in1) MCFG_CPU_ADD("maincpu", PXA255, 200000000) - MCFG_CPU_PROGRAM_MAP(39in1_map) + MCFG_CPU_PROGRAM_MAP(_39in1_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", _39in1_state, pxa255_vblank_start) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp index ea5a19ae4a3..ef2a57051a3 100644 --- a/src/mame/drivers/3do.cpp +++ b/src/mame/drivers/3do.cpp @@ -107,7 +107,7 @@ Part list of Goldstar 3DO Interactive Multiplayer #define X601_CLOCK XTAL(16'934'400) -static ADDRESS_MAP_START( 3do_mem, AS_PROGRAM, 32, _3do_state ) +ADDRESS_MAP_START(_3do_state::_3do_mem) AM_RANGE(0x00000000, 0x001FFFFF) AM_RAMBANK("bank1") AM_SHARE("dram") /* DRAM */ AM_RANGE(0x00200000, 0x003FFFFF) AM_RAM AM_SHARE("vram") /* VRAM */ AM_RANGE(0x03000000, 0x030FFFFF) AM_ROMBANK("bank2") /* BIOS */ @@ -158,7 +158,7 @@ MACHINE_CONFIG_START(_3do_state::_3do) /* Basic machine hardware */ MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL(50'000'000)/4 ) - MCFG_CPU_PROGRAM_MAP( 3do_mem) + MCFG_CPU_PROGRAM_MAP( _3do_mem) MCFG_NVRAM_ADD_1FILL("nvram") @@ -178,7 +178,7 @@ MACHINE_CONFIG_START(_3do_state::_3do_pal) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL(50'000'000)/4 ) - MCFG_CPU_PROGRAM_MAP( 3do_mem) + MCFG_CPU_PROGRAM_MAP( _3do_mem) MCFG_NVRAM_ADD_1FILL("nvram") diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp index 419b01b8762..86dd7742ef0 100644 --- a/src/mame/drivers/3x3puzzl.cpp +++ b/src/mame/drivers/3x3puzzl.cpp @@ -97,6 +97,7 @@ public: DECLARE_WRITE16_MEMBER(tilemap1_scrolly_w); void _3x3puzzle(machine_config &config); + void _3x3puzzle_map(address_map &map); protected: virtual void video_start() override; virtual void machine_start() override; @@ -208,7 +209,7 @@ uint32_t _3x3puzzle_state::screen_update( screen_device &screen, bitmap_rgb32 &b return 0; } -static ADDRESS_MAP_START( _3x3puzzle_map, AS_PROGRAM, 16, _3x3puzzle_state ) +ADDRESS_MAP_START(_3x3puzzle_state::_3x3puzzle_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_RANGE(0x200000, 0x2007ff) AM_RAM AM_SHARE("videoram1") diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index 5b087e2b5a1..45d4fd4b217 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -27,6 +27,11 @@ public: DECLARE_WRITE8_MEMBER( neon_w ); void _4004clk(machine_config &config); + void _4004clk_mem(address_map &map); + void _4004clk_mp(address_map &map); + void _4004clk_rom(address_map &map); + void _4004clk_rp(address_map &map); + void _4004clk_stat(address_map &map); protected: virtual void machine_start() override; @@ -79,28 +84,28 @@ WRITE8_MEMBER(nixieclock_state::neon_w) output_set_neon_value(3, BIT(data,0)); } -static ADDRESS_MAP_START(4004clk_rom, i4004_cpu_device::AS_ROM, 8, nixieclock_state) +ADDRESS_MAP_START(nixieclock_state::_4004clk_rom) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("maincpu", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START(4004clk_mem, i4004_cpu_device::AS_RAM_MEMORY, 8, nixieclock_state) +ADDRESS_MAP_START(nixieclock_state::_4004clk_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x007f) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START(4004clk_stat, i4004_cpu_device::AS_RAM_STATUS, 8, nixieclock_state) +ADDRESS_MAP_START(nixieclock_state::_4004clk_stat) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x001f) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START(4004clk_rp, i4004_cpu_device::AS_ROM_PORTS, 8, nixieclock_state) +ADDRESS_MAP_START(nixieclock_state::_4004clk_rp) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x000f) AM_MIRROR(0x0700) AM_READ_PORT("INPUT") AM_RANGE(0x0000, 0x00ef) AM_MIRROR(0x0700) AM_WRITE(nixie_w) AM_RANGE(0x00f0, 0x00ff) AM_MIRROR(0x0700) AM_WRITE(neon_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(4004clk_mp, i4004_cpu_device::AS_RAM_PORTS, 8, nixieclock_state) +ADDRESS_MAP_START(nixieclock_state::_4004clk_mp) AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_bit_interface, write) ADDRESS_MAP_END @@ -128,11 +133,11 @@ MACHINE_CONFIG_START(nixieclock_state::_4004clk) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I4004, XTAL(5'000'000) / 8) - MCFG_I4004_ROM_MAP(4004clk_rom) - MCFG_I4004_RAM_MEMORY_MAP(4004clk_mem) - MCFG_I4004_ROM_PORTS_MAP(4004clk_rp) - MCFG_I4004_RAM_STATUS_MAP(4004clk_stat) - MCFG_I4004_RAM_PORTS_MAP(4004clk_mp) + MCFG_I4004_ROM_MAP(_4004clk_rom) + MCFG_I4004_RAM_MEMORY_MAP(_4004clk_mem) + MCFG_I4004_ROM_PORTS_MAP(_4004clk_rp) + MCFG_I4004_RAM_STATUS_MAP(_4004clk_stat) + MCFG_I4004_RAM_PORTS_MAP(_4004clk_mp) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_4004clk) diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index c1b3d037a2e..04942d08bea 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -398,7 +398,7 @@ WRITE8_MEMBER(fortyl_state::to_main_w) /***************************************************************************/ -static ADDRESS_MAP_START( 40love_map, AS_PROGRAM, 8, fortyl_state ) +ADDRESS_MAP_START(fortyl_state::_40love_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM /* M5517P on main board */ AM_RANGE(0x8800, 0x8800) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, data_r, data_w) @@ -424,7 +424,7 @@ static ADDRESS_MAP_START( 40love_map, AS_PROGRAM, 8, fortyl_state ) AM_RANGE(0xc000, 0xffff) AM_READWRITE(fortyl_pixram_r, fortyl_pixram_w) /* banked pixel layer */ ADDRESS_MAP_END -static ADDRESS_MAP_START( undoukai_map, AS_PROGRAM, 8, fortyl_state ) +ADDRESS_MAP_START(fortyl_state::undoukai_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("mcu_ram") /* M5517P on main board */ @@ -491,7 +491,7 @@ WRITE8_MEMBER(fortyl_state::sound_control_3_w)/* unknown */ // popmessage("SND3 0=%02x 1=%02x 2=%02x 3=%02x", m_snd_ctrl0, m_snd_ctrl1, m_snd_ctrl2, m_snd_ctrl3); } -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, fortyl_state ) +ADDRESS_MAP_START(fortyl_state::sound_map) AM_RANGE(0x0000, 0xbfff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_device, address_data_w) @@ -756,7 +756,7 @@ MACHINE_CONFIG_START(fortyl_state::_40love) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */ - MCFG_CPU_PROGRAM_MAP(40love_map) + MCFG_CPU_PROGRAM_MAP(_40love_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", fortyl_state, irq0_line_hold) MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */ diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index 6bdc064df0a..a86e832b186 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -50,6 +50,7 @@ public: inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... ); required_device<cpu_device> m_maincpu; void sgi_ip6(machine_config &config); + void sgi_ip6_map(address_map &map); }; @@ -217,7 +218,7 @@ void sgi_ip6_state::machine_reset() ADDRESS MAPS ***************************************************************************/ -static ADDRESS_MAP_START( sgi_ip6_map, AS_PROGRAM, 32, sgi_ip6_state ) +ADDRESS_MAP_START(sgi_ip6_state::sgi_ip6_map) AM_RANGE( 0x1f880000, 0x1f880003 ) AM_READWRITE(ip6_unk1_r, ip6_unk1_w) AM_RANGE( 0x1fb00000, 0x1fb00003 ) AM_READWRITE(ip6_unk3_r, ip6_unk3_w) AM_RANGE( 0x1fbc004c, 0x1fbc004f ) AM_READWRITE(ip6_unk2_r, ip6_unk2_w) diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp index 95cb86b981d..df0a407dbb9 100644 --- a/src/mame/drivers/4enlinea.cpp +++ b/src/mame/drivers/4enlinea.cpp @@ -234,6 +234,10 @@ public: required_device<cpu_device> m_maincpu; void _4enlinea(machine_config &config); + void audio_map(address_map &map); + void audio_portmap(address_map &map); + void main_map(address_map &map); + void main_portmap(address_map &map); }; @@ -346,7 +350,7 @@ READ8_MEMBER(_4enlinea_state::serial_r) * Memory Map Information * ***********************************/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _4enlinea_state ) +ADDRESS_MAP_START(_4enlinea_state::main_map) AM_RANGE(0x0000, 0x7fff) AM_ROM // AM_RANGE(0x8000, 0xbfff) AM_RAM // CGA VRAM AM_RANGE(0xc000, 0xdfff) AM_RAM @@ -354,7 +358,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _4enlinea_state ) AM_RANGE(0xe000, 0xe001) AM_READ(serial_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( main_portmap, AS_IO, 8, _4enlinea_state ) +ADDRESS_MAP_START(_4enlinea_state::main_portmap) ADDRESS_MAP_GLOBAL_MASK(0x3ff) // AM_RANGE(0x3d4, 0x3df) CGA regs @@ -384,7 +388,7 @@ READ8_MEMBER(_4enlinea_state::hack_r) return machine().rand(); } -static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, _4enlinea_state ) +ADDRESS_MAP_START(_4enlinea_state::audio_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xf800, 0xfbff) AM_RAM AM_RANGE(0xfc24, 0xfc24) AM_READ(hack_r) @@ -396,7 +400,7 @@ static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, _4enlinea_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( audio_portmap, AS_IO, 8, _4enlinea_state ) +ADDRESS_MAP_START(_4enlinea_state::audio_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp index ad1586deb54..b728bcfd5f3 100644 --- a/src/mame/drivers/4enraya.cpp +++ b/src/mame/drivers/4enraya.cpp @@ -250,11 +250,11 @@ WRITE8_MEMBER(_4enraya_state::fenraya_custom_map_w) * Memory Map Information * ***********************************/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _4enraya_state ) +ADDRESS_MAP_START(_4enraya_state::main_map) AM_RANGE(0x0000, 0xffff) AM_READWRITE(fenraya_custom_map_r, fenraya_custom_map_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( main_portmap, AS_IO, 8, _4enraya_state ) +ADDRESS_MAP_START(_4enraya_state::main_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW") AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS") @@ -264,14 +264,14 @@ static ADDRESS_MAP_START( main_portmap, AS_IO, 8, _4enraya_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( unkpacg_main_map, AS_PROGRAM, 8, _4enraya_state ) +ADDRESS_MAP_START(_4enraya_state::unkpacg_main_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x7000, 0x7fff) AM_WRITE(fenraya_videoram_w) AM_RANGE(0x8000, 0x9fff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( unkpacg_main_portmap, AS_IO, 8, _4enraya_state ) +ADDRESS_MAP_START(_4enraya_state::unkpacg_main_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp index 1b1c1b06736..49ad743baa5 100644 --- a/src/mame/drivers/4roses.cpp +++ b/src/mame/drivers/4roses.cpp @@ -194,6 +194,7 @@ public: DECLARE_DRIVER_INIT(4roses); void _4roses(machine_config &config); + void _4roses_map(address_map &map); }; @@ -207,7 +208,7 @@ public: * Memory map information * *************************/ -static ADDRESS_MAP_START( 4roses_map, AS_PROGRAM, 8, _4roses_state ) +ADDRESS_MAP_START(_4roses_state::_4roses_map) AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_SHARE("nvram") AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_SHARE("videoram") AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_SHARE("colorram") @@ -357,7 +358,7 @@ GFXDECODE_END MACHINE_CONFIG_START(_4roses_state::_4roses) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */ - MCFG_CPU_PROGRAM_MAP(4roses_map) + MCFG_CPU_PROGRAM_MAP(_4roses_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", _4roses_state, nmi_line_pulse) // MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index 8ec6f6f2be3..d95b88e9fee 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -507,6 +507,8 @@ public: DECLARE_PALETTE_INIT(_5clown); uint32_t screen_update_fclown(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void fclown(machine_config &config); + void fcaudio_map(address_map &map); + void fclown_map(address_map &map); }; void _5clown_state::machine_start() @@ -754,7 +756,7 @@ WRITE8_MEMBER(_5clown_state::snd_a02_w) * Memory map information * *************************/ -static ADDRESS_MAP_START( fclown_map, AS_PROGRAM, 8, _5clown_state ) +ADDRESS_MAP_START(_5clown_state::fclown_map) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_device, address_w) AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) @@ -829,7 +831,7 @@ ADDRESS_MAP_END */ -static ADDRESS_MAP_START( fcaudio_map, AS_PROGRAM, 8, _5clown_state ) +ADDRESS_MAP_START(_5clown_state::fcaudio_map) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x0800) AM_WRITE(snd_800_w) AM_RANGE(0x0a02, 0x0a02) AM_WRITE(snd_a02_w) diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp index 46aac1ed08c..90353a42662 100644 --- a/src/mame/drivers/68ksbc.cpp +++ b/src/mame/drivers/68ksbc.cpp @@ -42,11 +42,12 @@ public: { } void c68ksbc(machine_config &config); + void c68ksbc_mem(address_map &map); private: required_device<cpu_device> m_maincpu; }; -static ADDRESS_MAP_START(c68ksbc_mem, AS_PROGRAM, 16, c68ksbc_state) +ADDRESS_MAP_START(c68ksbc_state::c68ksbc_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x002fff) AM_ROM AM_RANGE(0x003000, 0x5fffff) AM_RAM diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 254de8d1d28..a6f1bd2d46d 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -372,7 +372,7 @@ INPUT_PORTS_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( invadpt2_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::invadpt2_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -441,7 +441,7 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( spacerng_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::spacerng_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -466,7 +466,7 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( spcewars_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::spcewars_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -523,7 +523,7 @@ MACHINE_CONFIG_END // has a slightly rearranged io map and has PROMs and watchdog -static ADDRESS_MAP_START( spcewarla_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::spcewarla_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") @@ -553,7 +553,7 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( astropal_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::astropal_io_map) ADDRESS_MAP_GLOBAL_MASK(0x7) AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1") @@ -616,7 +616,7 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( cosmo_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::cosmo_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x57ff) AM_ROM @@ -624,7 +624,7 @@ static ADDRESS_MAP_START( cosmo_map, AS_PROGRAM, 8, _8080bw_state ) ADDRESS_MAP_END /* at least one of these MWA8_NOPs must be sound related */ -static ADDRESS_MAP_START( cosmo_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::cosmo_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITENOP AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITENOP AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_WRITENOP @@ -797,12 +797,12 @@ static INPUT_PORTS_START( spacecom ) INPUT_PORTS_END -static ADDRESS_MAP_START( spacecom_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::spacecom_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") // other RAM not hooked up? ADDRESS_MAP_END -static ADDRESS_MAP_START( spacecom_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::spacecom_io_map) AM_RANGE(0x41, 0x41) AM_READ_PORT("IN0") AM_RANGE(0x42, 0x42) AM_READ_PORT("IN1") AM_WRITE(invaders_audio_1_w) AM_RANGE(0x44, 0x44) AM_READ_PORT("IN2") AM_WRITE(invaders_audio_2_w) @@ -856,7 +856,7 @@ READ8_MEMBER(_8080bw_state::invrvnge_02_r) return (data & 0x8f) | (ioport("IN1")->read() & 0x70); } -static ADDRESS_MAP_START( invrvnge_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::invrvnge_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ(invrvnge_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -866,7 +866,7 @@ static ADDRESS_MAP_START( invrvnge_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( invrvnge_sound_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::invrvnge_sound_map) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xffff) AM_ROM // dummy prg map, TODO: decrypt ROM ADDRESS_MAP_END @@ -1048,7 +1048,7 @@ static INPUT_PORTS_START( galxwars ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) INPUT_PORTS_END -static ADDRESS_MAP_START( starw1_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::starw1_io_map) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_RANGE(0x03, 0x03) AM_WRITENOP /* writes 9B at boot */ @@ -1069,13 +1069,13 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( escmars_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::escmars_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x4fff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( lrescue_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::lrescue_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -1210,7 +1210,7 @@ WRITE8_MEMBER(_8080bw_state::cosmicmo_05_w) m_flip_screen = BIT(data, 5) & BIT(ioport("IN2")->read(), 2); } -static ADDRESS_MAP_START( cosmicmo_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::cosmicmo_io_map) ADDRESS_MAP_GLOBAL_MASK(0x7) AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1") @@ -1330,7 +1330,7 @@ WRITE8_MEMBER(_8080bw_state::rollingc_scattered_colorram2_w) m_scattered_colorram2[(offset & 0x1f) | ((offset & 0x1f00) >> 3)] = data; } -static ADDRESS_MAP_START( rollingc_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::rollingc_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x5fff) AM_ROM @@ -1339,7 +1339,7 @@ static ADDRESS_MAP_START( rollingc_map, AS_PROGRAM, 8, _8080bw_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( rollingc_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::rollingc_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(rollingc_sh_port_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -1416,7 +1416,7 @@ WRITE8_MEMBER(_8080bw_state::schaser_scattered_colorram_w) m_scattered_colorram[(offset & 0x1f) | ((offset & 0x1f80) >> 2)] = data; } -static ADDRESS_MAP_START( schaser_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::schaser_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x5fff) AM_ROM @@ -1424,7 +1424,7 @@ static ADDRESS_MAP_START( schaser_map, AS_PROGRAM, 8, _8080bw_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( schaser_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::schaser_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -1578,7 +1578,7 @@ READ8_MEMBER(_8080bw_state::schasercv_02_r) return (data & 0x89) | (in1 & 0x70) | (BIT(in1, 3) << 1) | (BIT(in1, 7) << 2); } -static ADDRESS_MAP_START( schasercv_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::schasercv_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ(schasercv_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -1674,7 +1674,7 @@ CUSTOM_INPUT_MEMBER(_8080bw_state::sflush_80_r) return (m_screen->vpos() & 0x80) ? 1 : 0; } -static ADDRESS_MAP_START( sflush_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::sflush_map) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x8008, 0x8008) AM_READ_PORT("PADDLE") @@ -1766,7 +1766,7 @@ MACHINE_CONFIG_END /* */ /*******************************************************************************************/ -static ADDRESS_MAP_START( lupin3_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::lupin3_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(lupin3_00_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -1930,7 +1930,7 @@ READ8_MEMBER(_8080bw_state::polaris_port00_r) // you will get a nice sound that accurately follows the plane. // It sounds better then the actual circuit used. // Probably an unfinished feature. -static ADDRESS_MAP_START( polaris_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::polaris_io_map) AM_RANGE(0x00, 0x00) AM_READ(polaris_port00_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_WRITE(polaris_sh_port_1_w) @@ -2106,7 +2106,7 @@ INPUT_PORTS_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( ballbomb_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::ballbomb_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(ballbomb_01_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -2159,13 +2159,13 @@ MACHINE_CONFIG_END /* */ /*******************************************************/ -static ADDRESS_MAP_START( yosakdon_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::yosakdon_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x43ff) AM_WRITEONLY /* what's this? */ ADDRESS_MAP_END -static ADDRESS_MAP_START( yosakdon_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::yosakdon_io_map) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_RANGE(0x03, 0x03) AM_WRITE(yosakdon_sh_port_1_w) @@ -2347,7 +2347,7 @@ READ8_MEMBER(_8080bw_state::indianbtbr_01_r) return (data & 0x8f) | (ioport("IN2")->read() & 0x70); } -static ADDRESS_MAP_START( indianbt_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::indianbt_io_map) AM_RANGE(0x00, 0x00) AM_READ(indianbt_r) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ(invrvnge_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -2358,7 +2358,7 @@ static ADDRESS_MAP_START( indianbt_io_map, AS_IO, 8, _8080bw_state ) AM_RANGE(0x07, 0x07) AM_WRITE(indianbt_sh_port_3_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( indianbtbr_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::indianbtbr_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x01, 0x01) AM_READ(indianbtbr_01_r) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) @@ -2430,7 +2430,7 @@ WRITE8_MEMBER(_8080bw_state::steelwkr_sh_port_3_w) machine().bookkeeping().coin_lockout_global_w(!(~data & 0x03)); /* possibly */ } -static ADDRESS_MAP_START( steelwkr_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::steelwkr_io_map) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ(invrvnge_02_r) AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_device, shift_result_r) AM_WRITE(invadpt2_sh_port_1_w) @@ -2626,7 +2626,7 @@ WRITE8_MEMBER(_8080bw_state::shuttlei_ff_w) m_flip_screen = BIT(data, 2) & BIT(ioport(CABINET_PORT_TAG)->read(), 0); } -static ADDRESS_MAP_START( shuttlei_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::shuttlei_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x37ff) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x3800, 0x3fff) AM_RAM @@ -2634,7 +2634,7 @@ static ADDRESS_MAP_START( shuttlei_map, AS_PROGRAM, 8, _8080bw_state ) AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") // skylove (is it mirrored, or different PCB hookup?) ADDRESS_MAP_END -static ADDRESS_MAP_START( shuttlei_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::shuttlei_io_map) AM_RANGE(0xfc, 0xfc) AM_WRITENOP /* game writes 0xAA every so often (perhaps when base hit?) */ AM_RANGE(0xfd, 0xfd) AM_WRITE(shuttlei_sh_port_1_w) AM_RANGE(0xfe, 0xfe) AM_READ_PORT("DSW") AM_WRITE(shuttlei_sh_port_2_w) @@ -2711,13 +2711,13 @@ READ8_MEMBER(_8080bw_state::darthvdr_01_r) return (data & 0xe1) | (ioport("P1")->read() & 0x0e); } -static ADDRESS_MAP_START( darthvdr_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::darthvdr_map) AM_RANGE(0x0000, 0x17ff) AM_ROM AM_RANGE(0x1800, 0x1fff) AM_RAM AM_RANGE(0x4000, 0x5fff) AM_RAM AM_SHARE("main_ram") ADDRESS_MAP_END -static ADDRESS_MAP_START( darthvdr_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::darthvdr_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_RANGE(0x01, 0x01) AM_READ(darthvdr_01_r) @@ -2799,7 +2799,7 @@ MACHINE_CONFIG_END * *************************************/ -static ADDRESS_MAP_START( vortex_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::vortex_io_map) // I/O map is same as invaders but with A9 (used as A1 for I/O) inverted ADDRESS_MAP_GLOBAL_MASK(0xFF) AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_READ_PORT("IN0") @@ -3086,7 +3086,7 @@ READ8_MEMBER(_8080bw_state::claybust_gun_hi_r) return m_claybust_gun_pos >> 8; } -static ADDRESS_MAP_START( claybust_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::claybust_io_map) //AM_RANGE(0x00, 0x00) AM_WRITENOP // ? AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE("mb14241", mb14241_device, shift_count_w) AM_RANGE(0x02, 0x02) AM_READ(claybust_gun_lo_r) AM_DEVWRITE("mb14241", mb14241_device, shift_data_w) @@ -3238,7 +3238,7 @@ INPUT_PORTS_END *****************************************************/ -static ADDRESS_MAP_START( attackfc_io_map, AS_IO, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::attackfc_io_map) AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x02) AM_WRITENOP // lamp? AM_RANGE(0x03, 0x03) AM_DEVREADWRITE("mb14241", mb14241_device, shift_result_r, shift_data_w) @@ -3367,7 +3367,7 @@ static INPUT_PORTS_START( invmulti ) PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END -static ADDRESS_MAP_START( invmulti_map, AS_PROGRAM, 8, _8080bw_state ) +ADDRESS_MAP_START(_8080bw_state::invmulti_map) AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1") AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x8000) AM_RAM AM_SHARE("main_ram") AM_RANGE(0x4000, 0x5fff) AM_MIRROR(0x8000) AM_ROMBANK("bank2") diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 11f6005d1b5..9633f178e84 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -121,7 +121,7 @@ WRITE8_MEMBER(_88games_state::k052109_051960_w) * *************************************/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _88games_state ) +ADDRESS_MAP_START(_88games_state::main_map) AM_RANGE(0x0000, 0x0fff) AM_READ_BANK("bank0000") /* banked ROM */ AM_RANGE(0x1000, 0x1fff) AM_READ_BANK("bank1000") /* banked ROM + palette RAM */ AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE("palette", palette_device, write8) AM_SHARE("palette") @@ -142,7 +142,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, _88games_state ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, _88games_state ) +ADDRESS_MAP_START(_88games_state::sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(speech_msg_w) diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp index 71a10b6ffd2..1b0b17b5554 100644 --- a/src/mame/drivers/a2600.cpp +++ b/src/mame/drivers/a2600.cpp @@ -29,7 +29,7 @@ TODO: static const uint16_t supported_screen_heights[4] = { 262, 312, 328, 342 }; -static ADDRESS_MAP_START(a2600_mem, AS_PROGRAM, 8, a2600_state ) // 6507 has 13-bit address space, 0x0000 - 0x1fff +ADDRESS_MAP_START(a2600_state::a2600_mem) // 6507 has 13-bit address space, 0x0000 - 0x1fff AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0f00) AM_DEVREADWRITE("tia_video", tia_video_device, read, write) AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0d00) AM_RAM AM_SHARE("riot_ram") #if USE_NEW_RIOT diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp index 0fb48d07aef..e7f3a8885c8 100644 --- a/src/mame/drivers/a5105.cpp +++ b/src/mame/drivers/a5105.cpp @@ -72,6 +72,9 @@ public: UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); void a5105(machine_config &config); + void a5105_io(address_map &map); + void a5105_mem(address_map &map); + void upd7220_map(address_map &map); private: uint8_t *m_ram_base; uint8_t *m_rom_base; @@ -154,7 +157,7 @@ UPD7220_DRAW_TEXT_LINE_MEMBER( a5105_state::hgdc_draw_text ) } } -static ADDRESS_MAP_START(a5105_mem, AS_PROGRAM, 8, a5105_state) +ADDRESS_MAP_START(a5105_state::a5105_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_READ_BANK("bank1") AM_RANGE(0x4000, 0x7fff) AM_READ_BANK("bank2") @@ -347,7 +350,7 @@ WRITE8_MEMBER( a5105_state::a5105_upd765_w ) m_fdc->tc_w(BIT(data, 4)); } -static ADDRESS_MAP_START(a5105_io, AS_IO, 8, a5105_state) +ADDRESS_MAP_START(a5105_state::a5105_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x40, 0x41) AM_DEVICE("upd765a", upd765a_device, map) @@ -537,7 +540,7 @@ void a5105_state::video_start() m_char_ram = memregion("pcg")->base(); } -static ADDRESS_MAP_START( upd7220_map, 0, 16, a5105_state) +ADDRESS_MAP_START(a5105_state::upd7220_map) ADDRESS_MAP_GLOBAL_MASK(0x1ffff) AM_RANGE(0x00000, 0x1ffff) AM_RAM AM_SHARE("video_ram") ADDRESS_MAP_END diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index aabb433950f..750f1971e55 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -33,27 +33,31 @@ public: required_device<cpu_device> m_maincpu; void a5130(machine_config &config); void a5120(machine_config &config); + void a5120_io(address_map &map); + void a5120_mem(address_map &map); + void a5130_io(address_map &map); + void a5130_mem(address_map &map); }; -static ADDRESS_MAP_START(a5120_mem, AS_PROGRAM, 8, a51xx_state) +ADDRESS_MAP_START(a51xx_state::a5120_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x03ff ) AM_ROM AM_RANGE( 0x0400, 0xffff ) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( a5120_io, AS_IO, 8, a51xx_state) +ADDRESS_MAP_START(a51xx_state::a5120_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END -static ADDRESS_MAP_START(a5130_mem, AS_PROGRAM, 8, a51xx_state) +ADDRESS_MAP_START(a51xx_state::a5130_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x0fff ) AM_ROM AM_RANGE( 0x1000, 0xffff ) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( a5130_io, AS_IO, 8, a51xx_state) +ADDRESS_MAP_START(a51xx_state::a5130_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) ADDRESS_MAP_END diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp index ccb87364c00..bec0a062dd7 100644 --- a/src/mame/drivers/a6809.cpp +++ b/src/mame/drivers/a6809.cpp @@ -86,6 +86,8 @@ public: uint16_t m_start_address; uint16_t m_cursor_address; void a6809(machine_config &config); + void a6809_io(address_map &map); + void a6809_mem(address_map &map); private: uint8_t m_cass_data[4]; bool m_cass_state; @@ -98,7 +100,7 @@ private: }; -static ADDRESS_MAP_START(a6809_mem, AS_PROGRAM, 8, a6809_state) +ADDRESS_MAP_START(a6809_state::a6809_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000,0x03ff) AM_RAM AM_RANGE(0x0400,0x07ff) AM_RAM AM_SHARE("videoram") @@ -109,7 +111,7 @@ static ADDRESS_MAP_START(a6809_mem, AS_PROGRAM, 8, a6809_state) AM_RANGE(0xf800,0xffff) AM_ROM AM_REGION("maincpu", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( a6809_io, AS_IO, 8, a6809_state) +ADDRESS_MAP_START(a6809_state::a6809_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 0c7b9afca88..d1f91c5daff 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -95,6 +95,11 @@ public: required_device<address_map_bank_device> m_video_bankdev; required_device<palette_device> m_palette; void a7150(machine_config &config); + void a7150_io(address_map &map); + void a7150_mem(address_map &map); + void k7070_cpu_banked(address_map &map); + void k7070_cpu_io(address_map &map); + void k7070_cpu_mem(address_map &map); }; @@ -276,13 +281,13 @@ WRITE8_MEMBER(a7150_state::a7150_kgs_w) } -static ADDRESS_MAP_START(a7150_mem, AS_PROGRAM, 16, a7150_state) +ADDRESS_MAP_START(a7150_state::a7150_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000, 0xf7fff) AM_RAM AM_RANGE(0xf8000, 0xfffff) AM_ROM AM_REGION("user1", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START(a7150_io, AS_IO, 16, a7150_state) +ADDRESS_MAP_START(a7150_state::a7150_io) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x004a, 0x004b) AM_DEVWRITE8("isbc_215g", isbc_215g_device, write, 0x00ff) // KES board AM_RANGE(0x00c0, 0x00c3) AM_DEVREADWRITE8("pic8259", pic8259_device, read, write, 0x00ff) @@ -295,7 +300,7 @@ static ADDRESS_MAP_START(a7150_io, AS_IO, 16, a7150_state) AM_RANGE(0x0320, 0x033f) AM_UNMAP // ASP board #2 ADDRESS_MAP_END -static ADDRESS_MAP_START(k7070_cpu_banked, AS_PROGRAM, 8, a7150_state) +ADDRESS_MAP_START(a7150_state::k7070_cpu_banked) ADDRESS_MAP_UNMAP_HIGH // default map: IML=0, MSEL=0. ROM + local RAM. AM_RANGE(0x00000, 0x01fff) AM_ROM AM_REGION("user2", 0) @@ -314,13 +319,13 @@ static ADDRESS_MAP_START(k7070_cpu_banked, AS_PROGRAM, 8, a7150_state) AM_RANGE(0x38000, 0x3ffff) AM_RAM AM_SHARE("video_ram") ADDRESS_MAP_END -static ADDRESS_MAP_START(k7070_cpu_mem, AS_PROGRAM, 8, a7150_state) +ADDRESS_MAP_START(a7150_state::k7070_cpu_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xffff) AM_DEVREADWRITE("video_bankdev", address_map_bank_device, read8, write8) ADDRESS_MAP_END -static ADDRESS_MAP_START(k7070_cpu_io, AS_IO, 8, a7150_state) +ADDRESS_MAP_START(a7150_state::k7070_cpu_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x0000, 0x0003) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write) diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index bf7b5203236..62fd68ad661 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -154,6 +154,7 @@ public: void a7800_ntsc(machine_config &config); void a7800_pal(machine_config &config); + void a7800_mem(address_map &map); protected: required_device<cpu_device> m_maincpu; required_device<tia_device> m_tia; @@ -281,7 +282,7 @@ READ8_MEMBER(a7800_state::bios_or_cart_r) ADDRESS MAPS ***************************************************************************/ -static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state ) +ADDRESS_MAP_START(a7800_state::a7800_mem) AM_RANGE(0x0000, 0x001f) AM_MIRROR(0x300) AM_READWRITE(tia_r, tia_w) AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_DEVREADWRITE("maria", atari_maria_device, read, write) AM_RANGE(0x0040, 0x00ff) AM_RAMBANK("zpmirror") // mirror of 0x2040-0x20ff, for zero page diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp index 84b334394d8..76bddacf57d 100644 --- a/src/mame/drivers/aa310.cpp +++ b/src/mame/drivers/aa310.cpp @@ -135,6 +135,7 @@ public: void aa540(machine_config &config); void aa440(machine_config &config); void aa4201(machine_config &config); + void aa310_mem(address_map &map); protected: required_device<ram_device> m_ram; }; @@ -187,7 +188,7 @@ void aa310_state::machine_reset() archimedes_reset(); } -static ADDRESS_MAP_START( aa310_mem, AS_PROGRAM, 32, aa310_state ) +ADDRESS_MAP_START(aa310_state::aa310_mem) AM_RANGE(0x00000000, 0x01ffffff) AM_READWRITE(archimedes_memc_logical_r, archimedes_memc_logical_w) AM_RANGE(0x02000000, 0x02ffffff) AM_RAM AM_SHARE("physicalram") /* physical RAM - 16 MB for now, should be 512k for the A310 */ AM_RANGE(0x03000000, 0x033fffff) AM_READWRITE(archimedes_ioc_r, archimedes_ioc_w) diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 0b0fee776be..af001a435ce 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -491,7 +491,7 @@ WRITE8_MEMBER( abc1600_state::spec_contr_reg_w ) // ADDRESS_MAP( abc1600_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc1600_mem, AS_PROGRAM, 8, abc1600_state ) +ADDRESS_MAP_START(abc1600_state::abc1600_mem) AM_RANGE(0x00000, 0xfffff) AM_DEVICE(ABC1600_MAC_TAG, abc1600_mac_device, map) ADDRESS_MAP_END @@ -500,7 +500,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( mac_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( mac_mem, AS_PROGRAM, 8, abc1600_state ) +ADDRESS_MAP_START(abc1600_state::mac_mem) AM_RANGE(0x000000, 0x0fffff) AM_RAM AM_RANGE(0x100000, 0x17ffff) AM_DEVICE(ABC1600_MOVER_TAG, abc1600_mover_device, vram_map) AM_RANGE(0x1fe000, 0x1fefff) AM_READWRITE(bus_r, bus_w) diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 333289cc441..7b108729cbe 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -177,7 +177,7 @@ WRITE8_MEMBER( abc80_state::csg_w ) // ADDRESS_MAP( abc80_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc80_mem, AS_PROGRAM, 8, abc80_state ) +ADDRESS_MAP_START(abc80_state::abc80_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xffff) AM_READWRITE(read, write) ADDRESS_MAP_END @@ -187,7 +187,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc80_io ) //------------------------------------------------- -static ADDRESS_MAP_START( abc80_io, AS_IO, 8, abc80_state ) +ADDRESS_MAP_START(abc80_state::abc80_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x17) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index 0876ae88d72..8a89b4cedeb 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -429,7 +429,7 @@ WRITE8_MEMBER( abc806_state::mao_w ) // ADDRESS_MAP( abc800c_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc800c_mem, AS_PROGRAM, 8, abc800c_state ) +ADDRESS_MAP_START(abc800c_state::abc800c_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("video_ram") AM_RANGE(0x4000, 0x7bff) AM_ROM @@ -442,7 +442,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc800c_io ) //------------------------------------------------- -static ADDRESS_MAP_START( abc800c_io, AS_IO, 8, abc800_state ) +ADDRESS_MAP_START(abc800_state::abc800c_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) @@ -464,7 +464,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc800m_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc800m_mem, AS_PROGRAM, 8, abc800_state ) +ADDRESS_MAP_START(abc800_state::abc800m_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("video_ram") AM_RANGE(0x4000, 0x77ff) AM_ROM @@ -477,7 +477,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc800m_io ) //------------------------------------------------- -static ADDRESS_MAP_START( abc800m_io, AS_IO, 8, abc800_state ) +ADDRESS_MAP_START(abc800_state::abc800m_io) AM_IMPORT_FROM( abc800c_io ) AM_RANGE(0x31, 0x31) AM_MIRROR(0x06) AM_DEVREAD(MC6845_TAG, mc6845_device, register_r) AM_RANGE(0x38, 0x38) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w) @@ -489,7 +489,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc802_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc802_mem, AS_PROGRAM, 8, abc802_state ) +ADDRESS_MAP_START(abc802_state::abc802_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("char_ram") @@ -501,7 +501,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc802_io ) //------------------------------------------------- -static ADDRESS_MAP_START( abc802_io, AS_IO, 8, abc802_state ) +ADDRESS_MAP_START(abc802_state::abc802_io) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) @@ -525,7 +525,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc806_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( abc806_mem, AS_PROGRAM, 8, abc806_state ) +ADDRESS_MAP_START(abc806_state::abc806_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0fff) AM_RAMBANK("bank1") AM_RANGE(0x1000, 0x1fff) AM_RAMBANK("bank2") @@ -550,7 +550,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( abc806_io ) //------------------------------------------------- -static ADDRESS_MAP_START( abc806_io, AS_IO, 8, abc806_state ) +ADDRESS_MAP_START(abc806_state::abc806_io) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x00) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w) AM_RANGE(0x01, 0x01) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w) diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp index 7dfec2d39b0..f77630cfd8f 100644 --- a/src/mame/drivers/ac1.cpp +++ b/src/mame/drivers/ac1.cpp @@ -34,7 +34,7 @@ static GFXDECODE_START( ac1 ) GFXDECODE_END /* Address maps */ -static ADDRESS_MAP_START(ac1_mem, AS_PROGRAM, 8, ac1_state ) +ADDRESS_MAP_START(ac1_state::ac1_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x07ff ) AM_ROM // Monitor AM_RANGE( 0x0800, 0x0fff ) AM_ROM // BASIC @@ -42,7 +42,7 @@ static ADDRESS_MAP_START(ac1_mem, AS_PROGRAM, 8, ac1_state ) AM_RANGE( 0x1800, 0x1fff ) AM_RAM // RAM ADDRESS_MAP_END -static ADDRESS_MAP_START(ac1_32_mem, AS_PROGRAM, 8, ac1_state ) +ADDRESS_MAP_START(ac1_state::ac1_32_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE( 0x0000, 0x07ff ) AM_ROM // Monitor AM_RANGE( 0x0800, 0x0fff ) AM_ROM // BASIC @@ -50,7 +50,7 @@ static ADDRESS_MAP_START(ac1_32_mem, AS_PROGRAM, 8, ac1_state ) AM_RANGE( 0x1800, 0xffff ) AM_RAM // RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( ac1_io, AS_IO, 8, ac1_state ) +ADDRESS_MAP_START(ac1_state::ac1_io) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("z80pio", z80pio_device, read, write) ADDRESS_MAP_END diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index 7e631ac19a5..bbd85274544 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -76,6 +76,7 @@ public: INTERRUPT_GEN_MEMBER(vbl_int); void accomm(machine_config &config); + void main_map(address_map &map); protected: // devices required_device<g65816_device> m_maincpu; @@ -633,7 +634,7 @@ WRITE_LINE_MEMBER(accomm_state::econet_clk_w) m_adlc->txc_w(state); } -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, accomm_state ) +ADDRESS_MAP_START(accomm_state::main_map) AM_RANGE(0x000000, 0x1fffff) AM_READWRITE(ram_r, ram_w) /* System RAM */ AM_RANGE(0x200000, 0x3fffff) AM_NOP /* External expansion RAM */ AM_RANGE(0x400000, 0x400000) AM_NOP /* MODEM */ diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index 61f40af6a23..81d7c3f2db2 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -83,6 +83,7 @@ public: uint32_t screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ace_postload(); void ace(machine_config &config); + void main_map(address_map &map); }; @@ -144,7 +145,7 @@ READ8_MEMBER(aceal_state::unk_r) /* 3x3106 - SRAM 256x1 */ /* 1x3622 - ROM 512x4 - doesn't seem to be used ????????????*/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, aceal_state ) +ADDRESS_MAP_START(aceal_state::main_map) AM_RANGE(0x0000, 0x09ff) AM_ROM AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(ace_scoreram_w) AM_SHARE("scoreram") /* 2x2101 */ diff --git a/src/mame/drivers/aceex.cpp b/src/mame/drivers/aceex.cpp index 8e74d630901..21746c32796 100644 --- a/src/mame/drivers/aceex.cpp +++ b/src/mame/drivers/aceex.cpp @@ -60,9 +60,10 @@ public: virtual void machine_reset() override; required_device<cpu_device> m_maincpu; void aceex2814(machine_config &config); + void aceex2814_map(address_map &map); }; -static ADDRESS_MAP_START( aceex2814_map, AS_PROGRAM, 8, aceex2814_state ) +ADDRESS_MAP_START(aceex2814_state::aceex2814_map) AM_RANGE(0x0000, 0x7fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp index 483db69c0d4..fb5d893f686 100644 --- a/src/mame/drivers/acefruit.cpp +++ b/src/mame/drivers/acefruit.cpp @@ -61,6 +61,8 @@ public: }; void acefruit(machine_config &config); + void acefruit_io(address_map &map); + void acefruit_map(address_map &map); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; @@ -314,7 +316,7 @@ PALETTE_INIT_MEMBER(acefruit_state, acefruit) palette.set_pen_color( 15, rgb_t(0xff, 0x00, 0x00) ); } -static ADDRESS_MAP_START( acefruit_map, AS_PROGRAM, 8, acefruit_state ) +ADDRESS_MAP_START(acefruit_state::acefruit_map) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x2000, 0x20ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x4000, 0x43ff) AM_RAM AM_SHARE("videoram") @@ -336,7 +338,7 @@ static ADDRESS_MAP_START( acefruit_map, AS_PROGRAM, 8, acefruit_state ) AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( acefruit_io, AS_IO, 8, acefruit_state ) +ADDRESS_MAP_START(acefruit_state::acefruit_io) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_NOP /* ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 279e7b1b260..3ad27e0a4a1 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -230,6 +230,8 @@ public: TIMER_CALLBACK_MEMBER(m_aces1_irq_timer_callback); TIMER_CALLBACK_MEMBER(m_aces1_nmi_timer_callback); void aces1(machine_config &config); + void aces1_map(address_map &map); + void aces1_portmap(address_map &map); }; @@ -267,7 +269,7 @@ void aces1_state::machine_reset() aces1_reset_irq_timer(); } -static ADDRESS_MAP_START( aces1_map, AS_PROGRAM, 8, aces1_state ) +ADDRESS_MAP_START(aces1_state::aces1_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0xadf0, 0xadf3) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, address_data_w) // Dips, Sound @@ -279,7 +281,7 @@ static ADDRESS_MAP_START( aces1_map, AS_PROGRAM, 8, aces1_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( aces1_portmap, AS_IO, 8, aces1_state ) +ADDRESS_MAP_START(aces1_state::aces1_portmap) AM_RANGE(0x00, 0x00) AM_READ(aces1_unk_port00_r) // read before enabling interrupts? ADDRESS_MAP_END diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp index fb104d13cec..954ed36bd12 100644 --- a/src/mame/drivers/acesp.cpp +++ b/src/mame/drivers/acesp.cpp @@ -29,6 +29,8 @@ public: { } void ace_sp(machine_config &config); + void ace_sp_map(address_map &map); + void ace_sp_portmap(address_map &map); protected: // devices @@ -42,7 +44,7 @@ public: -static ADDRESS_MAP_START( ace_sp_map, AS_PROGRAM, 8, ace_sp_state ) +ADDRESS_MAP_START(ace_sp_state::ace_sp_map) /**** 6303Y internal area ****/ //----- 0x0000 - 0x0027 is internal registers ----- AM_RANGE(0x0000, 0x0027) AM_RAM @@ -70,7 +72,7 @@ static ADDRESS_MAP_START( ace_sp_map, AS_PROGRAM, 8, ace_sp_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( ace_sp_portmap, AS_IO, 8, ace_sp_state ) +ADDRESS_MAP_START(ace_sp_state::ace_sp_portmap) //AM_RANGE(0x02, 0x02) // misc //AM_RANGE(0x05, 0x06) // AYs ADDRESS_MAP_END diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp index 36122e4e48b..82c094d3b68 100644 --- a/src/mame/drivers/acommand.cpp +++ b/src/mame/drivers/acommand.cpp @@ -100,6 +100,7 @@ public: void acommand(machine_config &config); + void acommand_map(address_map &map); protected: // virtual void video_start() override; @@ -319,7 +320,7 @@ WRITE16_MEMBER(acommand_state::output_lamps_w) // --xx --xx lamps } -static ADDRESS_MAP_START( acommand_map, AS_PROGRAM, 16, acommand_state ) +ADDRESS_MAP_START(acommand_state::acommand_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x082000, 0x082005) AM_DEVWRITE("bgtmap", megasys1_tilemap_device, scroll_w) AM_RANGE(0x082100, 0x082105) AM_DEVWRITE("txtmap", megasys1_tilemap_device, scroll_w) diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp index a5d376d84df..629deb5dfe6 100644 --- a/src/mame/drivers/acrnsys1.cpp +++ b/src/mame/drivers/acrnsys1.cpp @@ -75,6 +75,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(acrnsys1_c); TIMER_DEVICE_CALLBACK_MEMBER(acrnsys1_p); void acrnsys1(machine_config &config); + void acrnsys1_map(address_map &map); private: required_device<cpu_device> m_maincpu; required_device<ttl74145_device> m_ttl74145; @@ -163,7 +164,7 @@ WRITE8_MEMBER( acrnsys1_state::acrnsys1_led_segment_w ) ADDRESS MAPS ***************************************************************************/ -static ADDRESS_MAP_START( acrnsys1_map, AS_PROGRAM, 8, acrnsys1_state ) +ADDRESS_MAP_START(acrnsys1_state::acrnsys1_map) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0e00, 0x0e7f) AM_MIRROR(0x100) AM_DEVREADWRITE("b1", ins8154_device, ins8154_r, ins8154_w) AM_RANGE(0x0e80, 0x0eff) AM_MIRROR(0x100) AM_RAM diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp index 8d35c97a4de..b162474a2e6 100644 --- a/src/mame/drivers/actfancr.cpp +++ b/src/mame/drivers/actfancr.cpp @@ -68,7 +68,7 @@ WRITE8_MEMBER(actfancr_state::actfancr_buffer_spriteram_w) } } -static ADDRESS_MAP_START( actfan_map, AS_PROGRAM, 8, actfancr_state ) +ADDRESS_MAP_START(actfancr_state::actfan_map) AM_RANGE(0x000000, 0x02ffff) AM_ROM AM_RANGE(0x060000, 0x060007) AM_DEVWRITE("tilegen1", deco_bac06_device, pf_control0_8bit_w) AM_RANGE(0x060010, 0x06001f) AM_DEVWRITE("tilegen1", deco_bac06_device, pf_control1_8bit_swap_w) @@ -88,7 +88,7 @@ static ADDRESS_MAP_START( actfan_map, AS_PROGRAM, 8, actfancr_state ) AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_SHARE("main_ram") /* Main ram */ ADDRESS_MAP_END -static ADDRESS_MAP_START( triothep_map, AS_PROGRAM, 8, actfancr_state ) +ADDRESS_MAP_START(actfancr_state::triothep_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x040007) AM_DEVWRITE("tilegen2", deco_bac06_device, pf_control0_8bit_w) AM_RANGE(0x040010, 0x04001f) AM_DEVWRITE("tilegen2", deco_bac06_device, pf_control1_8bit_swap_w) @@ -110,7 +110,7 @@ ADDRESS_MAP_END /******************************************************************************/ -static ADDRESS_MAP_START( dec0_s_map, AS_PROGRAM, 8, actfancr_state ) +ADDRESS_MAP_START(actfancr_state::dec0_s_map) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_device, write) AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_device, write) diff --git a/src/mame/drivers/acvirus.cpp b/src/mame/drivers/acvirus.cpp index 139524404e6..df0cad340b7 100644 --- a/src/mame/drivers/acvirus.cpp +++ b/src/mame/drivers/acvirus.cpp @@ -84,6 +84,7 @@ public: DECLARE_DRIVER_INIT(virus); void virus(machine_config &config); + void virus_map(address_map &map); }; void acvirus_state::machine_start() @@ -96,7 +97,7 @@ void acvirus_state::machine_reset() { } -static ADDRESS_MAP_START( virus_map, AS_PROGRAM, 8, acvirus_state ) +ADDRESS_MAP_START(acvirus_state::virus_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0) // fixed 32K of flash image AM_RANGE(0x8000, 0xffff) AM_ROMBANK("rombank") ADDRESS_MAP_END diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp index 9c70eb07797..6c82f040866 100644 --- a/src/mame/drivers/adam.cpp +++ b/src/mame/drivers/adam.cpp @@ -874,7 +874,7 @@ WRITE8_MEMBER( adam_state::m6801_p4_w ) // ADDRESS_MAP( adam_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( adam_mem, AS_PROGRAM, 8, adam_state ) +ADDRESS_MAP_START(adam_state::adam_mem) AM_RANGE(0x0000, 0xffff) AM_READWRITE(mreq_r, mreq_w) ADDRESS_MAP_END @@ -883,7 +883,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( adam_io ) //------------------------------------------------- -static ADDRESS_MAP_START( adam_io, AS_IO, 8, adam_state ) +ADDRESS_MAP_START(adam_state::adam_io) AM_RANGE(0x0000, 0xffff) AM_READWRITE(iorq_r, iorq_w) ADDRESS_MAP_END @@ -892,7 +892,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( m6801_mem ) //------------------------------------------------- -static ADDRESS_MAP_START( m6801_mem, AS_PROGRAM, 8, adam_state ) +ADDRESS_MAP_START(adam_state::m6801_mem) AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE(M6801_TAG, m6801_cpu_device, m6801_io_r, m6801_io_w) AM_RANGE(0x0080, 0x00ff) AM_RAM AM_RANGE(0xf800, 0xffff) AM_ROM AM_REGION(M6801_TAG, 0) @@ -903,7 +903,7 @@ ADDRESS_MAP_END // ADDRESS_MAP( m6801_io ) //------------------------------------------------- -static ADDRESS_MAP_START( m6801_io, AS_IO, 8, adam_state ) +ADDRESS_MAP_START(adam_state::m6801_io) AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(m6801_p1_w) AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(m6801_p2_r, m6801_p2_w) AM_RANGE(M6801_PORT3, M6801_PORT3) AM_READWRITE(m6801_p3_r, m6801_p3_w) diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index 2820e2be70d..8bbe9b85bc9 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -205,6 +205,15 @@ public: void fstation(machine_config &config); void funland(machine_config &config); void skattva(machine_config &config); + void adp_hd63484_map(address_map &map); + void fashiong_hd63484_map(address_map &map); + void fstation_hd63484_map(address_map &map); + void fstation_mem(address_map &map); + void funland_mem(address_map &map); + void quickjac_mem(address_map &map); + void ramdac_map(address_map &map); + void skattv_mem(address_map &map); + void skattva_mem(address_map &map); }; void adp_state::skattva_nvram_init(nvram_device &nvram, void *base, size_t size) @@ -295,7 +304,7 @@ WRITE16_MEMBER(adp_state::input_w) m_mux_data &= 0x0f; } -static ADDRESS_MAP_START( skattv_mem, AS_PROGRAM, 16, adp_state ) +ADDRESS_MAP_START(adp_state::skattv_mem) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("acrtc", hd63484_device, status16_r, address16_w) AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("acrtc", hd63484_device, data16_r, data16_w) @@ -305,7 +314,7 @@ static ADDRESS_MAP_START( skattv_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( skattva_mem, AS_PROGRAM, 16, adp_state ) +ADDRESS_MAP_START(adp_state::skattva_mem) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("rtc", msm6242_device, read, write, 0x00ff) AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("acrtc", hd63484_device, status16_r, address16_w) @@ -316,7 +325,7 @@ static ADDRESS_MAP_START( skattva_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( quickjac_mem, AS_PROGRAM, 16, adp_state ) +ADDRESS_MAP_START(adp_state::quickjac_mem) AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("rtc", msm6242_device, read, write, 0x00ff) AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("acrtc", hd63484_device, status16_r, address16_w) // bad @@ -327,7 +336,7 @@ static ADDRESS_MAP_START( quickjac_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( funland_mem, AS_PROGRAM, 16, adp_state ) +ADDRESS_MAP_START(adp_state::funland_mem) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("rtc", msm6242_device, read, write, 0x00ff) AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("acrtc", hd63484_device, status16_r, address16_w) @@ -341,7 +350,7 @@ static ADDRESS_MAP_START( funland_mem, AS_PROGRAM, 16, adp_state ) AM_RANGE(0xfc0000, 0xffffff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( fstation_mem, AS_PROGRAM, 16, adp_state ) +ADDRESS_MAP_START(adp_state::fstation_mem) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("acrtc", hd63484_device, status16_r, address16_w) AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("acrtc", hd63484_device, data16_r, data16_w) @@ -516,17 +525,17 @@ INTERRUPT_GEN_MEMBER(adp_state::adp_int) } */ -static ADDRESS_MAP_START( adp_hd63484_map, 0, 16, adp_state ) +ADDRESS_MAP_START(adp_state::adp_hd63484_map) AM_RANGE(0x00000, 0x1ffff) AM_MIRROR(0x60000) AM_RAM AM_RANGE(0x80000, 0x9ffff) AM_MIRROR(0x60000) AM_ROM AM_REGION("gfx1", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( fashiong_hd63484_map, 0, 16, adp_state ) +ADDRESS_MAP_START(adp_state::fashiong_hd63484_map) AM_RANGE(0x00000, 0x1ffff) AM_MIRROR(0x60000) AM_RAM AM_RANGE(0x80000, 0xfffff) AM_ROM AM_REGION("gfx1", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( fstation_hd63484_map, 0, 16, adp_state ) +ADDRESS_MAP_START(adp_state::fstation_hd63484_map) AM_RANGE(0x00000, 0x7ffff) AM_ROM AM_REGION("gfx1", 0) AM_RANGE(0x80000, 0xfffff) AM_RAM ADDRESS_MAP_END @@ -590,7 +599,7 @@ MACHINE_CONFIG_DERIVED(adp_state::fashiong, skattv) MCFG_HD63484_ADDRESS_MAP(fashiong_hd63484_map) MACHINE_CONFIG_END -static ADDRESS_MAP_START( ramdac_map, 0, 8, adp_state ) +ADDRESS_MAP_START(adp_state::ramdac_map) AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp index 55665727133..8d6b9f1b6b9 100644 --- a/src/mame/drivers/advision.cpp +++ b/src/mame/drivers/advision.cpp @@ -36,12 +36,12 @@ READ8_MEMBER( advision_state::rom_r ) return m_cart->read_rom(space, offset & 0xfff); } -static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, advision_state ) +ADDRESS_MAP_START(advision_state::program_map) AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("bank1") AM_RANGE(0x0400, 0x0fff) AM_READ(rom_r) ADDRESS_MAP_END -static ADDRESS_MAP_START( io_map, AS_IO, 8, advision_state ) +ADDRESS_MAP_START(advision_state::io_map) AM_RANGE(0x00, 0xff) AM_READWRITE(ext_ram_r, ext_ram_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp index 9eb8bc773ea..fc3b93ab26f 100644 --- a/src/mame/drivers/aeroboto.cpp +++ b/src/mame/drivers/aeroboto.cpp @@ -74,7 +74,7 @@ WRITE8_MEMBER(aeroboto_state::aeroboto_1a2_w) m_disable_irq = 1; } -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, aeroboto_state ) +ADDRESS_MAP_START(aeroboto_state::main_map) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("mainram") // main RAM AM_RANGE(0x01a2, 0x01a2) AM_WRITE(aeroboto_1a2_w) // affects IRQ line (more protection?) AM_RANGE(0x0800, 0x08ff) AM_RAM // tile color buffer; copied to 0x2000 @@ -97,7 +97,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, aeroboto_state ) AM_RANGE(0x4000, 0xffff) AM_ROM // main ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, aeroboto_state ) +ADDRESS_MAP_START(aeroboto_state::sound_map) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ay1", ay8910_device, address_data_w) AM_RANGE(0x9002, 0x9002) AM_DEVREAD("ay1", ay8910_device, data_r) diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp index 5e59706a838..778b80f3614 100644 --- a/src/mame/drivers/aerofgt.cpp +++ b/src/mame/drivers/aerofgt.cpp @@ -128,7 +128,7 @@ WRITE8_MEMBER(aerofgt_state::karatblzbl_d7759_reset_w) m_upd7759->reset_w(data & 0x80); } -static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikes_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -143,7 +143,7 @@ static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikesb_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -161,7 +161,7 @@ static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spikes91_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -181,7 +181,7 @@ static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff008, 0xfff009) AM_WRITE(spikes91_lookup_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::pspikesc_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("spriteram1") @@ -197,7 +197,7 @@ static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */ AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("spriteram1") @@ -212,7 +212,7 @@ static ADDRESS_MAP_START( kickball_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblz_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -234,7 +234,7 @@ static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -256,7 +256,7 @@ static ADDRESS_MAP_START( karatblzbl_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spinlbrk_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_SHARE("bg2videoram") @@ -274,7 +274,7 @@ static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::turbofrc_map) ADDRESS_MAP_GLOBAL_MASK(0xfffff) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ @@ -297,7 +297,7 @@ static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff400, 0x0ff403) AM_DEVWRITE8("gga", vsystem_gga_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgtb_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgt_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM_DEVWRITE("palette", palette_device, write16) AM_SHARE("palette") AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ @@ -336,7 +336,7 @@ static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xffffc0, 0xffffc1) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x00ff) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboot_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -364,7 +364,7 @@ static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x10c000, 0x117fff) AM_WRITENOP ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboo2_map) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */ AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_SHARE("bg1videoram") @@ -391,7 +391,7 @@ static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_SHARE("rasterram") /* used only for the scroll registers */ ADDRESS_MAP_END -static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::wbbc97_map) AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_RANGE(0x500000, 0x50ffff) AM_RAM /* work RAM */ AM_RANGE(0x600000, 0x605fff) AM_RAM AM_SHARE("spriteram1") @@ -408,27 +408,27 @@ static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16, aerofgt_state ) AM_RANGE(0xfff400, 0xfff403) AM_WRITENOP // GGA access ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::sound_map) AM_RANGE(0x0000, 0x77ff) AM_ROM AM_RANGE(0x7800, 0x7fff) AM_RAM AM_RANGE(0x8000, 0xffff) AM_ROMBANK("soundbank") ADDRESS_MAP_END -static ADDRESS_MAP_START( spinlbrk_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::spinlbrk_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(spinlbrk_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( turbofrc_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::turbofrc_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w) AM_RANGE(0x14, 0x14) AM_DEVREADWRITE("soundlatch", generic_latch_8_device, read, acknowledge_w) AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerofgt_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerofgt_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_device, read, write) AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w) @@ -436,7 +436,7 @@ static ADDRESS_MAP_START( aerofgt_sound_portmap, AS_IO, 8, aerofgt_state ) AM_RANGE(0x0c, 0x0c) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( aerfboot_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::aerfboot_sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(aerfboot_okim6295_banking_w) @@ -444,7 +444,7 @@ static ADDRESS_MAP_START( aerfboot_sound_map, AS_PROGRAM, 8, aerofgt_state ) AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( wbbc97_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::wbbc97_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE("oki", okim6295_device, read, write) @@ -453,13 +453,13 @@ static ADDRESS_MAP_START( wbbc97_sound_map, AS_PROGRAM, 8, aerofgt_state ) AM_RANGE(0xfc20, 0xfc20) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) //AM_DEVWRITE("soundlatch2", generic_latch_8_device, write) ADDRESS_MAP_END -static ADDRESS_MAP_START( karatblzbl_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::karatblzbl_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_device, status_port_r, control_port_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_device, write_port_w) @@ -467,13 +467,13 @@ static ADDRESS_MAP_START( karatblzbl_sound_portmap, AS_IO, 8, aerofgt_state ) AM_RANGE(0x80, 0x80) AM_WRITE(karatblzbl_d7759_reset_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_sound_map, AS_PROGRAM, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_sound_map) AM_RANGE(0x0000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) ADDRESS_MAP_END -static ADDRESS_MAP_START( kickball_sound_portmap, AS_IO, 8, aerofgt_state ) +ADDRESS_MAP_START(aerofgt_state::kickball_sound_portmap) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_device, status_port_r, control_port_w) AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_device, write_port_w) @@ -482,7 +482,7 @@ static ADDRESS_MAP_START( kickball_sound_portmap, AS_IO, 8, aerofgt_state ) ADDRESS_MAP_END -static ADDRESS_MAP_START( oki_map, 0, 8, aerofgt_state ) //only for aerfboot for now +ADDRESS_MAP_START(aerofgt_state::oki_map) //only for aerfboot for now AM_RANGE(0x00000, 0x1ffff) AM_ROM AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank") ADDRESS_MAP_END diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp index aa4732111ce..ac1576c3b59 100644 --- a/src/mame/drivers/agat.cpp +++ b/src/mame/drivers/agat.cpp @@ -154,6 +154,8 @@ public: DECLARE_WRITE8_MEMBER(controller_strobe_w); void agat7(machine_config &config); + void agat7_map(address_map &map); + void inhbank_map(address_map &map); private: int m_speaker_state; int m_cassette_state; @@ -680,7 +682,7 @@ WRITE8_MEMBER(agat7_state::agat7_ram_w) * and are supported only on motherboards with 32K onboard. * all extra RAM (onboard or addon) is accessible via 16K window at 0x8000. */ -static ADDRESS_MAP_START( agat7_map, AS_PROGRAM, 8, agat7_state ) +ADDRESS_MAP_START(agat7_state::agat7_map) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xbfff) AM_READWRITE(agat7_ram_r, agat7_ram_w) AM_RANGE(0xc000, 0xc000) AM_MIRROR(0xf) AM_READ(keyb_data_r) AM_WRITENOP @@ -699,7 +701,7 @@ static ADDRESS_MAP_START( agat7_map, AS_PROGRAM, 8, agat7_state ) AM_RANGE(0xd000, 0xffff) AM_DEVICE(A7_UPPERBANK_TAG, address_map_bank_device, amap8) ADDRESS_MAP_END -static ADDRESS_MAP_START( inhbank_map, AS_PROGRAM, 8, agat7_state ) +ADDRESS_MAP_START(agat7_state::inhbank_map) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_REGION("maincpu", 0x1000) AM_WRITE(inh_w) AM_RANGE(0x3000, 0x5fff) AM_READWRITE(inh_r, inh_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp index 1304cd5a456..761b334d7f9 100644 --- a/src/mame/drivers/age_candy.cpp +++ b/src/mame/drivers/age_candy.cpp @@ -28,6 +28,7 @@ public: virtual void machine_reset() override; void age_candy(machine_config &config); + void age_candy_map(address_map &map); // required_device<mcs51_cpu_device> m_maincpu; }; @@ -46,7 +47,7 @@ void age_candy_state::machine_reset() #ifdef UNUSED_DEFINITION -static ADDRESS_MAP_START(age_candy_map, AS_PROGRAM, 8, age_candy_state) +ADDRESS_MAP_START(age_candy_state::age_candy_map) AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu", 0x4000) ADDRESS_MAP_END #endif diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index 662dce5ba5e..5ea1a041410 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -38,7 +38,7 @@ Bugs ***************************************************************************/ /* Note: RAM is mapped dynamically in machine/aim65.c */ -static ADDRESS_MAP_START( aim65_mem, AS_PROGRAM, 8, aim65_state ) +ADDRESS_MAP_START(aim65_state::aim65_mem) AM_RANGE( 0x1000, 0x3fff ) AM_NOP /* User available expansions */ AM_RANGE( 0x4000, 0x7fff ) AM_ROM /* 4 ROM sockets in 16K PROM/ROM module */ AM_RANGE( 0x8000, 0x9fff ) AM_NOP /* User available expansions */ diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp index d967c3acf64..ac07ed6be62 100644 --- a/src/mame/drivers/aim65_40.cpp +++ b/src/mame/drivers/aim65_40.cpp @@ -77,6 +77,7 @@ public: { } void aim65_40(machine_config &config); + void aim65_40_mem(address_map &map); // devices //device_t *m_via0; //device_t *m_via1; @@ -90,7 +91,7 @@ private: ADDRESS MAPS ***************************************************************************/ -static ADDRESS_MAP_START( aim65_40_mem, AS_PROGRAM, 8, aim65_40_state ) +ADDRESS_MAP_START(aim65_40_state::aim65_40_mem) AM_RANGE(0x0000, 0x3fff) AM_RAM AM_RANGE(0xa000, 0xcfff) AM_ROM AM_REGION("roms", 0) AM_RANGE(0xf000, 0xff7f) AM_ROM AM_REGION("roms", 0x3000) diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index 9a3d54c1120..b51e771cbb6 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -305,7 +305,7 @@ WRITE8_MEMBER(airbustr_state::coin_counter_w) } /* Memory Maps */ -static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::master_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("masterbank") AM_RANGE(0xc000, 0xcfff) AM_DEVREADWRITE("pandora", kaneko_pandora_device, spriteram_r, spriteram_w) @@ -314,14 +314,14 @@ static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8, airbustr_state ) AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("share1") ADDRESS_MAP_END -static ADDRESS_MAP_START( master_io_map, AS_IO, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::master_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(master_bankswitch_w) AM_RANGE(0x01, 0x01) AM_WRITENOP // ??? AM_RANGE(0x02, 0x02) AM_WRITE(master_nmi_trigger_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::slave_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("slavebank") AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(videoram2_w) AM_SHARE("videoram2") @@ -334,7 +334,7 @@ static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8, airbustr_state ) AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("share1") ADDRESS_MAP_END -static ADDRESS_MAP_START( slave_io_map, AS_IO, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::slave_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(slave_bankswitch_w) AM_RANGE(0x02, 0x02) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) @@ -347,13 +347,13 @@ static ADDRESS_MAP_START( slave_io_map, AS_IO, 8, airbustr_state ) AM_RANGE(0x38, 0x38) AM_WRITENOP // irq ack / irq mask ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("audiobank") AM_RANGE(0xc000, 0xdfff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( sound_io_map, AS_IO, 8, airbustr_state ) +ADDRESS_MAP_START(airbustr_state::sound_io_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w) AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp index 6998818a50b..0092c7e31bb 100644 --- a/src/mame/drivers/airraid.cpp +++ b/src/mame/drivers/airraid.cpp @@ -190,6 +190,10 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline); void airraid(machine_config &config); void airraid_crypt(machine_config &config); + void airraid_map(address_map &map); + void airraid_sound_decrypted_opcodes_map(address_map &map); + void airraid_sound_map(address_map &map); + void decrypted_opcodes_map(address_map &map); }; @@ -240,7 +244,7 @@ WRITE8_MEMBER(airraid_state::bank_w) -static ADDRESS_MAP_START( airraid_map, AS_PROGRAM, 8, airraid_state ) +ADDRESS_MAP_START(airraid_state::airraid_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP // rld result write-back AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") @@ -267,11 +271,11 @@ static ADDRESS_MAP_START( airraid_map, AS_PROGRAM, 8, airraid_state ) AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("sprite_ram") ADDRESS_MAP_END -static ADDRESS_MAP_START( decrypted_opcodes_map, AS_OPCODES, 8, airraid_state ) +ADDRESS_MAP_START(airraid_state::decrypted_opcodes_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_SHARE("decrypted_opcodes") ADDRESS_MAP_END -static ADDRESS_MAP_START( airraid_sound_map, AS_PROGRAM, 8, airraid_state ) +ADDRESS_MAP_START(airraid_state::airraid_sound_map) AM_RANGE(0x0000, 0x1fff) AM_DEVREAD("sei80bu", sei80bu_device, data_r) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("seibu_sound", seibu_sound_device, pending_w) @@ -288,7 +292,7 @@ static ADDRESS_MAP_START( airraid_sound_map, AS_PROGRAM, 8, airraid_state ) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START( airraid_sound_decrypted_opcodes_map, AS_OPCODES, 8, airraid_state ) +ADDRESS_MAP_START(airraid_state::airraid_sound_decrypted_opcodes_map) AM_RANGE(0x0000, 0x1fff) AM_DEVREAD("sei80bu", sei80bu_device, opcode_r) AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("audiocpu", 0x8000) ADDRESS_MAP_END @@ -386,7 +390,7 @@ MACHINE_CONFIG_START(airraid_state::airraid) MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(airraid_sound_map) - MCFG_CPU_DECRYPTED_OPCODES_MAP(airraid_sound_decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(airraid_sound_decrypted_opcodes_map) MCFG_QUANTUM_PERFECT_CPU("maincpu") @@ -415,7 +419,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(airraid_state::airraid_crypt, airraid) MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map) + MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp index 4c7bb289c3f..fb4dd2cc4d6 100644 --- a/src/mame/drivers/ajax.cpp +++ b/src/mame/drivers/ajax.cpp @@ -23,7 +23,7 @@ #include "speaker.h" -static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state ) +ADDRESS_MAP_START(ajax_state::ajax_main_map) AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ls138_f10_r, ls138_f10_w) /* bankswitch + sound command + FIRQ command */ AM_RANGE(0x0800, 0x0807) AM_DEVREADWRITE("k051960", k051960_device, k051937_r, k051937_w) /* sprite control registers */ AM_RANGE(0x0c00, 0x0fff) AM_DEVREADWRITE("k051960", k051960_device, k051960_r, k051960_w) /* sprite RAM 2128SL at J7 */ @@ -34,7 +34,7 @@ static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state ) AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM N11 */ ADDRESS_MAP_END -static ADDRESS_MAP_START( ajax_sub_map, AS_PROGRAM, 8, ajax_state ) +ADDRESS_MAP_START(ajax_state::ajax_sub_map) AM_RANGE(0x0000, 0x07ff) AM_DEVREADWRITE("k051316", k051316_device, read, write) /* 051316 zoom/rotation layer */ AM_RANGE(0x0800, 0x080f) AM_DEVWRITE("k051316", k051316_device, ctrl_w) /* 051316 control registers */ AM_RANGE(0x1000, 0x17ff) AM_DEVREAD("k051316", k051316_device, rom_r) /* 051316 (ROM test) */ @@ -45,7 +45,7 @@ static ADDRESS_MAP_START( ajax_sub_map, AS_PROGRAM, 8, ajax_state ) AM_RANGE(0xa000, 0xffff) AM_ROM AM_REGION ("sub", 0x12000) /* ROM I16 */ ADDRESS_MAP_END -static ADDRESS_MAP_START( ajax_sound_map, AS_PROGRAM, 8, ajax_state ) +ADDRESS_MAP_START(ajax_state::ajax_sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM F6 */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM 2128SL at D16 */ AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) /* 007232 bankswitch */ diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp index 0e88bb88b0e..81286ef059b 100644 --- a/src/mame/drivers/akaiax80.cpp +++ b/src/mame/drivers/akaiax80.cpp @@ -60,6 +60,7 @@ public: { } void ax80(machine_config &config); + void ax80_map(address_map &map); private: virtual void machine_reset() override; required_device<upd7810_device> m_maincpu; @@ -69,7 +70,7 @@ void ax80_state::machine_reset() { } -static ADDRESS_MAP_START( ax80_map, AS_PROGRAM, 8, ax80_state ) +ADDRESS_MAP_START(ax80_state::ax80_map) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_REGION("maincpu", 0) // internal ROM AM_RANGE(0x1000, 0x1003) AM_MIRROR(0x000c) AM_DEVREADWRITE(PIT0_TAG, pit8253_device, read, write) // IC20 AM_RANGE(0x1010, 0x1013) AM_MIRROR(0x000c) AM_DEVREADWRITE(PIT1_TAG, pit8253_device, read, write) // IC21 diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index 2c26993e08b..1dc1c725220 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -51,6 +51,7 @@ public: required_device<palette_device> m_palette; required_device<ticket_dispenser_device> m_hopper; void hanaroku(machine_config &config); + void hanaroku_map(address_map &map); }; @@ -175,7 +176,7 @@ WRITE8_MEMBER(albazc_state::albazc_vregs_w) /* main cpu */ -static ADDRESS_MAP_START( hanaroku_map, AS_PROGRAM, 8, albazc_state ) +ADDRESS_MAP_START(albazc_state::hanaroku_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("spriteram1") AM_RANGE(0x9000, 0x97ff) AM_RAM AM_SHARE("spriteram2") diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index 15537b9bac2..53f985e38f7 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -85,6 +85,8 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; void yumefuda(machine_config &config); + void main_map(address_map &map); + void port_map(address_map &map); }; TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) @@ -206,7 +208,7 @@ WRITE8_MEMBER(albazg_state::yumefuda_output_w) /***************************************************************************************/ -static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, albazg_state ) +ADDRESS_MAP_START(albazg_state::main_map) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w) @@ -219,7 +221,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, albazg_state ) AM_RANGE(0xe000, 0xffff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( port_map, AS_IO, 8, albazg_state ) +ADDRESS_MAP_START(albazg_state::port_map) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_device, address_w) AM_RANGE(0x01, 0x01) AM_DEVWRITE("crtc", mc6845_device, register_w) diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp index 2d4222eb6f0..bd42ecbc8a8 100644 --- a/src/mame/drivers/aleck64.cpp +++ b/src/mame/drivers/aleck64.cpp @@ -202,6 +202,9 @@ public: void aleck64(machine_config &config); void a64_e90(machine_config &config); + void e90_map(address_map &map); + void n64_map(address_map &map); + void rsp_map(address_map &map); protected: optional_shared_ptr<uint32_t> m_e90_vram; optional_shared_ptr<uint32_t> m_e90_pal; @@ -312,7 +315,7 @@ READ32_MEMBER(aleck64_state::aleck_dips_r) 4MB @ 0xd0800000 - 0xd0bfffff doncdoon, hipai, kurufev, twrshaft, srmvs : unused */ -static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32, aleck64_state ) +ADDRESS_MAP_START(aleck64_state::n64_map) AM_RANGE(0x00000000, 0x007fffff) AM_RAM /*AM_MIRROR(0xc0000000)*/ AM_SHARE("rdram") // RDRAM AM_RANGE(0x03f00000, 0x03f00027) AM_DEVREADWRITE("rcp", n64_periphs, rdram_reg_r, rdram_reg_w) @@ -366,14 +369,14 @@ WRITE16_MEMBER(aleck64_state::e90_prot_w) } } -static ADDRESS_MAP_START( e90_map, AS_PROGRAM, 32, aleck64_state ) +ADDRESS_MAP_START(aleck64_state::e90_map) AM_IMPORT_FROM( n64_map ) AM_RANGE(0xd0000000, 0xd0000fff) AM_RAM AM_SHARE("e90vram")// x/y offsets AM_RANGE(0xd0010000, 0xd0010fff) AM_RAM AM_SHARE("e90pal")// RGB555 palette AM_RANGE(0xd0030000, 0xd003001f) AM_READWRITE16(e90_prot_r, e90_prot_w,0xffffffff) ADDRESS_MAP_END -static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32, aleck64_state ) +ADDRESS_MAP_START(aleck64_state::rsp_map) AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("rsp_dmem") AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("rsp_imem") AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("rsp_dmem") diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index 9dd05353191..dfe6951b2d0 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -118,12 +118,12 @@ WRITE8_MEMBER( alesis_state::mmt8_p3_w ) m_cassette->output(data & 0x10 ? -1.0 : +1.0); } -static ADDRESS_MAP_START(hr16_mem, AS_PROGRAM, 8, alesis_state) +ADDRESS_MAP_START(alesis_state::hr16_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x7fff) AM_MIRROR(0x8000) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START(hr16_io, AS_IO, 8, alesis_state) +ADDRESS_MAP_START(alesis_state::hr16_io) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0000) AM_READ(kb_r) AM_RANGE(0x0002, 0x0002) AM_DEVWRITE("dm3ag", alesis_dm3ag_device, write) @@ -136,12 +136,12 @@ static ADDRESS_MAP_START(hr16_io, AS_IO, 8, alesis_state) AM_RANGE(0x8000, 0xffff) AM_RAM AM_SHARE("nvram") // 32Kx8 SRAM, (battery-backed) ADDRESS_MAP_END -static ADDRESS_MAP_START(sr16_mem, AS_PROGRAM, 8, alesis_state) +ADDRESS_MAP_START(alesis_state::sr16_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xffff) AM_ROM ADDRESS_MAP_END -static ADDRESS_MAP_START(sr16_io, AS_IO, 8, alesis_state) +ADDRESS_MAP_START(alesis_state::sr16_io) //ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x0000) AM_MIRROR(0xff) AM_DEVWRITE("dm3ag", alesis_dm3ag_device, write) AM_RANGE(0x0200, 0x0200) AM_MIRROR(0xff) AM_WRITE(sr16_lcd_w) @@ -153,7 +153,7 @@ static ADDRESS_MAP_START(sr16_io, AS_IO, 8, alesis_state) AM_RANGE(0x8000, 0xffff) AM_RAM AM_SHARE("nvram") // 32Kx8 SRAM, (battery-backed) ADDRESS_MAP_END -static ADDRESS_MAP_START(mmt8_io, AS_IO, 8, alesis_state) +ADDRESS_MAP_START(alesis_state::mmt8_io) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0xffff) AM_RAM AM_SHARE("nvram") // 2x32Kx8 SRAM, (battery-backed) AM_RANGE(0xff02, 0xff02) AM_WRITE(track_led_w) diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp index 12ea0764cb2..8a273db943d 100644 --- a/src/mame/drivers/alesis_qs.cpp +++ b/src/mame/drivers/alesis_qs.cpp @@ -25,6 +25,7 @@ public: { } void qs7(machine_config &config); + void qs7_prog_map(address_map &map); protected: required_device<cpu_device> m_maincpu; }; @@ -42,7 +43,7 @@ static INPUT_PORTS_START( qs7 ) // PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("?") PORT_CODE(KEYCODE_) INPUT_PORTS_END -static ADDRESS_MAP_START( qs7_prog_map, AS_PROGRAM, 16, qs_state ) +ADDRESS_MAP_START(qs_state::qs7_prog_map) //ADDRESS_MAP_GLOBAL_MASK(0x3ffff) AM_RANGE(0x00000, 0x3ffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 85163ed23a8..b0f71139617 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -61,6 +61,11 @@ public: void alg_r2(machine_config &config); void picmatic(machine_config &config); void alg_r1(machine_config &config); + void a500_mem(address_map &map); + void main_map_picmatic(address_map &map); + void main_map_r1(address_map &map); + void main_map_r2(address_map &map); + void overlay_512kb_map(address_map &map); protected: // amiga_state overrides virtual void potgo_w(uint16_t data) override; @@ -170,13 +175,13 @@ CUSTOM_INPUT_MEMBER(alg_state::lightgun_holster_r) * *************************************/ -static ADDRESS_MAP_START( overlay_512kb_map, AS_PROGRAM, 16, alg_state ) +ADDRESS_MAP_START(alg_state::overlay_512kb_map) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x07ffff) AM_MIRROR(0x180000) AM_RAM AM_SHARE("chip_ram") AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("kickstart", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( a500_mem, AS_PROGRAM, 16, alg_state ) +ADDRESS_MAP_START(alg_state::a500_mem) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x000000, 0x1fffff) AM_DEVICE("overlay", address_map_bank_device, amap16) AM_RANGE(0xa00000, 0xbfffff) AM_READWRITE(cia_r, cia_w) @@ -189,19 +194,19 @@ static ADDRESS_MAP_START( a500_mem, AS_PROGRAM, 16, alg_state ) AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("kickstart", 0) ADDRESS_MAP_END -static ADDRESS_MAP_START( main_map_r1, AS_PROGRAM, 16, alg_state ) +ADDRESS_MAP_START(alg_state::main_map_r1) AM_IMPORT_FROM(a500_mem) AM_RANGE(0xf00000, 0xf1ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */ AM_RANGE(0xf54000, 0xf55fff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( main_map_r2, AS_PROGRAM, 16, alg_state ) +ADDRESS_MAP_START(alg_state::main_map_r2) AM_IMPORT_FROM(a500_mem) AM_RANGE(0xf00000, 0xf3ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */ AM_RANGE(0xf7c000, 0xf7dfff) AM_RAM AM_SHARE("nvram") ADDRESS_MAP_END -static ADDRESS_MAP_START( main_map_picmatic, AS_PROGRAM, 16, alg_state ) +ADDRESS_MAP_START(alg_state::main_map_picmatic) AM_IMPORT_FROM(a500_mem) AM_RANGE(0xf00000, 0xf1ffff) AM_ROM AM_REGION("user2", 0) /* Custom ROM */ AM_RANGE(0xf40000, 0xf41fff) AM_RAM AM_SHARE("nvram") diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp index a2dbf1822a4..2e669dcb2c4 100644 --- a/src/mame/drivers/alien.cpp +++ b/src/mame/drivers/alien.cpp @@ -43,6 +43,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void alien(machine_config &config); + void alien_map(address_map &map); protected: // devices @@ -67,7 +68,7 @@ READ64_MEMBER( alien_state::test_r ) return machine().rand(); } -static ADDRESS_MAP_START( alien_map, AS_PROGRAM, 64, alien_state ) +ADDRESS_MAP_START(alien_state::alien_map) AM_RANGE(0x00000000, 0x0003ffff) AM_ROM AM_RANGE(0x08000000, 0x08000007) AM_READ(test_r) //hangs if zero AM_RANGE(0x0cfe0000, 0x0cffffff) AM_RAM diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index 06114a773e0..64f9d1928f7 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -85,7 +85,7 @@ WRITE8_MEMBER(aliens_state::k052109_051960_w) m_k051960->k051960_w(space, offset - 0x3c00, data); } -static ADDRESS_MAP_START( aliens_map, AS_PROGRAM, 8, aliens_state ) +ADDRESS_MAP_START(aliens_state::aliens_map) AM_RANGE(0x0000, 0x03ff) AM_DEVICE("bank0000", address_map_bank_device, amap8) AM_RANGE(0x0400, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("rombank") /* banked ROM */ @@ -100,12 +100,12 @@ static ADDRESS_MAP_START( aliens_map, AS_PROGRAM, 8, aliens_state ) AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("maincpu", 0x28000) /* ROM e24_j02.bin */ ADDRESS_MAP_END -static ADDRESS_MAP_START( bank0000_map, AS_PROGRAM, 8, aliens_state ) +ADDRESS_MAP_START(aliens_state::bank0000_map) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_RANGE(0x0400, 0x07ff) AM_RAM_DEVWRITE("palette", palette_device, write8) AM_SHARE("palette") ADDRESS_MAP_END -static ADDRESS_MAP_START( aliens_sound_map, AS_PROGRAM, 8, aliens_state ) +ADDRESS_MAP_START(aliens_state::aliens_sound_map) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM g04_b03.bin */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp index 44f0bde4c35..490e70d7914 100644 --- a/src/mame/drivers/alinvade.cpp +++ b/src/mame/drivers/alinvade.cpp @@ -46,6 +46,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void alinvade(machine_config &config); + void alinvade_map(address_map &map); private: uint8_t m_irqmask; uint8_t m_irqff; @@ -101,7 +102,7 @@ WRITE8_MEMBER(alinvade_state::irqmask_w) m_irqff = data; } -static ADDRESS_MAP_START( alinvade_map, AS_PROGRAM, 8, alinvade_state ) +ADDRESS_MAP_START(alinvade_state::alinvade_map) AM_RANGE(0x0000, 0x01ff) AM_RAM AM_RANGE(0x0400, 0x0bff) AM_RAM AM_SHARE("videoram") AM_RANGE(0x0c00, 0x0dff) AM_RAM diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp index 2f9514e21e8..75c0b4c33c8 100644 --- a/src/mame/drivers/allied.cpp +++ b/src/mame/drivers/allied.cpp @@ -86,6 +86,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ic8_cb2_w); TIMER_DEVICE_CALLBACK_MEMBER(timer_a); void allied(machine_config &config); + void allied_map(address_map &map); private: uint32_t m_player_score[6]; uint8_t m_display; @@ -109,7 +110,7 @@ private: }; -static ADDRESS_MAP_START( allied_map, AS_PROGRAM, 8, allied_state ) +ADDRESS_MAP_START(allied_state::allied_map) AM_RANGE(0x0000, 0x003f) AM_RAM // ic6 AM_RANGE(0x0044, 0x0047) AM_DEVREADWRITE("ic2", pia6821_device, read, write) AM_RANGE(0x0048, 0x004b) AM_DEVREADWRITE("ic1", pia6821_device, read, write) diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 1fa77937d16..633227ff1d0 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -644,7 +644,7 @@ READ16_MEMBER(alpha68k_state::alpha_V_trigger_r) /******************************************************************************/ -static ADDRESS_MAP_START( kyros_map, AS_PROGRAM, 16, alpha68k_state ) +ADDRESS_MAP_START(alpha68k_state::kyros_map) AM_RANGE(0x000000, 0x01ffff) AM_ROM // main program AM_RANGE(0x020000, 0x020fff) AM_RAM AM_SHARE("shared_ram") // work RAM AM_RANGE(0x040000, 0x041fff) AM_RAM AM_SHARE("spriteram") // sprite RAM @@ -654,7 +654,7 @@ static ADDRESS_MAP_START( kyros_map, AS_PROGRAM, 16, alpha68k_state ) AM_RANGE(0x0e0000, 0x0e0001) AM_READWRITE(kyros_dip_r, kyros_sound_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( alpha68k_I_map, AS_PROGRAM, 16, alpha68k_state ) +ADDRESS_MAP_START(alpha68k_state::alpha68k_I_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM // main program AM_RANGE(0x080000, 0x083fff) AM_RAM // work RAM AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram") // video RAM @@ -665,7 +665,7 @@ static ADDRESS_MAP_START( alpha68k_I_map, AS_PROGRAM, 16, alpha68k_state ) AM_RANGE(0x380000, 0x380001) AM_READ_PORT("IN2") AM_WRITE(paddlema_soundlatch_w) // LSB: sound latch write and RST38 trigger, joy3, joy4 ADDRESS_MAP_END -static ADDRESS_MAP_START( alpha68k_II_map, AS_PROGRAM, 16, alpha68k_state ) +ADDRESS_MAP_START(alpha68k_state::alpha68k_II_map) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("shared_ram") AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r) /* Joysticks */ @@ -684,7 +684,7 @@ static ADDRESS_MAP_START( alpha68k_II_map, AS_PROGRAM, 16, alpha68k_state ) AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8") ADDRESS_MAP_END -static ADDRESS_MAP_START( alpha68k_V_map, AS_PROGRAM, 16, alpha68k_state ) +ADDRESS_MAP_START(alpha68k_state::alpha68k_V_map) |