From 5f2d69565a780e5e1f05e0d229a795ec321fec2f Mon Sep 17 00:00:00 2001 From: Robbbert Date: Thu, 12 Apr 2018 03:51:42 +1000 Subject: (nw) last bunch for tonight --- src/mame/drivers/casloopy.cpp | 7 +++--- src/mame/drivers/coco12.cpp | 6 +++--- src/mame/drivers/csplayh5.cpp | 26 +++++++++++----------- src/mame/drivers/ddenlovr.cpp | 29 +++++++++++++------------ src/mame/drivers/equites.cpp | 7 +++--- src/mame/drivers/goldstar.cpp | 7 +++--- src/mame/drivers/kaneko16.cpp | 26 +++++++++++----------- src/mame/drivers/lc80.cpp | 9 ++++---- src/mame/drivers/mastboy.cpp | 11 +++++----- src/mame/drivers/mephistp.cpp | 9 ++++---- src/mame/drivers/miniforce.cpp | 7 +++--- src/mame/drivers/mpu4vid.cpp | 49 +++++++++++++++++++++--------------------- src/mame/drivers/pinkiri8.cpp | 23 ++++++++++---------- src/mame/drivers/pocketc.cpp | 30 ++++++++++++++------------ src/mame/drivers/splash.cpp | 11 +++++----- src/mame/drivers/vertigo.cpp | 9 ++++---- src/mame/drivers/vt100.cpp | 43 +++++++++++++++++++----------------- 17 files changed, 165 insertions(+), 144 deletions(-) diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp index 11f074bf444..4589d603642 100644 --- a/src/mame/drivers/casloopy.cpp +++ b/src/mame/drivers/casloopy.cpp @@ -444,9 +444,10 @@ void casloopy_state::casloopy_map(address_map &map) } #if 0 -ADDRESS_MAP_START(casloopy_state::casloopy_sub_map) - AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("subcpu",0) -ADDRESS_MAP_END +void casloopy_state::casloopy_sub_map(address_map &map) +{ + map(0xf80000, 0xffffff).rom().region("subcpu",0); +} #endif static INPUT_PORTS_START( casloopy ) diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index 13a90c45f06..86f4de962c3 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -54,9 +54,9 @@ // ADDRESS_MAP( coco_mem ) //------------------------------------------------- -ADDRESS_MAP_START(coco_state::coco_mem) -ADDRESS_MAP_END - +void coco_state::coco_mem(address_map &map) +{ +} //************************************************************************** diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index dc707b2a5c0..23e019ff280 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -154,23 +154,25 @@ READ16_MEMBER(csplayh5_state::test_r) return machine().rand(); } -ADDRESS_MAP_START(csplayh5_state::csplayh5_sub_map) - AM_RANGE(0x000000, 0x01ffff) AM_ROM +void csplayh5_state::csplayh5_sub_map(address_map &map) +{ + map(0x000000, 0x01ffff).rom(); - AM_RANGE(0x02000a, 0x02000b) AM_READ(test_r) -// AM_RANGE(0x020008, 0x02000f) AM_DEVREADWRITE("ide", ide_controller_device, read_cs0, write_cs0) + map(0x02000a, 0x02000b).r(this, FUNC(csplayh5_state::test_r)); +// map(0x020008, 0x02000f).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); - AM_RANGE(0x040018, 0x040019) AM_READ(test_r) - AM_RANGE(0x040028, 0x04002f) AM_DEVREADWRITE("ide", ide_controller_device, read_cs0, write_cs0) // correct? - AM_RANGE(0x040036, 0x040037) AM_READ(test_r) + map(0x040018, 0x040019).r(this, FUNC(csplayh5_state::test_r)); + map(0x040028, 0x04002f).rw("ide", FUNC(ide_controller_device::read_cs0), FUNC(ide_controller_device::write_cs0)); // correct? + map(0x040036, 0x040037).r(this, FUNC(csplayh5_state::test_r)); - AM_RANGE(0x078000, 0x07ffff) AM_MIRROR(0xf80000) AM_RAM //AM_SHARE("nvram") -ADDRESS_MAP_END + map(0x078000, 0x07ffff).mirror(0xf80000).ram(); //.share("nvram"); +} -ADDRESS_MAP_START(csplayh5_state::csplayh5_sub_io_map) - AM_RANGE(0x0a, 0x0b) AM_READ(test_r) -ADDRESS_MAP_END +void csplayh5_state::csplayh5_sub_io_map(address_map &map) +{ + map(0x0a, 0x0b).r(this, FUNC(csplayh5_state::test_r)); +} #endif diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 8bec70d9623..afda8cb9d7d 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -1945,7 +1945,7 @@ void ddenlovr_state::quiz365_map(address_map &map) map(0x200c02, 0x200c03).r(this, FUNC(ddenlovr_state::quiz365_protection_r)); // Protection map(0x200e0a, 0x200e0d).w(this, FUNC(ddenlovr_state::quiz365_protection_w)); // Protection -// AM_RANGE(0x201000, 0x2017ff) AM_WRITEONLY // ? +// map(0x201000, 0x2017ff) AM_WRITEONLY // ? map(0x300201, 0x300201).w(this, FUNC(ddenlovr_state::ddenlovr_select2_w)); map(0x300203, 0x300203).w(this, FUNC(ddenlovr_state::quiz365_coincounter_w)); // Coin Counters + more stuff written on startup @@ -1999,7 +1999,7 @@ void ddenlovr_state::ddenlovj_map(address_map &map) map(0x000000, 0x07ffff).rom(); // ROM map(0x200000, 0x2003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); -// AM_RANGE(0x201000, 0x2017ff) AM_WRITEONLY // ? B0 on startup, then 00 +// map(0x201000, 0x2017ff) AM_WRITEONLY // ? B0 on startup, then 00 map(0x300040, 0x300047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); map(0x300048, 0x30004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); @@ -2058,7 +2058,7 @@ void ddenlovr_state::ddenlovrk_map(address_map &map) map(0x200000, 0x200001).rw(this, FUNC(ddenlovr_state::ddenlovrk_protection2_r), FUNC(ddenlovr_state::ddenlovrk_protection2_w)).share("protection2"); map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); -// AM_RANGE(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 +// map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); @@ -2094,7 +2094,7 @@ void ddenlovr_state::ddenlovr_map(address_map &map) map(0x300001, 0x300001).w(this, FUNC(ddenlovr_state::ddenlovr_oki_bank_w)); map(0xd00000, 0xd003ff).w(this, FUNC(ddenlovr_state::rongrong_palette_w)).umask16(0x00ff); -// AM_RANGE(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 +// map(0xd01000, 0xd017ff) AM_RAM // ? B0 on startup, then 00 map(0xe00040, 0xe00047).w(this, FUNC(ddenlovr_state::ddenlovr_palette_base_w)).umask16(0x00ff); map(0xe00048, 0xe0004f).w(this, FUNC(ddenlovr_state::ddenlovr_palette_mask_w)).umask16(0x00ff); @@ -2819,14 +2819,14 @@ void ddenlovr_state::kotbinyo_portmap(address_map &map) map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0xb0, 0xb0).portr("SYSTEM"); -// AM_RANGE(0xb1, 0xb2) AM_READ(hanakanz_keyb_r) +// map(0xb1, 0xb2) AM_READ(hanakanz_keyb_r) map(0xb1, 0xb1).portr("KEYB0"); map(0xb2, 0xb2).portr("KEYB1"); map(0xb3, 0xb3).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); -// AM_RANGE(0xb4, 0xb4) AM_WRITE(hanakanz_keyb_w) +// map(0xb4, 0xb4) AM_WRITE(hanakanz_keyb_w) map(0xb6, 0xb6).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); -// AM_RANGE(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) +// map(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) } @@ -2844,14 +2844,14 @@ void ddenlovr_state::kotbinsp_portmap(address_map &map) map(0x83, 0x84).r(this, FUNC(ddenlovr_state::hanakanz_gfxrom_r)); map(0xa0, 0xa1).w("ym2413", FUNC(ym2413_device::write)); map(0x90, 0x90).portr("SYSTEM"); -// AM_RANGE(0x91, 0x91) AM_READ(hanakanz_keyb_r) +// map(0x91, 0x91) AM_READ(hanakanz_keyb_r) map(0x91, 0x91).portr("KEYB0"); map(0x92, 0x92).portr("KEYB1"); map(0x93, 0x93).w(this, FUNC(ddenlovr_state::hanakanz_coincounter_w)); -// AM_RANGE(0x94, 0x94) AM_WRITE(hanakanz_keyb_w) +// map(0x94, 0x94) AM_WRITE(hanakanz_keyb_w) map(0x96, 0x96).r(this, FUNC(ddenlovr_state::hanakanz_rand_r)); map(0xc0, 0xc0).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); -// AM_RANGE(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) +// map(0xe0, 0xef) AM_DEVREADWRITE("rtc", msm6242_device, read, write) } @@ -4325,10 +4325,11 @@ void ddenlovr_state::htengoku_mem_map(address_map &map) map(0x8000, 0xffff).m(m_bankdev, FUNC(address_map_bank_device::amap8)); } -ADDRESS_MAP_START(dynax_state::htengoku_banked_map) - AM_RANGE(0x00000, 0x3ffff) AM_ROM AM_REGION("maincpu", 0x10000) - AM_RANGE(0x80000, 0x801ff) AM_WRITE(tenkai_palette_w) -ADDRESS_MAP_END +void dynax_state::htengoku_banked_map(address_map &map) +{ + map(0x00000, 0x3ffff).rom().region("maincpu", 0x10000); + map(0x80000, 0x801ff).w(this, FUNC(dynax_state::tenkai_palette_w)); +} MACHINE_CONFIG_START(ddenlovr_state::htengoku) diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index 13278d0077e..e5c60bbb184 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -714,9 +714,10 @@ void equites_state::sound_portmap(address_map &map) } -ADDRESS_MAP_START(equites_state::mcu_map) - AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("mcuram") /* main CPU shared RAM */ -ADDRESS_MAP_END +void equites_state::mcu_map(address_map &map) +{ + map(0x0000, 0x03ff).ram().share("mcuram"); /* main CPU shared RAM */ +} diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 641f7021b5e..6c12f6e00b0 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -486,9 +486,10 @@ void sanghopm_state::star100_readport(address_map &map) E1: W Reels enable/disable register */ -ADDRESS_MAP_START(goldstar_state::ramdac_map) - AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w) -ADDRESS_MAP_END +void goldstar_state::ramdac_map(address_map &map) +{ + map(0x000, 0x3ff).rw("ramdac", FUNC(ramdac_device::ramdac_pal_r), FUNC(ramdac_device::ramdac_rgb666_w)); +} /* RAMDAC written commands: diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index a572de0c357..fed104b9854 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -309,7 +309,7 @@ void kaneko16_berlwall_state::berlwall(address_map &map) map(0x680000, 0x680001).portr("P1"); map(0x680002, 0x680003).portr("P2"); map(0x680004, 0x680005).portr("SYSTEM"); -// AM_RANGE(0x680006, 0x680007) AM_READ_PORT("UNK") +// map(0x680006, 0x680007) AM_READ_PORT("UNK") map(0x700000, 0x700001).w(this, FUNC(kaneko16_berlwall_state::kaneko16_coin_lockout_w)); // Coin Lockout map(0x780000, 0x780001).r("watchdog", FUNC(watchdog_timer_device::reset16_r)); map(0x800000, 0x80001f).rw(this, FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_r<0>), FUNC(kaneko16_berlwall_state::kaneko16_ay_YM2149_w<0>)); // Sound @@ -376,7 +376,7 @@ void kaneko16_state::blazeon(address_map &map) map(0xe00000, 0xe00001).nopr(); // Read = IRQ Ack ? map(0xe00000, 0xe00000).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xe40000, 0xe40001).nopr(); // IRQ Ack ? -// AM_RANGE(0xe80000, 0xe80001) AM_READNOP // IRQ Ack ? +// map(0xe80000, 0xe80001) AM_READNOP // IRQ Ack ? map(0xec0000, 0xec0001).nopr(); // Lev 4 IRQ Ack ? } @@ -583,7 +583,7 @@ void kaneko16_gtmr_state::gtmr2_map(address_map &map) map(0xa00000, 0xa00001).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // Watchdog map(0xb00000, 0xb00001).portr("P1"); -// AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") +// map(0xb00002, 0xb00003) AM_READ_PORT("P2") map(0xb00002, 0xb00003).r(this, FUNC(kaneko16_gtmr_state::gtmr2_IN1_r)); map(0xb00004, 0xb00005).portr("SYSTEM"); map(0xb00006, 0xb00007).portr("EXTRA"); @@ -644,7 +644,7 @@ void kaneko16_shogwarr_state::shogwarr(address_map &map) map(0x280000, 0x280001).w(m_calc3_prot, FUNC(kaneko_calc3_device::mcu_com0_w)); map(0x290000, 0x290001).w(m_calc3_prot, FUNC(kaneko_calc3_device::mcu_com1_w)); map(0x2b0000, 0x2b0001).w(m_calc3_prot, FUNC(kaneko_calc3_device::mcu_com2_w)); - //AM_RANGE(0x2c0000, 0x2c0001) // run calc 3? or irq ack? + //map(0x2c0000, 0x2c0001) // run calc 3? or irq ack? map(0x2d0000, 0x2d0001).w(m_calc3_prot, FUNC(kaneko_calc3_device::mcu_com3_w)); map(0x380000, 0x380fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); // Palette map(0x400001, 0x400001).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // Samples @@ -696,7 +696,7 @@ void kaneko16_state::blazeon_soundport(address_map &map) void kaneko16_state::wingforc_soundport(address_map &map) { map.global_mask(0xff); -// AM_RANGE(0x00, 0x00) // 02 written at boot +// map(0x00, 0x00) // 02 written at boot map(0x02, 0x03).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write)); map(0x06, 0x06).r(m_soundlatch, FUNC(generic_latch_8_device::read)); map(0x0a, 0x0a).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); @@ -2038,14 +2038,16 @@ MACHINE_CONFIG_END VIDEO_UPDATE_AFTER_VBLANK fixes the mangled/wrong colored sprites */ -ADDRESS_MAP_START(kaneko16_state::gtmr_oki1_map) - AM_RANGE(0x00000, 0x2ffff) AM_ROM - AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank1") -ADDRESS_MAP_END +void kaneko16_state::gtmr_oki1_map(address_map &map) +{ + map(0x00000, 0x2ffff).rom(); + map(0x30000, 0x3ffff).bankr("okibank1"); +} -ADDRESS_MAP_START(kaneko16_state::gtmr_oki2_map) - AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("okibank2") -ADDRESS_MAP_END +void kaneko16_state::gtmr_oki2_map(address_map &map) +{ + map(0x00000, 0x3ffff).bankr("okibank2"); +} MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr) diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp index adc82191ada..926c1bd2ab3 100644 --- a/src/mame/drivers/lc80.cpp +++ b/src/mame/drivers/lc80.cpp @@ -59,10 +59,11 @@ void lc80_state::lc80_mem(address_map &map) } #if 0 -ADDRESS_MAP_START(lc80_state::sc80_mem) - AM_IMPORT_FROM(lc80_mem) - AM_RANGE(0xc000, 0xcfff) AM_ROM -ADDRESS_MAP_END +void lc80_state::sc80_mem(address_map &map) +{ + lc80_mem(map); + map(0xc000, 0xcfff).rom(); +} #endif void lc80_state::lc80_io(address_map &map) diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp index fe52e7ee82a..ed446d55c9b 100644 --- a/src/mame/drivers/mastboy.cpp +++ b/src/mame/drivers/mastboy.cpp @@ -649,11 +649,12 @@ void mastboy_state::mastboy_map(address_map &map) } // TODO : banked map is mirrored? -ADDRESS_MAP_START(mastboy_state::bank_c000_map) - AM_RANGE(0x000000, 0x00ffff) AM_MIRROR(0x1e0000) AM_READWRITE(vram_r, vram_w) AM_SHARE("vram") - AM_RANGE(0x010000, 0x01ffff) AM_MIRROR(0x1e0000) AM_ROM AM_REGION("vrom", 0) - AM_RANGE(0x200000, 0x3fffff) AM_ROM AM_REGION("bankedrom", 0) -ADDRESS_MAP_END +void mastboy_state::bank_c000_map(address_map &map) +{ + map(0x000000, 0x00ffff).mirror(0x1e0000).rw(this, FUNC(mastboy_state::vram_r), FUNC(mastboy_state::vram_w)).share("vram"); + map(0x010000, 0x01ffff).mirror(0x1e0000).rom().region("vrom", 0); + map(0x200000, 0x3fffff).rom().region("bankedrom", 0); +} /* Ports */ diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp index ff37e069be2..58ad92a02a5 100644 --- a/src/mame/drivers/mephistp.cpp +++ b/src/mame/drivers/mephistp.cpp @@ -131,10 +131,11 @@ void mephisto_pinball_state::mephisto_8051_io(address_map &map) } #ifdef UNUSED_DEFINITION -ADDRESS_MAP_START(mephisto_pinball_state::sport2k_8051_io) - AM_IMPORT_FROM(mephisto_8051_data) - AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write) -ADDRESS_MAP_END +void mephisto_pinball_state::sport2k_8051_io(address_map &map) +{ + mephisto_8051_data(map); + map(0x1800, 0x1801).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write)); +} #endif static INPUT_PORTS_START( mephisto ) diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp index 27e4f87313f..7632c15f1b3 100644 --- a/src/mame/drivers/miniforce.cpp +++ b/src/mame/drivers/miniforce.cpp @@ -140,15 +140,16 @@ miniforce_state(const machine_config &mconfig, device_type type, const char *tag }; #if 0 -ADDRESS_MAP_START(miniforce_state::miniforce_mem) - ADDRESS_MAP_UNMAP_HIGH +void miniforce_state::miniforce_mem(address_map &map) +{ + map.unmap_value_high(); /* The ROMs contains an OS9 bootloader. It is position independent but reset vector suggests that it sits flat on adress 0 (zero) */ // AM_RANGE (0x000000, 0x003fff) AM_ROM AM_REGION("roms", 0x000000) /* System EPROM Area 16Kb OS9 DEBUG - not verified */ // AM_RANGE (0x004000, 0x01ffff) AM_ROM AM_REGION("roms", 0x004000)/* System EPROM Area 112Kb for System ROM - not verified */ // AM_RANGE (0x020000, 0x03ffff) AM_RAM /* Not verified */ // AM_RANGE (0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ // AM_RANGE (0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ -ADDRESS_MAP_END +} #endif /* Start it up */ diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp index 2c7c6178947..a02413ef91a 100644 --- a/src/mame/drivers/mpu4vid.cpp +++ b/src/mame/drivers/mpu4vid.cpp @@ -1185,11 +1185,11 @@ void mpu4vid_state::mpu4_68k_map(address_map &map) { map(0x000000, 0x7fffff).rom(); map(0x800000, 0x80ffff).ram().share("vid_mainram"); -// AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */ +// map(0x810000, 0x81ffff) AM_RAM /* ? */ map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)); -/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ +/* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xff8000, 0xff8003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); @@ -1201,7 +1201,7 @@ void mpu4vid_state::mpu4oki_68k_map(address_map &map) { map(0x000000, 0x5fffff).rom(); //AM_WRITENOP map(0x600000, 0x63ffff).ram(); /* The Mating Game has an extra 256kB RAM on the program card */ -// AM_RANGE(0x640000, 0x7fffff) AM_NOP /* Possible bug, reads and writes here */ +// map(0x640000, 0x7fffff) AM_NOP /* Possible bug, reads and writes here */ map(0x800000, 0x80ffff).ram().share("vid_mainram"); map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); @@ -1214,7 +1214,7 @@ void mpu4vid_state::mpu4oki_68k_map(address_map &map) map(0xffa040, 0xffa04f).w(this, FUNC(mpu4vid_state::ic3ss_w)).umask16(0x00ff); // 6840PTM on sampled sound board map(0xffa060, 0xffa067).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff); // PIA6821 on sampled sound board map(0xffd000, 0xffd00f).rw(this, FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff); -// AM_RANGE(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */ +// map(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */ } void mpu4vid_state::bwbvid_68k_map(address_map &map) @@ -1225,13 +1225,13 @@ void mpu4vid_state::bwbvid_68k_map(address_map &map) map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)); -// AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE(bt471_r,bt471_w) //Some games use this -/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ +// map(0xa00000, 0xa0000f) AM_READWRITE(bt471_r,bt471_w) //Some games use this +/* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); map(0xe01000, 0xe0100f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff); - //AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(bwb_characteriser16_r, bwb_characteriser16_w)//AM_READWRITE(adpcm_r, adpcm_w) CHR ? + //map(0xa00004, 0xa0000f) AM_READWRITE(bwb_characteriser16_r, bwb_characteriser16_w)//AM_READWRITE(adpcm_r, adpcm_w) CHR ? } void mpu4vid_state::bwbvid5_68k_map(address_map &map) @@ -1242,8 +1242,8 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map) map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff); map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)); map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)); - //AM_RANGE(0xa00000, 0xa00003) AM_READWRITE8(bt471_r,bt471_w,0x00ff) Some games use this -/* AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ + //map(0xa00000, 0xa00003) AM_READWRITE8(bt471_r,bt471_w,0x00ff) Some games use this +/* map(0xa00004, 0xa0000f) AM_READWRITE(mpu4_vid_unmap_r, mpu4_vid_unmap_w) */ map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff); map(0xc00000, 0xc1ffff).rw(this, FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram"); map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff); @@ -1255,21 +1255,22 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map) } /* TODO: Fix up MPU4 map*/ -ADDRESS_MAP_START(mpu4_state::mpu4_6809_map) - AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") - AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("acia6850_0", acia6850_device, read, write) - AM_RANGE(0x0880, 0x0881) AM_NOP //Read/write here - AM_RANGE(0x0900, 0x0907) AM_DEVREADWRITE("ptm_ic2", ptm6840_device, read, write) - AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia_ic3", pia6821_device, read, write) - AM_RANGE(0x0b00, 0x0b03) AM_DEVREADWRITE("pia_ic4", pia6821_device, read, write) - AM_RANGE(0x0c00, 0x0c03) AM_DEVREADWRITE("pia_ic5", pia6821_device, read, write) - AM_RANGE(0x0d00, 0x0d03) AM_DEVREADWRITE("pia_ic6", pia6821_device, read, write) - AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE("pia_ic7", pia6821_device, read, write) - AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE("pia_ic8", pia6821_device, read, write) - AM_RANGE(0x4000, 0x7fff) AM_RAM - AM_RANGE(0xbe00, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu",0) /* 64k EPROM on board, only this region read */ -ADDRESS_MAP_END +void mpu4_state::mpu4_6809_map(address_map &map) +{ + map(0x0000, 0x07ff).ram().share("nvram"); + map(0x0800, 0x0801).rw("acia6850_0", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); + map(0x0880, 0x0881).noprw(); //Read/write here + map(0x0900, 0x0907).rw("ptm_ic2", FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)); + map(0x0a00, 0x0a03).rw("pia_ic3", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0b00, 0x0b03).rw("pia_ic4", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0c00, 0x0c03).rw("pia_ic5", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0d00, 0x0d03).rw("pia_ic6", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0e00, 0x0e03).rw("pia_ic7", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x0f00, 0x0f03).rw("pia_ic8", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); + map(0x4000, 0x7fff).ram(); + map(0xbe00, 0xbfff).ram(); + map(0xc000, 0xffff).rom().region("maincpu",0); /* 64k EPROM on board, only this region read */ +} diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index 4939c65443f..23883b1acf7 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -129,21 +129,22 @@ private: }; -ADDRESS_MAP_START(janshi_vdp_device::map) - AM_RANGE(0xfc0000, 0xfc1fff) AM_RAM AM_SHARE("back_vram") // bg tilemap? - AM_RANGE(0xfc2000, 0xfc2fff) AM_RAM AM_SHARE("vram1") // xpos, colour, tile number etc. +void janshi_vdp_device::map(address_map &map) +{ + map(0xfc0000, 0xfc1fff).ram().share("back_vram"); // bg tilemap? + map(0xfc2000, 0xfc2fff).ram().share("vram1"); // xpos, colour, tile number etc. - AM_RANGE(0xfc3700, 0xfc377f) AM_RAM AM_SHARE("unk1") // ?? height related? - AM_RANGE(0xfc3780, 0xfc37bf) AM_RAM AM_SHARE("widthflags") - AM_RANGE(0xfc37c0, 0xfc37ff) AM_RAM AM_SHARE("unk2") // 2x increasing tables 00 10 20 30 etc. + map(0xfc3700, 0xfc377f).ram().share("unk1"); // ?? height related? + map(0xfc3780, 0xfc37bf).ram().share("widthflags"); + map(0xfc37c0, 0xfc37ff).ram().share("unk2"); // 2x increasing tables 00 10 20 30 etc. - AM_RANGE(0xfc3800, 0xfc3fff) AM_RAM AM_SHARE("vram2") // y pos + unknown + map(0xfc3800, 0xfc3fff).ram().share("vram2"); // y pos + unknown - AM_RANGE(0xff0000, 0xff07ff) AM_RAM /*AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w)*/ AM_SHARE("paletteram") - AM_RANGE(0xff2000, 0xff27ff) AM_RAM /*AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w)*/ AM_SHARE("paletteram2") + map(0xff0000, 0xff07ff).ram().share("paletteram"); //AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_lo_w) + map(0xff2000, 0xff27ff).ram().share("paletteram2"); //AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_byte_split_hi_w) - AM_RANGE(0xff6000, 0xff601f) AM_RAM AM_SHARE("crtc_regs") -ADDRESS_MAP_END + map(0xff6000, 0xff601f).ram().share("crtc_regs"); +} DEFINE_DEVICE_TYPE(JANSHIVDP, janshi_vdp_device, "janshi_vdp", "Janshi VDP") diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp index 049a8e66caf..b9c53788f86 100644 --- a/src/mame/drivers/pocketc.cpp +++ b/src/mame/drivers/pocketc.cpp @@ -129,7 +129,7 @@ void pc1251_state::pc1260_mem(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x20ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); - //AM_RANGE( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) + //map( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) map(0x5800, 0x67ff).ram(); // 4KB RAM map(0x8000, 0xffff).rom(); } @@ -138,7 +138,7 @@ void pc1251_state::pc1261_mem(address_map &map) { map(0x0000, 0x1fff).rom(); map(0x2000, 0x20ff).rw(this, FUNC(pc1251_state::pc1251_lcd_read), FUNC(pc1251_state::pc1251_lcd_write)); - //AM_RANGE( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) + //map( 0x2800, 0x28ff) AM_READWRITE(pc1251_lcd_read, pc1251_lcd_write) map(0x4000, 0x67ff).ram(); // 10KB RAM map(0x8000, 0xffff).rom(); } @@ -171,18 +171,20 @@ void pc1403_state::pc1403h_mem(address_map &map) #if 0 -ADDRESS_MAP_START(pc1403_state::pc1421_readmem) - AM_RANGE( 0x0000, 0x1fff) AM_ROM - AM_RANGE( 0x3800, 0x47ff) AM_RAM - AM_RANGE( 0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END - -ADDRESS_MAP_START(pc1403_state::pc1421_writemem) - AM_RANGE( 0x0000, 0x1fff) AM_ROM - AM_RANGE( 0x2000, 0x37ff) AM_RAM - AM_RANGE( 0x3800, 0x47ff) AM_RAM - AM_RANGE( 0x8000, 0xffff) AM_ROM -ADDRESS_MAP_END +void pc1403_state::pc1421_readmem(address_map &map) +{ + map( 0x0000, 0x1fff).rom(); + map( 0x3800, 0x47ff).ram(); + map( 0x8000, 0xffff).rom(); +} + +void pc1403_state::pc1421_writemem(address_map &map) +{ + map( 0x0000, 0x1fff).rom(); + map( 0x2000, 0x37ff).ram(); + map( 0x3800, 0x47ff).ram(); + map( 0x8000, 0xffff).rom(); +} #endif diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 72be5208f97..6a35d576719 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -243,11 +243,12 @@ void funystrp_state::funystrp_map(address_map &map) map(0xfe0000, 0xfeffff).ram().mirror(0x10000); /* there's fe0000 <-> ff0000 compare */ /* Work RAM */ } -ADDRESS_MAP_START(splash_state::funystrp_sound_map) - AM_RANGE(0x0000, 0x6fff) AM_ROM - AM_RANGE(0x7000, 0x7fff) AM_RAM - AM_RANGE(0x8000, 0xffff) AM_ROM AM_ROMBANK("sound_bank") -ADDRESS_MAP_END +void splash_state::funystrp_sound_map(address_map &map) +{ + map(0x0000, 0x6fff).rom(); + map(0x7000, 0x7fff).ram(); + map(0x8000, 0xffff).rom().bankr("sound_bank"); +} READ8_MEMBER(funystrp_state::int_source_r) { diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp index bac7f540e39..44e1e1ed7ec 100644 --- a/src/mame/drivers/vertigo.cpp +++ b/src/mame/drivers/vertigo.cpp @@ -76,10 +76,11 @@ void vertigo_state::exidy440_audio_map(address_map &map) *************************************/ #if 0 -ADDRESS_MAP_START(vertigo_state::vertigo_motor) - AM_RANGE(0x010, 0x07f) AM_RAM - AM_RANGE(0x080, 0x7ff) AM_ROM -ADDRESS_MAP_END +void vertigo_state::vertigo_motor(address_map &map) +{ + map(0x010, 0x07f).ram(); + map(0x080, 0x7ff).rom(); +} #endif diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index 0f0445a9894..2310965b4bb 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -217,7 +217,7 @@ void vt100_state::vt100_io(address_map &map) // 0xC2 Video processor DC011 map(0xc2, 0xc2).w(m_crtc, FUNC(vt100_video_device::dc011_w)); // 0xE2 Graphics port - // AM_RANGE (0xe2, 0xe2) + // map (0xe2, 0xe2) } READ8_MEMBER(vt100_state::printer_r) @@ -230,11 +230,12 @@ WRITE8_MEMBER(vt100_state::printer_w) m_printer_uart->ins8250_w(space, offset >> 2, data); } -ADDRESS_MAP_START(vt100_state::vt102_io) - AM_IMPORT_FROM(vt100_io) - AM_RANGE(0x03, 0x03) AM_SELECT(0x1c) AM_READ(printer_r) - AM_RANGE(0x23, 0x23) AM_SELECT(0x1c) AM_WRITE(printer_w) -ADDRESS_MAP_END +void vt100_state::vt102_io(address_map &map) +{ + vt100_io(map); + map(0x03, 0x03).select(0x1c).r(this, FUNC(vt100_state::printer_r)); + map(0x23, 0x23).select(0x1c).w (this, FUNC(vt100_state::printer_w)); +} /* Input ports */ static INPUT_PORTS_START( vt100 ) @@ -373,20 +374,22 @@ MACHINE_CONFIG_START(vt100_state::vt100) MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0)) MACHINE_CONFIG_END -ADDRESS_MAP_START(vt100_state::stp_mem) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("stp", 0) - AM_RANGE(0x2000, 0x27ff) AM_RAM -ADDRESS_MAP_END - -ADDRESS_MAP_START(vt100_state::stp_io) - AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("stpusart0", i8251_device, data_r, data_w) - AM_RANGE(0x90, 0x90) AM_DEVREADWRITE("stpusart0", i8251_device, status_r, control_w) - AM_RANGE(0xa0, 0xa0) AM_DEVREADWRITE("stpusart1", i8251_device, data_r, data_w) - AM_RANGE(0xb0, 0xb0) AM_DEVREADWRITE("stpusart1", i8251_device, status_r, control_w) - AM_RANGE(0xc0, 0xc0) AM_DEVREADWRITE("stpusart2", i8251_device, data_r, data_w) - AM_RANGE(0xd0, 0xd0) AM_DEVREADWRITE("stpusart2", i8251_device, status_r, control_w) -ADDRESS_MAP_END +void vt100_state::stp_mem(address_map &map) +{ + map.unmap_value_high(); + map(0x0000, 0x1fff).rom().region("stp", 0); + map(0x2000, 0x27ff).ram(); +} + +void vt100_state::stp_io(address_map &map) +{ + map(0x80, 0x80).rw("stpusart0", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0x90, 0x90).rw("stpusart0", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + map(0xa0, 0xa0).rw("stpusart1", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0xb0, 0xb0).rw("stpusart1", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); + map(0xc0, 0xc0).rw("stpusart2", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w)); + map(0xd0, 0xd0).rw("stpusart2", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w)); +} MACHINE_CONFIG_START(vt100_state::vt100ac) vt100(config); -- cgit v1.2.3