summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-07-01 12:11:28 +0200
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-07-03 08:03:57 +0200
commitcbbbd07484c736eae2069b294ec666f231e64bff (patch) (github)
treeb94a690f0ab10635eb6d11837425744208c7e8a4 /src/mame
parentcb1930f6e6a6b460577f01207888eab402469e9f (diff)
downloadmame-cbbbd07484c736eae2069b294ec666f231e64bff.tar.bz2
mame-cbbbd07484c736eae2069b294ec666f231e64bff.zip
dimemory: Lift the cap on the number of address spaces per device [O. Galibert]
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/atarijsa.cpp8
-rw-r--r--src/mame/audio/decobsmt.cpp4
-rw-r--r--src/mame/audio/segam1audio.cpp8
-rw-r--r--src/mame/audio/turrett.cpp6
-rw-r--r--src/mame/audio/williams.cpp4
-rw-r--r--src/mame/drivers/a5105.cpp4
-rw-r--r--src/mame/drivers/adp.cpp8
-rw-r--r--src/mame/drivers/aerofgt.cpp4
-rw-r--r--src/mame/drivers/alto2.cpp6
-rw-r--r--src/mame/drivers/apc.cpp8
-rw-r--r--src/mame/drivers/apollo.cpp4
-rw-r--r--src/mame/drivers/attckufo.cpp4
-rw-r--r--src/mame/drivers/bfcobra.cpp2
-rw-r--r--src/mame/drivers/blitz68k.cpp2
-rw-r--r--src/mame/drivers/blmbycar.cpp4
-rw-r--r--src/mame/drivers/bmcbowl.cpp2
-rw-r--r--src/mame/drivers/bmcpokr.cpp2
-rw-r--r--src/mame/drivers/bw2.cpp4
-rw-r--r--src/mame/drivers/c128.cpp14
-rw-r--r--src/mame/drivers/c64.cpp16
-rw-r--r--src/mame/drivers/cave.cpp16
-rw-r--r--src/mame/drivers/cbm2.cpp12
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/cischeat.cpp8
-rw-r--r--src/mame/drivers/clpoker.cpp2
-rw-r--r--src/mame/drivers/coinmvga.cpp4
-rw-r--r--src/mame/drivers/cultures.cpp4
-rw-r--r--src/mame/drivers/ddribble.cpp4
-rw-r--r--src/mame/drivers/dmv.cpp4
-rw-r--r--src/mame/drivers/dreamwld.cpp8
-rw-r--r--src/mame/drivers/dunhuang.cpp2
-rw-r--r--src/mame/drivers/expro02.cpp10
-rw-r--r--src/mame/drivers/gaelco.cpp8
-rw-r--r--src/mame/drivers/galgames.cpp9
-rw-r--r--src/mame/drivers/galpanic.cpp4
-rw-r--r--src/mame/drivers/glass.cpp4
-rw-r--r--src/mame/drivers/goldstar.cpp2
-rw-r--r--src/mame/drivers/highvdeo.cpp2
-rw-r--r--src/mame/drivers/if800.cpp4
-rw-r--r--src/mame/drivers/indiana.cpp4
-rw-r--r--src/mame/drivers/interpro.cpp18
-rw-r--r--src/mame/drivers/jailbrek.cpp4
-rw-r--r--src/mame/drivers/kaneko16.cpp12
-rw-r--r--src/mame/drivers/koftball.cpp2
-rw-r--r--src/mame/drivers/lastfght.cpp2
-rw-r--r--src/mame/drivers/lordgun.cpp4
-rw-r--r--src/mame/drivers/lwings.cpp4
-rw-r--r--src/mame/drivers/magicard.cpp2
-rw-r--r--src/mame/drivers/mediagx.cpp2
-rw-r--r--src/mame/drivers/megasys1.cpp4
-rw-r--r--src/mame/drivers/metro.cpp8
-rw-r--r--src/mame/drivers/mpu4vid.cpp4
-rw-r--r--src/mame/drivers/mquake.cpp4
-rw-r--r--src/mame/drivers/mz3500.cpp8
-rw-r--r--src/mame/drivers/mz6500.cpp4
-rw-r--r--src/mame/drivers/nemesis.cpp14
-rw-r--r--src/mame/drivers/nmk16.cpp54
-rw-r--r--src/mame/drivers/octopus.cpp4
-rw-r--r--src/mame/drivers/ohmygod.cpp4
-rw-r--r--src/mame/drivers/overdriv.cpp6
-rw-r--r--src/mame/drivers/pc9801.cpp14
-rw-r--r--src/mame/drivers/pcxt.cpp2
-rw-r--r--src/mame/drivers/pinball2k.cpp2
-rw-r--r--src/mame/drivers/pinkiri8.cpp8
-rw-r--r--src/mame/drivers/playmark.cpp16
-rw-r--r--src/mame/drivers/plus4.cpp2
-rw-r--r--src/mame/drivers/pofo.cpp4
-rw-r--r--src/mame/drivers/pokechmp.cpp4
-rw-r--r--src/mame/drivers/powerbal.cpp6
-rw-r--r--src/mame/drivers/powerins.cpp4
-rw-r--r--src/mame/drivers/psikyo.cpp4
-rw-r--r--src/mame/drivers/psikyo4.cpp4
-rw-r--r--src/mame/drivers/pt68k4.cpp4
-rw-r--r--src/mame/drivers/punchout.cpp4
-rw-r--r--src/mame/drivers/pwrview.cpp2
-rw-r--r--src/mame/drivers/qx10.cpp4
-rw-r--r--src/mame/drivers/r2dx_v33.cpp4
-rw-r--r--src/mame/drivers/rainbow.cpp4
-rw-r--r--src/mame/drivers/relief.cpp4
-rw-r--r--src/mame/drivers/rltennis.cpp2
-rw-r--r--src/mame/drivers/rockrage.cpp4
-rw-r--r--src/mame/drivers/segae.cpp8
-rw-r--r--src/mame/drivers/segajw.cpp4
-rw-r--r--src/mame/drivers/sfbonus.cpp2
-rw-r--r--src/mame/drivers/shanghai.cpp2
-rw-r--r--src/mame/drivers/sigmab52.cpp2
-rw-r--r--src/mame/drivers/skylncr.cpp4
-rw-r--r--src/mame/drivers/sliver.cpp6
-rw-r--r--src/mame/drivers/speedspn.cpp4
-rw-r--r--src/mame/drivers/subsino.cpp2
-rw-r--r--src/mame/drivers/subsino2.cpp2
-rw-r--r--src/mame/drivers/supduck.cpp4
-rw-r--r--src/mame/drivers/system16.cpp4
-rw-r--r--src/mame/drivers/taito_b.cpp2
-rw-r--r--src/mame/drivers/tandy1t.cpp2
-rw-r--r--src/mame/drivers/tandy2k.cpp4
-rw-r--r--src/mame/drivers/targeth.cpp4
-rw-r--r--src/mame/drivers/thoop2.cpp4
-rw-r--r--src/mame/drivers/toaplan2.cpp8
-rw-r--r--src/mame/drivers/trackfld.cpp6
-rw-r--r--src/mame/drivers/turrett.cpp4
-rw-r--r--src/mame/drivers/twins.cpp2
-rw-r--r--src/mame/drivers/vgmplay.cpp41
-rw-r--r--src/mame/drivers/vic10.cpp8
-rw-r--r--src/mame/drivers/vic20.cpp4
-rw-r--r--src/mame/drivers/vt240.cpp4
-rw-r--r--src/mame/drivers/wildpkr.cpp4
-rw-r--r--src/mame/drivers/wrally.cpp4
-rw-r--r--src/mame/drivers/yiear.cpp4
-rw-r--r--src/mame/drivers/yunsun16.cpp4
-rw-r--r--src/mame/etc/template_cpu.h2
-rw-r--r--src/mame/includes/turrett.h2
-rw-r--r--src/mame/machine/6883sam.h4
-rw-r--r--src/mame/machine/abc1600mac.cpp6
-rw-r--r--src/mame/machine/abc1600mac.h2
-rw-r--r--src/mame/machine/c117.cpp7
-rw-r--r--src/mame/machine/c117.h2
-rw-r--r--src/mame/machine/cammu.cpp22
-rw-r--r--src/mame/machine/cammu.h2
-rw-r--r--src/mame/machine/coco.cpp6
-rw-r--r--src/mame/machine/fd1089.cpp2
-rw-r--r--src/mame/machine/inder_vid.cpp2
-rw-r--r--src/mame/machine/interpro_ioga.cpp2
-rw-r--r--src/mame/machine/namco_c139.cpp6
-rw-r--r--src/mame/machine/namco_c139.h2
-rw-r--r--src/mame/machine/prof80mmu.cpp7
-rw-r--r--src/mame/machine/prof80mmu.h2
-rw-r--r--src/mame/machine/seicop.cpp8
-rw-r--r--src/mame/machine/seicop.h2
-rw-r--r--src/mame/machine/st0016.cpp9
-rw-r--r--src/mame/machine/st0016.h11
-rw-r--r--src/mame/video/abc1600.cpp8
-rw-r--r--src/mame/video/abc1600.h2
-rw-r--r--src/mame/video/c45.cpp6
-rw-r--r--src/mame/video/c45.h2
-rw-r--r--src/mame/video/cidelsa.cpp4
-rw-r--r--src/mame/video/comx35.cpp2
-rw-r--r--src/mame/video/gp9001.cpp6
-rw-r--r--src/mame/video/gp9001.h2
-rw-r--r--src/mame/video/igs017_igs031.cpp6
-rw-r--r--src/mame/video/igs017_igs031.h2
-rw-r--r--src/mame/video/kyocera.cpp4
-rw-r--r--src/mame/video/mikromik.cpp4
-rw-r--r--src/mame/video/nick.cpp8
-rw-r--r--src/mame/video/nick.h2
-rw-r--r--src/mame/video/pc8401a.cpp4
-rw-r--r--src/mame/video/pc_t1t.cpp8
-rw-r--r--src/mame/video/pcd.cpp4
-rw-r--r--src/mame/video/pecom.cpp2
-rw-r--r--src/mame/video/seibu_crtc.cpp8
-rw-r--r--src/mame/video/seibu_crtc.h2
-rw-r--r--src/mame/video/tmc600.cpp2
-rw-r--r--src/mame/video/zx8301.cpp8
-rw-r--r--src/mame/video/zx8301.h2
154 files changed, 444 insertions, 408 deletions
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index eeef37392a5..9b6f54ebe3b 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -145,13 +145,13 @@ static ADDRESS_MAP_START( atarijsa3_map, AS_PROGRAM, 8, atari_jsa_iii_device )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jsa3_oki1_map, AS_0, 8, atari_jsa_iii_device )
+static ADDRESS_MAP_START( jsa3_oki1_map, 0, 8, atari_jsa_iii_device )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("oki1lo")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("oki1hi")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jsa3_oki2_map, AS_0, 8, atari_jsa_iiis_device )
+static ADDRESS_MAP_START( jsa3_oki2_map, 0, 8, atari_jsa_iiis_device )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("oki2lo")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("oki2hi")
ADDRESS_MAP_END
@@ -921,7 +921,7 @@ MACHINE_CONFIG_MEMBER( atari_jsa_iii_device::device_add_mconfig )
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.60, 0)
MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki1_map)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.75, 0)
MACHINE_CONFIG_END
@@ -966,5 +966,5 @@ MACHINE_CONFIG_MEMBER( atari_jsa_iiis_device::device_add_mconfig )
MCFG_OKIM6295_ADD("oki2", JSA_MASTER_CLOCK/3, PIN7_HIGH)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.75, 1)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index 56a290bf440..4f44be9987a 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -26,7 +26,7 @@ static ADDRESS_MAP_START( decobsmt_map, AS_PROGRAM, 8, decobsmt_device )
AM_RANGE(0x2000, 0xffff) AM_ROM AM_REGION(":soundcpu", 0x2000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bsmt_map, AS_0, 8, decobsmt_device )
+static ADDRESS_MAP_START( bsmt_map, 0, 8, decobsmt_device )
AM_RANGE(0x000000, 0xffffff) AM_ROM AM_REGION(":bsmt", 0)
ADDRESS_MAP_END
@@ -53,7 +53,7 @@ MACHINE_CONFIG_MEMBER( decobsmt_device::device_add_mconfig )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_BSMT2000_ADD(BSMT_TAG, 24000000)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, bsmt_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, bsmt_map)
MCFG_BSMT2000_READY_CALLBACK(decobsmt_device, bsmt_ready_callback)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp
index 0926b080195..c9724c21f55 100644
--- a/src/mame/audio/segam1audio.cpp
+++ b/src/mame/audio/segam1audio.cpp
@@ -34,11 +34,11 @@ static ADDRESS_MAP_START( segam1audio_map, AS_PROGRAM, 16, segam1audio_device )
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mpcm1_map, AS_0, 8, segam1audio_device )
+static ADDRESS_MAP_START( mpcm1_map, 0, 8, segam1audio_device )
AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION(":m1pcm1", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mpcm2_map, AS_0, 8, segam1audio_device )
+static ADDRESS_MAP_START( mpcm2_map, 0, 8, segam1audio_device )
AM_RANGE(0x000000, 0x3fffff) AM_ROM AM_REGION(":m1pcm2", 0)
ADDRESS_MAP_END
@@ -63,12 +63,12 @@ MACHINE_CONFIG_MEMBER( segam1audio_device::device_add_mconfig )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MCFG_SOUND_ADD(MULTIPCM_1_TAG, MULTIPCM, 8000000)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mpcm1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, mpcm1_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_SOUND_ADD(MULTIPCM_2_TAG, MULTIPCM, 8000000)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mpcm2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, mpcm2_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp
index 8fa19efdb72..4f4e402e7a6 100644
--- a/src/mame/audio/turrett.cpp
+++ b/src/mame/audio/turrett.cpp
@@ -29,9 +29,11 @@ turrett_device::turrett_device(const machine_config &mconfig, const char *tag, d
// memory_space_config - configure address space
//-------------------------------------------------
-const address_space_config *turrett_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> turrett_device::memory_space_config() const
{
- return (spacenum == 0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index 349743b5a37..f9174d44105 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -735,7 +735,7 @@ ADDRESS_MAP_END
// OKI6295 map
//-------------------------------------------------
-static ADDRESS_MAP_START( williams_adpcm_oki_map, AS_0, 8, williams_adpcm_sound_device )
+static ADDRESS_MAP_START( williams_adpcm_oki_map, 0, 8, williams_adpcm_sound_device )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("okibank")
AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("oki", 0x60000)
ADDRESS_MAP_END
@@ -758,7 +758,7 @@ MACHINE_CONFIG_MEMBER( williams_adpcm_sound_device::device_add_mconfig )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, williams_adpcm_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, williams_adpcm_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 39389733bf7..3deccb7e4c7 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -536,7 +536,7 @@ void a5105_state::video_start()
m_char_ram = memregion("pcg")->base();
}
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, a5105_state)
+static ADDRESS_MAP_START( upd7220_map, 0, 16, a5105_state)
ADDRESS_MAP_GLOBAL_MASK(0x1ffff)
AM_RANGE(0x00000, 0x1ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
@@ -583,7 +583,7 @@ static MACHINE_CONFIG_START( a5105 )
/* Devices */
MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_15MHz / 16) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(a5105_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(a5105_state, hgdc_draw_text)
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index e12f46bec30..682938053f4 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -518,17 +518,17 @@ INTERRUPT_GEN_MEMBER(adp_state::adp_int)
}
*/
-static ADDRESS_MAP_START( adp_hd63484_map, AS_0, 16, adp_state )
+static ADDRESS_MAP_START( adp_hd63484_map, 0, 16, adp_state )
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, AS_0, 16, adp_state )
+static ADDRESS_MAP_START( fashiong_hd63484_map, 0, 16, adp_state )
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, AS_0, 16, adp_state )
+static ADDRESS_MAP_START( fstation_hd63484_map, 0, 16, adp_state )
AM_RANGE(0x00000, 0x7ffff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0x80000, 0xfffff) AM_RAM
ADDRESS_MAP_END
@@ -601,7 +601,7 @@ static MACHINE_CONFIG_DERIVED( fashiong, skattv )
MCFG_HD63484_ADDRESS_MAP(fashiong_hd63484_map)
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, adp_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, adp_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 65d4991ca1c..3c4c8575375 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -452,7 +452,7 @@ 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( oki_map, AS_0, 8, aerofgt_state ) //only for aerfboot for now
+static ADDRESS_MAP_START( oki_map, 0, 8, aerofgt_state ) //only for aerfboot for now
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -1906,7 +1906,7 @@ static MACHINE_CONFIG_START( aerfboot )
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index 8ec29569952..d7d6cff55d5 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -260,15 +260,15 @@ ROM_END
// ADDRESS MAPS
//**************************************************************************
-ADDRESS_MAP_START( alto2_ucode_map, AS_0, 32, alto2_state )
+ADDRESS_MAP_START( alto2_ucode_map, 0, 32, alto2_state )
AM_RANGE(0, 4*ALTO2_UCODE_PAGE_SIZE-1) AM_DEVICE32( "maincpu", alto2_cpu_device, ucode_map, 0xffffffffUL )
ADDRESS_MAP_END
-ADDRESS_MAP_START( alto2_const_map, AS_1, 16, alto2_state )
+ADDRESS_MAP_START( alto2_const_map, 1, 16, alto2_state )
AM_RANGE(0, ALTO2_CONST_SIZE-1) AM_DEVICE16( "maincpu", alto2_cpu_device, const_map, 0xffffU )
ADDRESS_MAP_END
-ADDRESS_MAP_START( alto2_iomem_map, AS_2, 16, alto2_state )
+ADDRESS_MAP_START( alto2_iomem_map, 2, 16, alto2_state )
AM_RANGE(0, 2*ALTO2_RAM_SIZE-1) AM_DEVICE16( "maincpu", alto2_cpu_device, iomem_map, 0xffffU )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index 91f27c3d382..9f49de1e0f0 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -785,11 +785,11 @@ GFXDECODE_END
-static ADDRESS_MAP_START( upd7220_1_map, AS_0, 16, apc_state)
+static ADDRESS_MAP_START( upd7220_1_map, 0, 16, apc_state)
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram_1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_2_map, AS_0, 16, apc_state )
+static ADDRESS_MAP_START( upd7220_2_map, 0, 16, apc_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram_2")
ADDRESS_MAP_END
@@ -960,11 +960,11 @@ static MACHINE_CONFIG_START( apc )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", apc)
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 3579545) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(apc_state, hgdc_draw_text)
MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 3579545) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_2_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(apc_state, hgdc_display_pixels)
/* sound hardware */
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 8e75ef15ece..ce9ec5b76ad 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -562,7 +562,7 @@ READ16_MEMBER(apollo_state::apollo_atbus_memory_r)
uint16_t data;
// Motorola CPU is MSB first, ISA Bus is LSB first
- data = m_isa->prog16_swap_r(space, offset, mem_mask);
+ data = m_isa->mem16_swap_r(space, offset, mem_mask);
SLOG2(("apollo_atbus_memory_r at %08x = %04x & %04x", ATBUS_MEMORY_BASE + offset * 2, data, mem_mask));
return data;
@@ -573,7 +573,7 @@ WRITE16_MEMBER(apollo_state::apollo_atbus_memory_w)
SLOG2(("apollo_atbus_memory_w at %08x = %04x & %04x", ATBUS_MEMORY_BASE + offset*2, data, mem_mask));
// Motorola CPU is MSB first, ISA Bus is LSB first
- m_isa->prog16_swap_w(space, offset, data, mem_mask);
+ m_isa->mem16_swap_w(space, offset, data, mem_mask);
}
/***************************************************************************
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index 6fc3635ccd4..5d4eac1be22 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -50,11 +50,11 @@ static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8, attckufo_state )
AM_RANGE(0x2000, 0x3fff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, attckufo_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, attckufo_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, attckufo_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, attckufo_state )
AM_RANGE(0x000, 0x3ff) AM_READ(vic_colorram_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp
index f97a735a284..c67b8af85e0 100644
--- a/src/mame/drivers/bfcobra.cpp
+++ b/src/mame/drivers/bfcobra.cpp
@@ -1276,7 +1276,7 @@ ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, bfcobra_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, bfcobra_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 632a5d1d812..601f8900c93 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -1669,7 +1669,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(blitz68k_state::crtc_addr)
{
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, blitz68k_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, blitz68k_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index 98a47c95fc5..69a3028c46d 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -144,7 +144,7 @@ static ADDRESS_MAP_START( watrball_map, AS_PROGRAM, 16, blmbycar_state )
AM_RANGE(0x70000a, 0x70000b) AM_WRITEONLY // ?? busy
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blmbycar_oki_map, AS_0, 8, blmbycar_state )
+static ADDRESS_MAP_START( blmbycar_oki_map, 0, 8, blmbycar_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -371,7 +371,7 @@ static MACHINE_CONFIG_START( blmbycar )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, blmbycar_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, blmbycar_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 6bff1856186..1a1c8093422 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -446,7 +446,7 @@ WRITE8_MEMBER(bmcbowl_state::input_mux_w)
m_bmc_input=data;
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, bmcbowl_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcbowl_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index a4565f91f3a..ad69cf5634f 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -795,7 +795,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(bmcpokr_state::interrupt)
if (m_irq_enable & (1<<6)) m_maincpu->set_input_line(6, ASSERT_LINE);
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, bmcpokr_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcpokr_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index 7af11dd172d..a5d7853aae3 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( lcdc_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( lcdc_map, AS_0, 8, bw2_state )
+static ADDRESS_MAP_START( lcdc_map, 0, 8, bw2_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("videoram")
ADDRESS_MAP_END
@@ -608,7 +608,7 @@ static MACHINE_CONFIG_START( bw2 )
MCFG_I8255_OUT_PORTC_CB(WRITE8(bw2_state, ppi_pc_w))
MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL_16MHz)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, lcdc_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index b61047dfef3..c1d9b288db2 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -684,7 +684,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, c128_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, c128_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
@@ -693,7 +693,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_colorram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, c128_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, c128_state )
AM_RANGE(0x000, 0x3ff) AM_READ(vic_colorram_r)
ADDRESS_MAP_END
@@ -702,7 +702,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vdc_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vdc_videoram_map, AS_0, 8, c128_state )
+static ADDRESS_MAP_START( vdc_videoram_map, 0, 8, c128_state )
AM_RANGE(0x0000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -1701,8 +1701,8 @@ static MACHINE_CONFIG_START( ntsc )
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_VIC_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_VIC_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES)
@@ -1872,8 +1872,8 @@ static MACHINE_CONFIG_START( pal )
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_VIC_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_VIC_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES)
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 6f4dfc5955b..e9f3f1ee2c5 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -533,7 +533,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, c64_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, c64_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
@@ -542,7 +542,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_colorram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, c64_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, c64_state )
AM_RANGE(0x000, 0x3ff) AM_READ(vic_colorram_r)
ADDRESS_MAP_END
@@ -1325,8 +1325,8 @@ static MACHINE_CONFIG_START( ntsc )
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES)
@@ -1481,8 +1481,8 @@ static MACHINE_CONFIG_START( pal )
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES)
@@ -1616,8 +1616,8 @@ static MACHINE_CONFIG_START( pal_gs )
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES)
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index e184b0edcab..9a443a17bb9 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -1161,12 +1161,12 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( oki_map, AS_0, 8, cave_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, cave_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("okibank1")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki2_map, AS_0, 8, cave_state )
+static ADDRESS_MAP_START( oki2_map, 0, 8, cave_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("oki2bank1")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("oki2bank2")
ADDRESS_MAP_END
@@ -2307,7 +2307,7 @@ static MACHINE_CONFIG_START( hotdogst )
MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -2410,7 +2410,7 @@ static MACHINE_CONFIG_START( mazinger )
MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
@@ -2463,11 +2463,11 @@ static MACHINE_CONFIG_START( metmqstr )
MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MACHINE_CONFIG_END
@@ -2713,11 +2713,11 @@ static MACHINE_CONFIG_START( sailormn )
MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index 092d3cfb262..14dd1adcd86 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -1172,7 +1172,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, p500_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, p500_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
@@ -1181,7 +1181,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_colorram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, p500_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, p500_state )
AM_RANGE(0x000, 0x3ff) AM_READ(vic_colorram_r)
ADDRESS_MAP_END
@@ -2294,8 +2294,8 @@ static MACHINE_CONFIG_START( p500_ntsc )
MCFG_MOS6566_CPU(M6509_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES)
@@ -2410,8 +2410,8 @@ static MACHINE_CONFIG_START( p500_pal )
MCFG_MOS6566_CPU(M6509_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES)
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index c5919845220..801d490ff8e 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -342,7 +342,7 @@ static GFXDECODE_START( chsuper )
GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 0, 1 )
GFXDECODE_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, chsuper_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, chsuper_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 55367f347e0..22cdefce06a 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -820,12 +820,12 @@ static ADDRESS_MAP_START( captflag_map, AS_PROGRAM, 16, cischeat_state )
AM_RANGE(0x100060, 0x10007d) AM_RAM // 7-seg? NVRAM?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( captflag_oki1_map, AS_0, 8, cischeat_state )
+static ADDRESS_MAP_START( captflag_oki1_map, 0, 8, cischeat_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("oki1_bank")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( captflag_oki2_map, AS_0, 8, cischeat_state )
+static ADDRESS_MAP_START( captflag_oki2_map, 0, 8, cischeat_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("oki2_bank")
ADDRESS_MAP_END
@@ -2214,12 +2214,12 @@ static MACHINE_CONFIG_START( captflag )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, captflag_oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, captflag_oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, captflag_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, captflag_oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 561bb2ef758..2a9410d4f58 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, clpoker_state )
AM_RANGE(0xc0, 0xc0) AM_READNOP // mystery read at startup
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, clpoker_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, clpoker_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index bf1d3671855..48d8f8b6dc4 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -617,11 +617,11 @@ INTERRUPT_GEN_MEMBER(coinmvga_state::vblank_irq)
* Machine Drivers *
*************************/
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, coinmvga_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, coinmvga_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac2_map, AS_0, 8, coinmvga_state )
+static ADDRESS_MAP_START( ramdac2_map, 0, 8, coinmvga_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac2",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index 47cfadc907e..0cf708fa830 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -183,7 +183,7 @@ WRITE8_MEMBER(cultures_state::bg_bank_w)
}
-static ADDRESS_MAP_START( oki_map, AS_0, 8, cultures_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, cultures_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -428,7 +428,7 @@ static MACHINE_CONFIG_START( cultures )
MCFG_OKIM6295_ADD("oki", MCLK/8, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 51c6d41ba90..89e9e55e985 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8, ddribble_state )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vlm_map, AS_0, 8, ddribble_state )
+static ADDRESS_MAP_START( vlm_map, 0, 8, ddribble_state )
AM_RANGE(0x0000, 0xffff) AM_ROMBANK("vlmbank")
ADDRESS_MAP_END
@@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( ddribble )
MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_FILTER_RC_ADD("filter1", 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 2d0e62d98ed..169a292c672 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -554,7 +554,7 @@ WRITE8_MEMBER(dmv_state::kb_mcu_port2_w)
m_slot7->keyint_w(BIT(data, 4));
}
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, dmv_state )
+static ADDRESS_MAP_START( upd7220_map, 0, 16, dmv_state )
ADDRESS_MAP_GLOBAL_MASK(0x1ffff)
AM_RANGE(0x00000, 0x1ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
@@ -740,7 +740,7 @@ static MACHINE_CONFIG_START( dmv )
// devices
MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_5MHz/2) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(dmv_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(dmv_state, hgdc_draw_text)
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index d63e70cd1de..c5e19c19f72 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -425,12 +425,12 @@ READ32_MEMBER(dreamwld_state::dreamwld_protdata_r)
return dat << 24;
}
-static ADDRESS_MAP_START( oki1_map, AS_0, 8, dreamwld_state )
+static ADDRESS_MAP_START( oki1_map, 0, 8, dreamwld_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("oki1bank")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki2_map, AS_0, 8, dreamwld_state )
+static ADDRESS_MAP_START( oki2_map, 0, 8, dreamwld_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("oki2bank")
ADDRESS_MAP_END
@@ -819,7 +819,7 @@ static MACHINE_CONFIG_START( baryon )
MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MACHINE_CONFIG_END
@@ -833,7 +833,7 @@ static MACHINE_CONFIG_DERIVED( dreamwld, baryon )
MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 3c9744ea225..aac431e18a4 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -523,7 +523,7 @@ static ADDRESS_MAP_START( dunhuang_io_map, AS_IO, 8, dunhuang_state )
AM_RANGE( 0x0098, 0x0098 ) AM_DEVWRITE("ay8910", ay8910_device, address_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, dunhuang_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, dunhuang_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index 691fcd9b5d1..c52b2673535 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -798,7 +798,7 @@ static ADDRESS_MAP_START( smissw_map, AS_PROGRAM, 16, expro02_state )
AM_RANGE(0xf00000, 0xf00001) AM_READ8(comad_okim6295_r, 0xff00) AM_DEVWRITE8("oki", okim6295_device, write, 0xff00) /* fantasia, missw96 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, expro02_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, expro02_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -922,7 +922,7 @@ static MACHINE_CONFIG_START( expro02 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 12000000/6, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -961,7 +961,7 @@ static MACHINE_CONFIG_DERIVED( supmodel, comad_noview2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(supmodel_map)
MCFG_OKIM6295_REPLACE("oki", 1584000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -979,7 +979,7 @@ static MACHINE_CONFIG_DERIVED( galhustl, comad_noview2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(galhustl_map)
MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SCREEN_MODIFY("screen")
@@ -991,7 +991,7 @@ static MACHINE_CONFIG_DERIVED( zipzap, comad_noview2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(zipzap_map)
MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SCREEN_MODIFY("screen") // doesn't work with original kaneko_spr implementation
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index fee5dc06cc1..b316ed27026 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( thoop_map, AS_PROGRAM, 16, gaelco_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, gaelco_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, gaelco_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -565,7 +565,7 @@ static MACHINE_CONFIG_START( maniacsq )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -598,7 +598,7 @@ static MACHINE_CONFIG_START( squash )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -631,7 +631,7 @@ static MACHINE_CONFIG_START( thoop )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index 4e9801eea50..f915a2eb2e8 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -277,7 +277,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_PROGRAM) const override { return (spacenum == AS_PROGRAM) ? &m_space_config: nullptr; }
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
address_space_config m_space_config;
address_space *m_space;
@@ -300,6 +300,13 @@ protected:
bool m_is_ram_active;
};
+std::vector<std::pair<int, const address_space_config *>> galgames_slot_device::memory_space_config() const
+{
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_space_config)
+ };
+}
+
// device type definition
DEFINE_DEVICE_TYPE(GALGAMES_SLOT, galgames_slot_device, "starpak_slot", "Galaxy Games Slot")
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index 155a36a3cfe..82442e0ca0d 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -157,7 +157,7 @@ static ADDRESS_MAP_START( galpanica_map, AS_PROGRAM, 16, galpanic_state )
AM_RANGE(0xe00000, 0xe00015) AM_DEVREADWRITE("calc1_mcu", kaneko_hit_device, kaneko_hit_r,kaneko_hit_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galpanic_oki_map, AS_0, 8, galpanic_state )
+static ADDRESS_MAP_START( galpanic_oki_map, 0, 8, galpanic_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( galpanic )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, galpanic_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, galpanic_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index a20990f28de..7ff320ec5f8 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( glass_map, AS_PROGRAM, 16, glass_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, glass_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, glass_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -224,7 +224,7 @@ static MACHINE_CONFIG_START( glass )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz Resonator & pin 7 high verified on PCB */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index eb429ce4450..358bbd6f7be 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -479,7 +479,7 @@ ADDRESS_MAP_END
E1: W Reels enable/disable register
*/
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, goldstar_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, goldstar_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 6fa7329ea31..11a49be7062 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -1119,7 +1119,7 @@ INTERRUPT_GEN_MEMBER(highvdeo_state::vblank_irq_80186)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, highvdeo_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, highvdeo_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp
index cd747ad7597..bbb4cff5895 100644
--- a/src/mame/drivers/if800.cpp
+++ b/src/mame/drivers/if800.cpp
@@ -76,7 +76,7 @@ void if800_state::machine_reset()
{
}
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, if800_state )
+static ADDRESS_MAP_START( upd7220_map, 0, 16, if800_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
@@ -89,7 +89,7 @@ static MACHINE_CONFIG_START( if800 )
// MCFG_PIC8259_ADD( "pic8259", if800_pic8259_config )
MCFG_DEVICE_ADD("upd7220", UPD7220, 8000000/4)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(if800_state, hgdc_display_pixels)
/* video hardware */
diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp
index 693aa262e87..8b7e6df2600 100644
--- a/src/mame/drivers/indiana.cpp
+++ b/src/mame/drivers/indiana.cpp
@@ -47,9 +47,9 @@ static ADDRESS_MAP_START(indiana_mem, AS_PROGRAM, 32, indiana_state)
AM_RANGE(0x00100000, 0x00107fff) AM_MIRROR(0x7f8f8000) AM_RAM // SRAM 32Kb of SRAM
AM_RANGE(0x00200000, 0x002fffff) AM_DEVREADWRITE8(MFP_TAG, mc68901_device, read, write, 0xffffffff) AM_MIRROR(0x7f800000) // MFP
AM_RANGE(0x00400000, 0x004fffff) AM_DEVREADWRITE16(ISABUS_TAG, isa16_device, io16_swap_r, io16_swap_w, 0xffffffff) AM_MIRROR(0x7f800000) // 16 bit PC IO
- AM_RANGE(0x00500000, 0x005fffff) AM_DEVREADWRITE16(ISABUS_TAG, isa16_device, prog16_swap_r, prog16_swap_w, 0xffffffff) AM_MIRROR(0x7f800000) // 16 bit PC MEM
+ AM_RANGE(0x00500000, 0x005fffff) AM_DEVREADWRITE16(ISABUS_TAG, isa16_device, mem16_swap_r, mem16_swap_w, 0xffffffff) AM_MIRROR(0x7f800000) // 16 bit PC MEM
AM_RANGE(0x00600000, 0x006fffff) AM_DEVREADWRITE8(ISABUS_TAG, isa16_device, io_r, io_w, 0xffffffff) AM_MIRROR(0x7f800000) // 8 bit PC IO
- AM_RANGE(0x00700000, 0x007fffff) AM_DEVREADWRITE8(ISABUS_TAG, isa16_device, prog_r, prog_w, 0xffffffff) AM_MIRROR(0x7f800000) // 8 bit PC MEM
+ AM_RANGE(0x00700000, 0x007fffff) AM_DEVREADWRITE8(ISABUS_TAG, isa16_device, mem_r, mem_w, 0xffffffff) AM_MIRROR(0x7f800000) // 8 bit PC MEM
AM_RANGE(0x80000000, 0x803fffff) AM_RAM // 4 MB RAM
AM_RANGE(0xfffe0000, 0xfffe7fff) AM_RAM // SRAM mirror?
ADDRESS_MAP_END
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 794363adacb..8747c865ad0 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -345,7 +345,7 @@ DRIVER_INIT_MEMBER(interpro_state, ip2800)
// 256 = reports 256M, 32x8
// grab the main memory space from the mmu
- address_space &space = m_mmu->space(AS_0);
+ address_space &space = m_mmu->space(0);
// map the configured ram
space.install_ram(0, m_ram->mask(), m_ram->pointer());
@@ -374,7 +374,7 @@ static ADDRESS_MAP_START(clipper_data_map, AS_DATA, 32, interpro_state)
AM_RANGE(0x00000000, 0xffffffff) AM_DEVREADWRITE32(INTERPRO_MMU_TAG, cammu_device, data_r, data_w, 0xffffffff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(interpro_common_map, AS_0, 32, interpro_state)
+static ADDRESS_MAP_START(interpro_common_map, 0, 32, interpro_state)
AM_RANGE(0x40000000, 0x4000004f) AM_DEVICE(INTERPRO_MCGA_TAG, interpro_fmcc_device, map)
AM_RANGE(0x4f007e00, 0x4f007eff) AM_DEVICE(INTERPRO_SGA_TAG, interpro_sga_device, map)
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START(interpro_common_map, AS_0, 32, interpro_state)
ADDRESS_MAP_END
// these maps represent the real main, i/o and boot spaces of the system
-static ADDRESS_MAP_START(interpro_main_map, AS_0, 32, interpro_state)
+static ADDRESS_MAP_START(interpro_main_map, 0, 32, interpro_state)
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM AM_SHARE(RAM_TAG)
AM_RANGE(0x7f100000, 0x7f11ffff) AM_ROM AM_REGION(INTERPRO_EPROM_TAG, 0)
@@ -413,13 +413,13 @@ static ADDRESS_MAP_START(interpro_main_map, AS_0, 32, interpro_state)
AM_IMPORT_FROM(interpro_common_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(interpro_io_map, AS_1, 32, interpro_state)
+static ADDRESS_MAP_START(interpro_io_map, 1, 32, interpro_state)
AM_RANGE(0x00000000, 0x00001fff) AM_DEVICE(INTERPRO_MMU_TAG, cammu_device, map)
AM_IMPORT_FROM(interpro_common_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(interpro_boot_map, AS_2, 32, interpro_state)
+static ADDRESS_MAP_START(interpro_boot_map, 2, 32, interpro_state)
AM_RANGE(0x00000000, 0x00001fff) AM_RAM
ADDRESS_MAP_END
@@ -443,9 +443,9 @@ static MACHINE_CONFIG_START(ip2800)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, inta_cb)
MCFG_DEVICE_ADD(INTERPRO_MMU_TAG, CAMMU_C4T, 0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, interpro_main_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, interpro_io_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_2, interpro_boot_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, interpro_main_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, interpro_io_map)
+ MCFG_DEVICE_ADDRESS_MAP(2, interpro_boot_map)
MCFG_CAMMU_SSW_CB(DEVREAD32(INTERPRO_CPU_TAG, clipper_device, ssw))
MCFG_RAM_ADD(RAM_TAG)
@@ -537,7 +537,7 @@ static MACHINE_CONFIG_START(ip2800)
MCFG_INTERPRO_IOGA_DMA_CB(IOGA_DMA_FLOPPY, DEVREAD8(INTERPRO_FDC_TAG, n82077aa_device, mdma_r), DEVWRITE8(INTERPRO_FDC_TAG, n82077aa_device, mdma_w))
MCFG_INTERPRO_IOGA_DMA_CB(IOGA_DMA_SERIAL, DEVREAD8(INTERPRO_SCC1_TAG, z80scc_device, da_r), DEVWRITE8(INTERPRO_SCC1_TAG, z80scc_device, da_w))
MCFG_INTERPRO_IOGA_FDCTC_CB(DEVWRITELINE(INTERPRO_FDC_TAG, n82077aa_device, tc_line_w))
- MCFG_INTERPRO_IOGA_DMA_BUS(INTERPRO_CAMMU_TAG, AS_0)
+ MCFG_INTERPRO_IOGA_DMA_BUS(INTERPRO_CAMMU_TAG, 0)
// memory control gate array
MCFG_DEVICE_ADD(INTERPRO_MCGA_TAG, INTERPRO_FMCC, 0)
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 96e5171613e..47da5cd5807 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8, jailbrek_state )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vlm_map, AS_0, 8, jailbrek_state )
+static ADDRESS_MAP_START( vlm_map, 0, 8, jailbrek_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
@@ -288,7 +288,7 @@ static MACHINE_CONFIG_START( jailbrek )
MCFG_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index 26804b6c377..69ebe05cb9b 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -2359,12 +2359,12 @@ static const uint16_t shogwarr_default_eeprom[64] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0xFFFF
};
-static ADDRESS_MAP_START( shogwarr_oki1_map, AS_0, 8, kaneko16_shogwarr_state )
+static ADDRESS_MAP_START( shogwarr_oki1_map, 0, 8, kaneko16_shogwarr_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank10")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shogwarr_oki2_map, AS_0, 8, kaneko16_shogwarr_state )
+static ADDRESS_MAP_START( shogwarr_oki2_map, 0, 8, kaneko16_shogwarr_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
@@ -2420,11 +2420,11 @@ static MACHINE_CONFIG_START( shogwarr )
MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki1_map)
MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki2_map)
MACHINE_CONFIG_END
@@ -2439,14 +2439,14 @@ static const uint16_t brapboys_default_eeprom[64] = {
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0035, 0xFFFF, 0xFFFF, 0xFFFF
};
-static ADDRESS_MAP_START( brapboys_oki2_map, AS_0, 8, kaneko16_shogwarr_state )
+static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8, kaneko16_shogwarr_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( brapboys, shogwarr )
MCFG_SOUND_MODIFY("oki2")
- MCFG_DEVICE_ADDRESS_MAP(AS_0, brapboys_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
MCFG_DEVICE_MODIFY("kan_hit")
kaneko_hit_device::set_type(*device, 2);
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index 2dcd56578bd..9bbd465f80d 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( koftball_mem, AS_PROGRAM, 16, koftball_state )
AM_RANGE(0x360000, 0x360001) AM_WRITE(prot_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, koftball_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, koftball_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp
index 0a86d017155..529176b3b4e 100644
--- a/src/mame/drivers/lastfght.cpp
+++ b/src/mame/drivers/lastfght.cpp
@@ -435,7 +435,7 @@ static ADDRESS_MAP_START( lastfght_map, AS_PROGRAM, 16, lastfght_state )
AM_RANGE( 0xc00006, 0xc00007 ) AM_READWRITE(c00006_r, c00006_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, lastfght_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, lastfght_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index 15f60657248..7bb773e8380 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( aliencha_map, AS_PROGRAM, 16, lordgun_state )
AM_RANGE(0x50b900, 0x50b9ff) AM_READWRITE(aliencha_protection_r, aliencha_protection_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ymf278_map, AS_0, 8, lordgun_state)
+static ADDRESS_MAP_START( ymf278_map, 0, 8, lordgun_state)
AM_RANGE(0x000000, 0x1fffff) AM_ROM
ADDRESS_MAP_END
@@ -728,7 +728,7 @@ static MACHINE_CONFIG_START( aliencha )
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_SOUND_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, ymf278_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, ymf278_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index 0aeb8016876..f7adf5cd16a 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -398,7 +398,7 @@ WRITE8_MEMBER(lwings_state::fball_oki_bank_w)
membank("samplebank")->set_entry((data >> 1) & 0x7);
}
-static ADDRESS_MAP_START( fball_oki_map, AS_0, 8, lwings_state )
+static ADDRESS_MAP_START( fball_oki_map, 0, 8, lwings_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("samplebank")
ADDRESS_MAP_END
@@ -1009,7 +1009,7 @@ static MACHINE_CONFIG_START( fball )
MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, fball_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, fball_oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index 01a56c3287b..a3234b46931 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -978,7 +978,7 @@ INTERRUPT_GEN_MEMBER(magicard_state::magicard_irq)
device.execute().set_input_line_and_vector(1, HOLD_LINE, 0xf0 / 4);
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, magicard_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, magicard_state )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 989c9006bc3..8ca454abb69 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -866,7 +866,7 @@ void mediagx_state::machine_reset()
dmadac_enable(&m_dmadac[0], 2, 1);
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, mediagx_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, mediagx_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 452108eeafd..755edb6e705 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -413,7 +413,7 @@ static ADDRESS_MAP_START( megasys1D_map, AS_PROGRAM, 16, megasys1_state )
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM /*_WRITE(ram_w)*/ AM_SHARE("ram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megasys1D_oki_map, AS_0, 8, megasys1_state )
+static ADDRESS_MAP_START( megasys1D_oki_map, 0, 8, megasys1_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -1803,7 +1803,7 @@ static MACHINE_CONFIG_START( system_D )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki1", SYS_D_CPU_CLOCK/4, PIN7_HIGH) /* 2MHz (8MHz / 4) */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, megasys1D_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, megasys1D_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index 490fb592c44..fb9fe77f03e 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -712,7 +712,7 @@ ADDRESS_MAP_END
/*****************/
-static ADDRESS_MAP_START( ymf278_map, AS_0, 8, metro_state )
+static ADDRESS_MAP_START( ymf278_map, 0, 8, metro_state )
AM_RANGE(0x000000, 0x27ffff) AM_ROM
ADDRESS_MAP_END
@@ -1680,7 +1680,7 @@ static ADDRESS_MAP_START( mouja_map, AS_PROGRAM, 16, metro_state )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mouja_okimap, AS_0, 8, metro_state )
+static ADDRESS_MAP_START( mouja_okimap, 0, 8, metro_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -3689,7 +3689,7 @@ static MACHINE_CONFIG_START( msgogo )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, ymf278_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, ymf278_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4321,7 +4321,7 @@ static MACHINE_CONFIG_START( mouja )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", XTAL_16MHz/1024*132, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mouja_okimap)
+ MCFG_DEVICE_ADDRESS_MAP(0, mouja_okimap)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index e89923c6e79..0217f6ee6e8 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -393,7 +393,7 @@ READ8_MEMBER(mpu4vid_state::vram_r)
return m_vid_mainram[offset];
}
-static ADDRESS_MAP_START( mpu4_vram, AS_0, 8, mpu4vid_state )
+static ADDRESS_MAP_START( mpu4_vram, 0, 8, mpu4vid_state )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(vram_r, vram_w)
ADDRESS_MAP_END
@@ -1285,7 +1285,7 @@ static MACHINE_CONFIG_START( mpu4_vid )
MCFG_SCN2674_TEXT_CHARACTER_WIDTH(8)
MCFG_SCN2674_GFX_CHARACTER_WIDTH(8)
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(mpu4vid_state, display_pixels)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mpu4_vram)
+ MCFG_DEVICE_ADDRESS_MAP(0, mpu4_vram)
MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp
index 45a6f6f935f..4f9c087577b 100644
--- a/src/mame/drivers/mquake.cpp
+++ b/src/mame/drivers/mquake.cpp
@@ -79,7 +79,7 @@ READ8_MEMBER( mquake_state::es5503_sample_r )
return m_es5503_rom[offset + (m_es5503->get_channel_strobe() * 0x10000)];
}
-static ADDRESS_MAP_START( mquake_es5503_map, AS_0, 8, mquake_state )
+static ADDRESS_MAP_START( mquake_es5503_map, 0, 8, mquake_state )
AM_RANGE(0x000000, 0x1ffff) AM_READ(es5503_sample_r)
ADDRESS_MAP_END
@@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( mquake )
MCFG_ES5503_ADD("es5503", amiga_state::CLK_7M_NTSC) /* ES5503 is likely mono due to channel strobe used as bank select */
MCFG_ES5503_OUTPUT_CHANNELS(1)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mquake_es5503_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, mquake_es5503_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index fd00f0b88f4..0b53f5ddfe3 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -786,12 +786,12 @@ void mz3500_state::machine_reset()
}
-static ADDRESS_MAP_START( upd7220_1_map, AS_0, 16, mz3500_state )
+static ADDRESS_MAP_START( upd7220_1_map, 0, 16, mz3500_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x00000, 0x00fff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_2_map, AS_0, 16, mz3500_state )
+static ADDRESS_MAP_START( upd7220_2_map, 0, 16, mz3500_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM // AM_SHARE("video_ram_2")
ADDRESS_MAP_END
@@ -826,12 +826,12 @@ static MACHINE_CONFIG_START( mz3500 )
MCFG_FLOPPY_DRIVE_ADD("upd765a:3", mz3500_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, MAIN_CLOCK/5)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(mz3500_state, hgdc_draw_text)
MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_gfx", upd7220_device, ext_sync_w))
MCFG_DEVICE_ADD("upd7220_gfx", UPD7220, MAIN_CLOCK/5)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_2_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mz3500_state, hgdc_display_pixels)
/* video hardware */
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index 6c371c2ac59..bdbb53d0d33 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -132,7 +132,7 @@ static SLOT_INTERFACE_START( mz6500_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, mz6500_state )
+static ADDRESS_MAP_START( upd7220_map, 0, 16, mz6500_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
@@ -155,7 +155,7 @@ static MACHINE_CONFIG_START( mz6500 )
/* Devices */
MCFG_DEVICE_ADD("upd7220", UPD7220, 8000000/6) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mz6500_state, hgdc_display_pixels)
MCFG_UPD765A_ADD("upd765", true, true)
diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp
index f42a1533d7d..e7a9a45e350 100644
--- a/src/mame/drivers/nemesis.cpp
+++ b/src/mame/drivers/nemesis.cpp
@@ -436,7 +436,7 @@ static ADDRESS_MAP_START( gx400_sound_map, AS_PROGRAM, 8, nemesis_state )
ADDRESS_MAP_END
// gx400 voice data is not in a ROM but in sound RAM at $8000
-static ADDRESS_MAP_START( gx400_vlm_map, AS_0, 8, nemesis_state )
+static ADDRESS_MAP_START( gx400_vlm_map, 0, 8, nemesis_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x000, 0x7ff) AM_RAM AM_SHARE("voiceram")
ADDRESS_MAP_END
@@ -563,7 +563,7 @@ static ADDRESS_MAP_START( sal_sound_map, AS_PROGRAM, 8, nemesis_state )
AM_RANGE(0xf000, 0xf000) AM_WRITE(salamand_speech_start_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( salamand_vlm_map, AS_0, 8, nemesis_state )
+static ADDRESS_MAP_START( salamand_vlm_map, 0, 8, nemesis_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
@@ -1593,7 +1593,7 @@ static MACHINE_CONFIG_START( gx400 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, gx400_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -1710,7 +1710,7 @@ static MACHINE_CONFIG_START( rf2_gx400 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, gx400_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -1748,7 +1748,7 @@ static MACHINE_CONFIG_START( salamand )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, salamand_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, salamand_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.50)
@@ -1944,7 +1944,7 @@ static MACHINE_CONFIG_START( hcrash )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, salamand_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, salamand_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
@@ -2717,7 +2717,7 @@ static MACHINE_CONFIG_START( bubsys )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, gx400_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index ad72efa7257..9a49a280e73 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -960,12 +960,12 @@ static ADDRESS_MAP_START( ssmissin_sound_map, AS_PROGRAM, 8, nmk16_state )
AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki1_map, AS_0, 8, nmk16_state )
+static ADDRESS_MAP_START( oki1_map, 0, 8, nmk16_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki2_map, AS_0, 8, nmk16_state )
+static ADDRESS_MAP_START( oki2_map, 0, 8, nmk16_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank2")
ADDRESS_MAP_END
@@ -3907,11 +3907,11 @@ static MACHINE_CONFIG_START( tharrier )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -3947,11 +3947,11 @@ static MACHINE_CONFIG_START( mustang )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4028,11 +4028,11 @@ static MACHINE_CONFIG_START( bioship )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4068,11 +4068,11 @@ static MACHINE_CONFIG_START( vandyke )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4136,11 +4136,11 @@ static MACHINE_CONFIG_START( acrobatm )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4215,11 +4215,11 @@ static MACHINE_CONFIG_START( tdragon )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tdragon_prot, tdragon )
@@ -4253,7 +4253,7 @@ static MACHINE_CONFIG_START( ssmissin )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_OKIM6295_ADD("oki1", 8000000/8, PIN7_HIGH) /* 1 Mhz, pin 7 high */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4289,11 +4289,11 @@ static MACHINE_CONFIG_START( strahl )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4329,11 +4329,11 @@ static MACHINE_CONFIG_START( hachamf )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hachamf_prot, hachamf )
@@ -4373,11 +4373,11 @@ static MACHINE_CONFIG_START( macross )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4413,11 +4413,11 @@ static MACHINE_CONFIG_START( blkheart )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4452,11 +4452,11 @@ static MACHINE_CONFIG_START( gunnail )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4720,11 +4720,11 @@ static MACHINE_CONFIG_START( manybloc )
MCFG_SOUND_ROUTE(3, "mono", 1.20)
MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp
index 74f2ec1f5ad..4a7fe0f145d 100644
--- a/src/mame/drivers/octopus.cpp
+++ b/src/mame/drivers/octopus.cpp
@@ -326,7 +326,7 @@ static ADDRESS_MAP_START( octopus_sub_io, AS_IO, 8, octopus_state )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(z80_io_r, z80_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( octopus_vram, AS_0, 8, octopus_state )
+static ADDRESS_MAP_START( octopus_vram, 0, 8, octopus_state )
AM_RANGE(0x0000,0xffff) AM_READWRITE(vram_r, vram_w)
ADDRESS_MAP_END
@@ -989,7 +989,7 @@ static MACHINE_CONFIG_START( octopus )
MCFG_SCN2674_TEXT_CHARACTER_WIDTH(8)
MCFG_SCN2674_GFX_CHARACTER_WIDTH(8)
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(octopus_state, display_pixels)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, octopus_vram)
+ MCFG_DEVICE_ADDRESS_MAP(0, octopus_vram)
MCFG_DEVICE_ADD("z80_bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(octopus_mem)
diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp
index aef61a5398f..4f94eef6147 100644
--- a/src/mame/drivers/ohmygod.cpp
+++ b/src/mame/drivers/ohmygod.cpp
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( ohmygod_map, AS_PROGRAM, 16, ohmygod_state )
AM_RANGE(0xd00000, 0xd00001) AM_WRITE(ohmygod_spritebank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, ohmygod_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, ohmygod_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( ohmygod )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 14000000/8, PIN7_HIGH)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index 7d285d56619..29d8c152187 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( overdriv_sound_map, AS_PROGRAM, 8, overdriv_state )
AM_RANGE(0x1000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( overdriv_k053260_map, AS_0, 8, overdriv_state )
+static ADDRESS_MAP_START( overdriv_k053260_map, 0, 8, overdriv_state )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_REGION("k053260", 0)
ADDRESS_MAP_END
@@ -383,12 +383,12 @@ static MACHINE_CONFIG_START( overdriv )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MCFG_K053260_ADD("k053260_1", XTAL_3_579545MHz)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, overdriv_k053260_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, overdriv_k053260_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MCFG_K053260_ADD("k053260_2", XTAL_3_579545MHz)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, overdriv_k053260_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, overdriv_k053260_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index bba8da85dae..de598dfbdb0 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -2109,7 +2109,7 @@ WRITE16_MEMBER(pc9801_state::grcg_gvram0_w)
upd7220_grcg_w(space, offset | (m_vram_bank << 16), data, mem_mask);
}
-static ADDRESS_MAP_START( ipl_bank, AS_0, 16, pc9801_state )
+static ADDRESS_MAP_START( ipl_bank, 0, 16, pc9801_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM AM_REGION("ipl", 0)
ADDRESS_MAP_END
@@ -2534,15 +2534,15 @@ static ADDRESS_MAP_START( pc9821_io, AS_IO, 32, pc9801_state )
// AM_RANGE(0xfcd0, 0xfcd3) MIDI port, option F / <undefined>
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_1_map, AS_0, 16, pc9801_state )
+static ADDRESS_MAP_START( upd7220_1_map, 0, 16, pc9801_state )
AM_RANGE(0x00000, 0x03fff) AM_RAM AM_SHARE("video_ram_1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_2_map, AS_0, 16, pc9801_state )
+static ADDRESS_MAP_START( upd7220_2_map, 0, 16, pc9801_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram_2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_grcg_2_map, AS_0, 16, pc9801_state )
+static ADDRESS_MAP_START( upd7220_grcg_2_map, 0, 16, pc9801_state )
AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(upd7220_grcg_r, upd7220_grcg_w) AM_SHARE("video_ram_2")
ADDRESS_MAP_END
@@ -3353,12 +3353,12 @@ static MACHINE_CONFIG_START( pc9801_common )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 5000000/2)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text)
MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w))
MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 5000000/2)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_2_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(pc9801_state, hgdc_display_pixels)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3433,7 +3433,7 @@ static MACHINE_CONFIG_START( pc9801rs )
MCFG_RAM_EXTRA_OPTIONS("640K,3712K,7808K,14M")
MCFG_DEVICE_MODIFY("upd7220_btm")
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_grcg_2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_grcg_2_map)
MCFG_PALETTE_ADD("palette", 16+16)
MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801)
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index 09ea4794b1b..42bfd095cbf 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -388,7 +388,7 @@ static ADDRESS_MAP_START( tetriskr_io, AS_IO, 8, pcxt_state )
// AM_RANGE(0x03ce, 0x03ce) AM_READ_PORT("IN1") //read then discarded?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bank_map, AS_0, 8, pcxt_state )
+static ADDRESS_MAP_START( bank_map, 0, 8, pcxt_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROM AM_REGION("game_prg", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp
index c9457464af1..b9ecdf28513 100644
--- a/src/mame/drivers/pinball2k.cpp
+++ b/src/mame/drivers/pinball2k.cpp
@@ -587,7 +587,7 @@ void pinball2k_state::machine_reset()
m_maincpu->reset();
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, pinball2k_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, pinball2k_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index c50b0d06b04..ac875a38e91 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -111,7 +111,7 @@ protected:
virtual void device_validity_check(validity_checker &valid) const override;
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
address_space_config m_space_config;
};
@@ -145,9 +145,11 @@ void janshi_vdp_device::device_validity_check(validity_checker &valid) const {}
void janshi_vdp_device::device_start() {}
void janshi_vdp_device::device_reset() {}
-const address_space_config *janshi_vdp_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> janshi_vdp_device::memory_space_config() const
{
- return (spacenum == 0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
void pinkiri8_state::video_start() {}
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index fd0d4c4e7a5..ee70a17b2ef 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -408,7 +408,7 @@ static ADDRESS_MAP_START( luckboomh_main_map, AS_PROGRAM, 16, playmark_state )
AM_RANGE(0xff8000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, playmark_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, playmark_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -1246,7 +1246,7 @@ static MACHINE_CONFIG_START( bigtwin )
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bigtwinb )
@@ -1286,7 +1286,7 @@ static MACHINE_CONFIG_START( bigtwinb )
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wbeachvl )
@@ -1330,7 +1330,7 @@ static MACHINE_CONFIG_START( wbeachvl )
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( excelsr )
@@ -1370,7 +1370,7 @@ static MACHINE_CONFIG_START( excelsr )
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hrdtimes )
@@ -1411,7 +1411,7 @@ static MACHINE_CONFIG_START( hrdtimes )
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hotmind )
@@ -1457,7 +1457,7 @@ static MACHINE_CONFIG_START( hotmind )
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( luckboomh )
@@ -1502,7 +1502,7 @@ static MACHINE_CONFIG_START( luckboomh )
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 229139ef426..2b8977f3ee0 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -481,7 +481,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( ted_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( ted_videoram_map, AS_0, 8, plus4_state )
+static ADDRESS_MAP_START( ted_videoram_map, 0, 8, plus4_state )
AM_RANGE(0x0000, 0xffff) AM_READ(ted_videoram_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index 2cfbd3719f2..13e26741d35 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -790,7 +790,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( portfolio_lcdc )
//-------------------------------------------------
-static ADDRESS_MAP_START( portfolio_lcdc, AS_0, 8, portfolio_state )
+static ADDRESS_MAP_START( portfolio_lcdc, 0, 8, portfolio_state )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x07ff) AM_RAM
ADDRESS_MAP_END
@@ -1027,7 +1027,7 @@ static MACHINE_CONFIG_START( portfolio )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", portfolio)
MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL_4_9152MHz/2/2)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, portfolio_lcdc)
+ MCFG_DEVICE_ADDRESS_MAP(0, portfolio_lcdc)
MCFG_HD61830_RD_CALLBACK(READ8(portfolio_state, hd61830_rd_r))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 0734450b2f6..7e2ce89565e 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( pokechmp_sound_map, AS_PROGRAM, 8, pokechmp_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pokechmp_oki_map, AS_0, 8, pokechmp_state )
+static ADDRESS_MAP_START( pokechmp_oki_map, 0, 8, pokechmp_state )
AM_RANGE(0x00000, 0x37fff) AM_ROM
AM_RANGE(0x38000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( pokechmp )
MCFG_OKIM6295_ADD("oki", XTAL_24MHz/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, pokechmp_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, pokechmp_oki_map)
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(pokechmp_state,pokechmp)
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index 9e8dd59363c..6b1cdbd3496 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( powerbal_main_map, AS_PROGRAM, 16, powerbal_state )
AM_RANGE(0x103000, 0x103fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, powerbal_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, powerbal_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( powerbal )
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( magicstk )
@@ -557,7 +557,7 @@ static MACHINE_CONFIG_START( magicstk )
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp
index 364e4e8dc41..db8a051c7ce 100644
--- a/src/mame/drivers/powerins.cpp
+++ b/src/mame/drivers/powerins.cpp
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( powerinsb_sound_io_map, AS_IO, 8, powerins_state )
AM_RANGE(0x90, 0x97) AM_DEVWRITE("nmk112", nmk112_device, okibank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerinsa_oki_map, AS_0, 8, powerins_state )
+static ADDRESS_MAP_START( powerinsa_oki_map, 0, 8, powerins_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -356,7 +356,7 @@ static MACHINE_CONFIG_DERIVED( powerinsa, powerins )
MCFG_MACHINE_START_OVERRIDE(powerins_state, powerinsa)
MCFG_OKIM6295_REPLACE("oki1", 990000, PIN7_LOW) // pin7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, powerinsa_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, powerinsa_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_REMOVE("oki2")
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index 93d3be90ecf..711a71dab06 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -270,7 +270,7 @@ WRITE32_MEMBER(psikyo_state::s1945bl_oki_w)
printf("ACCESSING_BITS_0_7 ?? %08x %08x\n", data & 0x000000ff, mem_mask);
}
-static ADDRESS_MAP_START( s1945bl_oki_map, AS_0, 8, psikyo_state )
+static ADDRESS_MAP_START( s1945bl_oki_map, 0, 8, psikyo_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -1120,7 +1120,7 @@ static MACHINE_CONFIG_START( s1945bl ) /* Bootleg hardware based on the unprotec
MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_LOW) // ?? clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, s1945bl_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, s1945bl_oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index 6d5b2987b92..bc569aab382 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( ps4_map, AS_PROGRAM, 32, psikyo4_state )
AM_RANGE(0x06000000, 0x060fffff) AM_RAM AM_SHARE("ram") // main RAM (1 meg)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ps4_ymf_map, AS_0, 8, psikyo4_state )
+static ADDRESS_MAP_START( ps4_ymf_map, 0, 8, psikyo4_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROMBANK("ymfbank0")
AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("ymfbank1")
AM_RANGE(0x200000, 0x2fffff) AM_ROMBANK("ymfbank2")
@@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( ps4big )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, ps4_ymf_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, ps4_ymf_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 12))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index 5b39076649b..f5cbc2c2f0a 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -250,7 +250,7 @@ static ADDRESS_MAP_START(pt68k2_mem, AS_PROGRAM, 16, pt68k4_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x0fffff) AM_RAM AM_SHARE("rambase") // 1MB RAM
AM_RANGE(0xf80000, 0xf8ffff) AM_ROM AM_REGION("roms", 0)
- AM_RANGE(0xc00000, 0xdfffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, prog_r, prog_w, 0x00ff)
+ AM_RANGE(0xc00000, 0xdfffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, mem_r, mem_w, 0x00ff)
AM_RANGE(0xfa0000, 0xfbffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, io_r, io_w, 0x00ff)
AM_RANGE(0xfe0000, 0xfe001f) AM_DEVREADWRITE8(DUART1_TAG, mc68681_device, read, write, 0x00ff)
AM_RANGE(0xfe0040, 0xfe005f) AM_DEVREADWRITE8(DUART2_TAG, mc68681_device, read, write, 0x00ff)
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START(pt68k4_mem, AS_PROGRAM, 16, pt68k4_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x0fffff) AM_RAM AM_SHARE("rambase") // 1MB RAM (OS9 needs more)
AM_RANGE(0xf80000, 0xf8ffff) AM_ROM AM_REGION("roms", 0)
- AM_RANGE(0xc00000, 0xdfffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, prog_r, prog_w, 0x00ff)
+ AM_RANGE(0xc00000, 0xdfffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, mem_r, mem_w, 0x00ff)
AM_RANGE(0xfa0000, 0xfbffff) AM_DEVREADWRITE8(ISABUS_TAG, isa8_device, io_r, io_w, 0x00ff)
AM_RANGE(0xfe0000, 0xfe001f) AM_DEVREADWRITE8(DUART1_TAG, mc68681_device, read, write, 0x00ff)
AM_RANGE(0xfe0040, 0xfe005f) AM_DEVREADWRITE8(DUART2_TAG, mc68681_device, read, write, 0x00ff)
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index eab2aa94073..20844ddbc96 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( punchout_io_map, AS_IO, 8, punchout_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( punchout_vlm_map, AS_0, 8, punchout_state )
+static ADDRESS_MAP_START( punchout_vlm_map, 0, 8, punchout_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
@@ -682,7 +682,7 @@ static MACHINE_CONFIG_START( punchout )
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_SOUND_ADD("vlm", VLM5030, N2A03_NTSC_XTAL/6)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, punchout_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, punchout_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp
index f53f65d7f48..a7a5de8e793 100644
--- a/src/mame/drivers/pwrview.cpp
+++ b/src/mame/drivers/pwrview.cpp
@@ -288,7 +288,7 @@ READ8_MEMBER(pwrview_state::pitclock_r)
return 0;
}
-static ADDRESS_MAP_START(bios_bank, AS_0, 16, pwrview_state)
+static ADDRESS_MAP_START(bios_bank, 0, 16, pwrview_state)
AM_RANGE(0x00000, 0x07fff) AM_ROM AM_REGION("bios", 0)
AM_RANGE(0x00000, 0x07fff) AM_WRITE(nmimem_w)
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index 1d8db52b5ed..f2ae3dc94be 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -657,7 +657,7 @@ WRITE16_MEMBER( qx10_state::vram_w )
COMBINE_DATA(&m_video_ram[offset + (0x20000 * bank)]);
}
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, qx10_state )
+static ADDRESS_MAP_START( upd7220_map, 0, 16, qx10_state )
AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(vram_r,vram_w)
ADDRESS_MAP_END
@@ -740,7 +740,7 @@ static MACHINE_CONFIG_START( qx10 )
MCFG_DEVICE_ADD("i8255", I8255, 0)
MCFG_DEVICE_ADD("upd7220", UPD7220, MAIN_CLK/6) // unk clock
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(qx10_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(qx10_state, hgdc_draw_text)
MCFG_VIDEO_SET_SCREEN("screen")
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 6752f8bf864..c3e56e77371 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -760,7 +760,7 @@ MACHINE_RESET_MEMBER(r2dx_v33_state,nzeroteam)
mid_bank = 1;
}
-static ADDRESS_MAP_START( r2dx_oki_map, AS_0, 8, r2dx_v33_state )
+static ADDRESS_MAP_START( r2dx_oki_map, 0, 8, r2dx_v33_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -798,7 +798,7 @@ static MACHINE_CONFIG_START( rdx_v33 )
MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, r2dx_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, r2dx_oki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nzerotea )
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index c254ee9c636..8a25f97912a 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -3206,7 +3206,7 @@ GFXDECODE_ENTRY("chargen", 0x0000, rainbow_charlayout, 0, 1)
GFXDECODE_END
// Allocate 512 K (4 x 64 K x 16 bit) of memory (GDC-NEW):
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, rainbow_state)
+static ADDRESS_MAP_START( upd7220_map, 0, 16, rainbow_state)
AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(vram_r, vram_w) AM_SHARE("vram")
ADDRESS_MAP_END
@@ -3243,7 +3243,7 @@ MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(WRITELINE(rainbow_state, clear_vide
MCFG_DEVICE_ADD("upd7220", UPD7220, 31188000 / 32) // Duell schematics shows a 31.188 Mhz oscillator (confirmed by RFKA).
MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE(rainbow_state, GDC_vblank_irq)) // "The vsync callback line needs to be below the 7220 DEVICE_ADD line."
-MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(rainbow_state, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN("screen2") // SET_SCREEN needs to be added after 7720 device in the machine config, not after the screen.
MCFG_PALETTE_ADD("palette2", 32)
diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp
index ed1d2ac08e6..83d6e7c94cd 100644
--- a/src/mame/drivers/relief.cpp
+++ b/src/mame/drivers/relief.cpp
@@ -107,7 +107,7 @@ WRITE16_MEMBER(relief_state::audio_volume_w)
}
}
-static ADDRESS_MAP_START( oki_map, AS_0, 8, relief_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, relief_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("okibank")
AM_RANGE(0x20000, 0x3ffff) AM_ROM
ADDRESS_MAP_END
@@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( relief )
MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/3, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp
index 3b827083d00..c61dc3b73fb 100644
--- a/src/mame/drivers/rltennis.cpp
+++ b/src/mame/drivers/rltennis.cpp
@@ -179,7 +179,7 @@ void rltennis_state::machine_reset()
m_timer->adjust(attotime::from_hz(RLT_TIMER_FREQ));
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, rltennis_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, rltennis_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index b6cc2c9cef5..fd83e47ceeb 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START( rockrage_sound_map, AS_PROGRAM, 8, rockrage_state )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockrage_vlm_map, AS_0, 8, rockrage_state )
+static ADDRESS_MAP_START( rockrage_vlm_map, 0, 8, rockrage_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
@@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( rockrage )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, rockrage_vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, rockrage_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index d3e324bf5fe..55035533d26 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -396,12 +396,12 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, systeme_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vdp1_map, AS_0, 8, systeme_state )
+static ADDRESS_MAP_START( vdp1_map, 0, 8, systeme_state )
AM_RANGE( 0x0000, 0x3fff ) AM_RAMBANK("vdp1_bank")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vdp2_map, AS_0, 8, systeme_state )
+static ADDRESS_MAP_START( vdp2_map, 0, 8, systeme_state )
AM_RANGE( 0x0000, 0x3fff ) AM_RAMBANK("vdp2_bank")
ADDRESS_MAP_END
@@ -970,12 +970,12 @@ static MACHINE_CONFIG_START( systeme )
MCFG_DEVICE_ADD("vdp1", SEGA315_5124, 0)
MCFG_SEGA315_5124_IS_PAL(false)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vdp1_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vdp1_map)
MCFG_DEVICE_ADD("vdp2", SEGA315_5124, 0)
MCFG_SEGA315_5124_IS_PAL(false)
MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vdp2_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vdp2_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index f8c8f3b6a77..986c2fc6a99 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -201,7 +201,7 @@ static ADDRESS_MAP_START( segajw_audiocpu_io_map, AS_IO, 8, segajw_state )
AM_RANGE(0xc0, 0xc0) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_DEVWRITE("soundlatch2", generic_latch_8_device, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( segajw_hd63484_map, AS_0, 16, segajw_state )
+static ADDRESS_MAP_START( segajw_hd63484_map, 0, 16, segajw_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM
AM_RANGE(0x80000, 0xbffff) AM_ROM AM_REGION("gfx1", 0)
ADDRESS_MAP_END
@@ -352,7 +352,7 @@ void segajw_state::machine_reset()
m_coin_counter = 0xff;
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, segajw_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, segajw_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 62cb992d089..0ae11cd1b0e 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -1355,7 +1355,7 @@ void sfbonus_state::machine_reset()
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, sfbonus_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, sfbonus_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index 3ffa33b8033..23ea0e1507f 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
INPUT_PORTS_END
-static ADDRESS_MAP_START( hd63484_map, AS_0, 16, shanghai_state )
+static ADDRESS_MAP_START( hd63484_map, 0, 16, shanghai_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index 3add7883ff7..f3a3cf3c69d 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -373,7 +373,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( jwildb52_hd63484_map, AS_0, 16, sigmab52_state )
+static ADDRESS_MAP_START( jwildb52_hd63484_map, 0, 16, sigmab52_state )
AM_RANGE(0x00000, 0x1ffff) AM_RAM
AM_RANGE(0x20000, 0x3ffff) AM_ROM AM_REGION("gfx1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index fed2a739d71..560884f102e 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -536,12 +536,12 @@ static ADDRESS_MAP_START( bdream97_opcode_map, AS_OPCODES, 8, skylncr_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, skylncr_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, skylncr_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac2_map, AS_0, 8, skylncr_state )
+static ADDRESS_MAP_START( ramdac2_map, 0, 8, skylncr_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac2", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index 5cca3cf583c..73399954a25 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( soundmem_io, AS_IO, 8, sliver_state )
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE(oki_setbank )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, sliver_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, sliver_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( sliver )
PORT_DIPUNUSED_DIPLOC( 0x8000, 0x0000, "SW2:8" ) /* Listed as "UNUSED (MUST ON)" */
INPUT_PORTS_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, sliver_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, sliver_state )
AM_RANGE(0x000, 0x3ff) AM_RAM AM_SHARE("colorram")
ADDRESS_MAP_END
@@ -530,7 +530,7 @@ static MACHINE_CONFIG_START( sliver )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp
index 2de4f819986..218b3b62634 100644
--- a/src/mame/drivers/speedspn.cpp
+++ b/src/mame/drivers/speedspn.cpp
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, speedspn_state )
AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, speedspn_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, speedspn_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( speedspn )
MCFG_OKIM6295_ADD("oki", 1122000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
/*** ROM LOADING *************************************************************/
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index 86bdbfdc614..682981fd2b5 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -1054,7 +1054,7 @@ static ADDRESS_MAP_START( tisub_map, AS_PROGRAM, 8, subsino_state )
AM_RANGE( 0x15c00, 0x15dff ) AM_RAM_WRITE(subsino_reel3_ram_w) AM_SHARE("reel3_ram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, subsino_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, subsino_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 72710024f91..02ea918099b 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -946,7 +946,7 @@ static ADDRESS_MAP_START( bishjan_map, AS_PROGRAM, 16, subsino2_state )
AM_RANGE( 0xc00008, 0xc00009 ) AM_READ_PORT("RESET") AM_WRITE(bishjan_outputs_w ) AM_SHARE("outputs16")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, subsino2_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, subsino2_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index 1a762169f40..a595d213563 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, supduck_state )
AM_RANGE(0xa000, 0xa000) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, supduck_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, supduck_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -469,7 +469,7 @@ static MACHINE_CONFIG_START( supduck )
MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, PIN7_HIGH) // 1MHz - Verified on PCB, pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 5c7f914b8dc..61320395e2d 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -1365,7 +1365,7 @@ static ADDRESS_MAP_START(sys18bl_sound_map, AS_PROGRAM, 8, segas1x_bootleg_state
AM_RANGE(0x8000, 0x87ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sys18bl_oki_map, AS_0, 8, segas1x_bootleg_state )
+static ADDRESS_MAP_START( sys18bl_oki_map, 0, 8, segas1x_bootleg_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -2508,7 +2508,7 @@ static MACHINE_CONFIG_START( astormb2 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, PIN7_HIGH) // 1MHz clock and pin verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, sys18bl_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, sys18bl_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp
index a90c13f3945..ee3cbf8ced3 100644
--- a/src/mame/drivers/taito_b.cpp
+++ b/src/mame/drivers/taito_b.cpp
@@ -686,7 +686,7 @@ static ADDRESS_MAP_START( realpunc_map, AS_PROGRAM, 16, taitob_state )
AM_RANGE(0x320002, 0x320003) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_comm_w, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( realpunc_hd63484_map, AS_0, 16, taitob_state )
+static ADDRESS_MAP_START( realpunc_hd63484_map, 0, 16, taitob_state )
AM_RANGE(0x00000, 0x7ffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 0cb7ebc127a..77fb2d00076 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -553,7 +553,7 @@ static ADDRESS_MAP_START(tandy1000_bank_map, AS_PROGRAM, 16, tandy1000_state )
AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION( "rom", 0x70000 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START(biosbank_map, AS_0, 16, tandy1000_state)
+static ADDRESS_MAP_START(biosbank_map, 0, 16, tandy1000_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x80000, 0xfffff) AM_ROM AM_REGION("rom", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index 486be20b896..2e51022b2a3 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( tandy2k_hd_io, AS_IO, 16, tandy2k_state )
// AM_RANGE(0x0026e, 0x0027f) AM_DEVREADWRITE8(WD1010_TAG, wd1010_device, wd1010_r, wd1010_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vpac_mem, AS_0, 8, tandy2k_state )
+static ADDRESS_MAP_START( vpac_mem, 0, 8, tandy2k_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(videoram_r)
ADDRESS_MAP_END
@@ -783,7 +783,7 @@ static MACHINE_CONFIG_START( tandy2k )
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL_16MHz*28/20/8)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vpac_mem)
+ MCFG_DEVICE_ADDRESS_MAP(0, vpac_mem)
MCFG_CRT9007_CHARACTER_WIDTH(8)
MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
MCFG_CRT9007_VS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_device, vsync_w))
diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp
index 85b0289eeaf..ecbf747fa57 100644
--- a/src/mame/drivers/targeth.cpp
+++ b/src/mame/drivers/targeth.cpp
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, targeth_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, targeth_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, targeth_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -205,7 +205,7 @@ static MACHINE_CONFIG_START( targeth )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index 2bafc649745..57b8795c23f 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -84,7 +84,7 @@ static ADDRESS_MAP_START( thoop2_map, AS_PROGRAM, 16, thoop2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, thoop2_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, thoop2_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -228,7 +228,7 @@ static MACHINE_CONFIG_START( thoop2 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index 73dc9f65c45..9fae264d158 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -1525,12 +1525,12 @@ static ADDRESS_MAP_START( vfive_v25_mem, AS_PROGRAM, 8, toaplan2_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeightbl_oki, AS_0, 8, toaplan2_state )
+static ADDRESS_MAP_START( fixeightbl_oki, 0, 8, toaplan2_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( enmadaio_oki, AS_0, 8, toaplan2_state )
+static ADDRESS_MAP_START( enmadaio_oki, 0, 8, toaplan2_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -3801,7 +3801,7 @@ static MACHINE_CONFIG_START( fixeightbl )
MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, fixeightbl_oki)
+ MCFG_DEVICE_ADDRESS_MAP(0, fixeightbl_oki)
MACHINE_CONFIG_END
@@ -3989,7 +3989,7 @@ static MACHINE_CONFIG_START( enmadaio )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW) // pin7 not confirmed
- MCFG_DEVICE_ADDRESS_MAP(AS_0, enmadaio_oki)
+ MCFG_DEVICE_ADDRESS_MAP(0, enmadaio_oki)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index 4edd4b221a9..d50841e01a3 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -432,7 +432,7 @@ static ADDRESS_MAP_START( hyprolyb_sound_map, AS_PROGRAM, 8, trackfld_state )
AM_RANGE(0xe004, 0xe004) AM_MIRROR(0x1ff8) AM_DEVWRITE("hyprolyb_adpcm", hyprolyb_adpcm_device, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vlm_map, AS_0, 8, trackfld_state )
+static ADDRESS_MAP_START( vlm_map, 0, 8, trackfld_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
@@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( trackfld )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1005,7 +1005,7 @@ static MACHINE_CONFIG_START( yieartf )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index f085dcdd5c2..661e4754ba9 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -101,7 +101,7 @@ static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32, turrett_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( turrett_sound_map, AS_0, 16, turrett_state )
+static ADDRESS_MAP_START( turrett_sound_map, 0, 16, turrett_state )
AM_RANGE(0x0000000, 0x7ffffff) AM_RAM AM_SHARE("bank_a")
AM_RANGE(0x8000000, 0xfffffff) AM_RAM AM_SHARE("bank_b")
ADDRESS_MAP_END
@@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( turrett )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_DEVICE_ADD("ttsound", TURRETT, R3041_CLOCK) // ?
- MCFG_DEVICE_ADDRESS_MAP(AS_0, turrett_sound_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, turrett_sound_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index a5be8a0b686..2f8dc45249f 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -422,7 +422,7 @@ static ADDRESS_MAP_START( twinsa_io, AS_IO, 16, twins_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, twins_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, twins_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index ae2bf5ae34e..d035189528b 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -34,7 +34,7 @@
#include <zlib.h>
-#define AS_IO16 AS_1
+#define AS_IO16 1
#define MCFG_CPU_IO16_MAP MCFG_CPU_DATA_MAP
class vgmplay_device : public cpu_device
@@ -84,7 +84,7 @@ public:
virtual void execute_run() override;
virtual void execute_set_input(int inputnum, int state) override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
virtual void state_import(const device_state_entry &entry) override;
virtual void state_export(const device_state_entry &entry) override;
@@ -559,14 +559,13 @@ void vgmplay_device::execute_set_input(int inputnum, int state)
{
}
-const address_space_config *vgmplay_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> vgmplay_device::memory_space_config() const
{
- switch(spacenum) {
- case AS_PROGRAM: return &m_file_config;
- case AS_IO: return &m_io_config;
- case AS_IO16: return &m_io16_config;
- default: return nullptr;
- }
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_file_config),
+ std::make_pair(AS_IO, &m_io_config),
+ std::make_pair(AS_IO16, &m_io16_config)
+ };
}
void vgmplay_device::state_import(const device_state_entry &entry)
@@ -1292,27 +1291,27 @@ static ADDRESS_MAP_START( soundchips_map, AS_IO, 8, vgmplay_state )
AM_RANGE(vgmplay_device::A_YMZ280B, vgmplay_device::A_YMZ280B+0x1) AM_DEVWRITE ("ymz280b", ymz280b_device, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( segapcm_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( segapcm_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, segapcm_rom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multipcma_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( multipcma_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0x3fffff) AM_DEVREAD("vgmplay", vgmplay_device, multipcma_rom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multipcmb_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( multipcmb_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0x3fffff) AM_DEVREAD("vgmplay", vgmplay_device, multipcmb_rom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( k053260_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( k053260_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0x1fffff) AM_DEVREAD("vgmplay", vgmplay_device, k053260_rom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( okim6295_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( okim6295_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0x3ffff) AM_DEVREAD("vgmplay", vgmplay_device, okim6295_rom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( c352_map, AS_0, 8, vgmplay_state )
+static ADDRESS_MAP_START( c352_map, 0, 8, vgmplay_state )
AM_RANGE(0, 0xffffff) AM_DEVREAD("vgmplay", vgmplay_device, c352_rom_r)
ADDRESS_MAP_END
@@ -1356,17 +1355,17 @@ static MACHINE_CONFIG_START( vgmplay )
MCFG_SOUND_ADD("segapcm", SEGAPCM, 4000000)
MCFG_SEGAPCM_BANK(BANK_512) // Should be configurable for yboard...
- MCFG_DEVICE_ADDRESS_MAP(AS_0, segapcm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, segapcm_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
MCFG_SOUND_ADD("multipcma", MULTIPCM, 8000000)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, multipcma_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, multipcma_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
MCFG_SOUND_ADD("multipcmb", MULTIPCM, 8000000)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, multipcmb_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, multipcmb_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
@@ -1418,7 +1417,7 @@ static MACHINE_CONFIG_START( vgmplay )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
MCFG_K053260_ADD("k053260", 3579545)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, k053260_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, k053260_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
@@ -1431,12 +1430,12 @@ static MACHINE_CONFIG_START( vgmplay )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
MCFG_C352_ADD("c352", 1000000, 288)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, c352_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, c352_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
MCFG_OKIM6295_ADD("okim6295", 1000000, PIN7_HIGH)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, okim6295_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, okim6295_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index a51946e10a7..f7ca50279dd 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -250,7 +250,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, vic10_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, vic10_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
@@ -259,7 +259,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_colorram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, vic10_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, vic10_state )
AM_RANGE(0x000, 0x3ff) AM_READ(vic_colorram_r)
ADDRESS_MAP_END
@@ -702,8 +702,8 @@ static MACHINE_CONFIG_START( vic10 )
MCFG_MOS6566_CPU(M6510_TAG)
MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(vic10_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vic_videoram_map)
- MCFG_DEVICE_ADDRESS_MAP(AS_1, vic_colorram_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
+ MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(VIC6566_VRETRACERATE)
MCFG_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES)
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 024015cdf9e..a1c2d06ead2 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -362,7 +362,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_videoram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_videoram_map, AS_0, 8, vic20_state )
+static ADDRESS_MAP_START( vic_videoram_map, 0, 8, vic20_state )
AM_RANGE(0x0000, 0x3fff) AM_READ(vic_videoram_r)
ADDRESS_MAP_END
@@ -371,7 +371,7 @@ ADDRESS_MAP_END
// ADDRESS_MAP( vic_colorram_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( vic_colorram_map, AS_1, 8, vic20_state )
+static ADDRESS_MAP_START( vic_colorram_map, 1, 8, vic20_state )
AM_RANGE(0x000, 0x3ff) AM_RAM AM_SHARE("color_ram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index 0ecce7b128f..d824d23102b 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -596,7 +596,7 @@ static ADDRESS_MAP_START(vt240_char_io, AS_IO, 8, vt240_state)
AM_RANGE(0xf0, 0xf0) AM_WRITE(lbscrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( upd7220_map, AS_0, 16, vt240_state)
+static ADDRESS_MAP_START( upd7220_map, 0, 16, vt240_state)
AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(vram_r, vram_w) AM_SHARE("vram")
ADDRESS_MAP_END
@@ -666,7 +666,7 @@ static MACHINE_CONFIG_START( vt240 )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", vt240)
MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4MHz / 4)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(vt240_state, hgdc_draw)
MCFG_UPD7220_VSYNC_CALLBACK(INPUTLINE("charcpu", I8085_RST75_LINE))
MCFG_UPD7220_BLANK_CALLBACK(INPUTLINE("charcpu", I8085_RST55_LINE))
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index 51ca566c038..7313d113fce 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -338,7 +338,7 @@ static ADDRESS_MAP_START( tabpkr_map, AS_PROGRAM, 16, wildpkr_state )
AM_RANGE(0x70000a, 0x70000b) AM_WRITENOP // only writes 0 at POST
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hd63484_map, AS_0, 16, wildpkr_state )
+static ADDRESS_MAP_START( hd63484_map, 0, 16, wildpkr_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM
ADDRESS_MAP_END
@@ -430,7 +430,7 @@ void wildpkr_state::machine_start()
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, wildpkr_state )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, wildpkr_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp
index 93691026d7b..a7796a7362b 100644
--- a/src/mame/drivers/wrally.cpp
+++ b/src/mame/drivers/wrally.cpp
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( dallas_ram, AS_IO, 8, wrally_state )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dallas_share_r, dallas_share_w) AM_MASK(0x3fff) /* Shared RAM with the main CPU */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, wrally_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, wrally_state )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -284,7 +284,7 @@ static MACHINE_CONFIG_START( wrally )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index bdd7f3053b0..b6c36d83338 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, yiear_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vlm_map, AS_0, 8, yiear_state )
+static ADDRESS_MAP_START( vlm_map, 0, 8, yiear_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
@@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( yiear )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
- MCFG_DEVICE_ADDRESS_MAP(AS_0, vlm_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp
index cd605dcf3dd..35d09e67ab0 100644
--- a/src/mame/drivers/yunsun16.cpp
+++ b/src/mame/drivers/yunsun16.cpp
@@ -177,7 +177,7 @@ static ADDRESS_MAP_START( sound_port_map, AS_IO, 8, yunsun16_state )
AM_RANGE(0x1c, 0x1c) AM_DEVREADWRITE("oki", okim6295_device, read, write) // M6295
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki_map, AS_0, 8, yunsun16_state )
+static ADDRESS_MAP_START( oki_map, 0, 8, yunsun16_state )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
@@ -655,7 +655,7 @@ static MACHINE_CONFIG_START( shocking )
MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MACHINE_CONFIG_END
diff --git a/src/mame/etc/template_cpu.h b/src/mame/etc/template_cpu.h
index 97467026087..300d18b0464 100644
--- a/src/mame/etc/template_cpu.h
+++ b/src/mame/etc/template_cpu.h
@@ -39,7 +39,7 @@ protected:
virtual void execute_set_input(int inputnum, int state) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : (spacenum == AS_DATA) ? &m_data_config : nullptr; }
+ virtual const address_space_config *memory_space_config(int spacenum) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : (spacenum == AS_DATA) ? &m_data_config : nullptr; }
// device_state_interface overrides
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h
index fc9f74e4c2a..c9b21f2115d 100644
--- a/src/mame/includes/turrett.h
+++ b/src/mame/includes/turrett.h
@@ -113,7 +113,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
const address_space_config m_space_config;
diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h
index 9284ae6da08..52418221ed6 100644
--- a/src/mame/machine/6883sam.h
+++ b/src/mame/machine/6883sam.h
@@ -90,7 +90,7 @@ public:
template <class Object> static devcb_base &set_res_rd_callback(device_t &device, Object &&cb) { return downcast<sam6883_device &>(device).m_read_res.set_callback(std::forward<Object>(cb)); }
- static void configure_cpu(device_t &device, const char *tag, address_spacenum space)
+ static void configure_cpu(device_t &device, const char *tag, int space)
{
sam6883_device &dev = downcast<sam6883_device &>(device);
dev.m_cpu_tag = tag;
@@ -169,7 +169,7 @@ private:
};
const char * m_cpu_tag;
- address_spacenum m_cpu_space_ref;
+ int m_cpu_space_ref;
// incidentals
address_space * m_cpu_space;
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index c30fafe2b36..32bb4d41005 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -159,9 +159,11 @@ void abc1600_mac_device::device_reset()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *abc1600_mac_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> abc1600_mac_device::memory_space_config() const
{
- return (spacenum == AS_PROGRAM) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_space_config)
+ };
}
diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h
index 650545008a2..f57e5233157 100644
--- a/src/mame/machine/abc1600mac.h
+++ b/src/mame/machine/abc1600mac.h
@@ -78,7 +78,7 @@ protected:
virtual void device_reset() override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_PROGRAM) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
// optional information overrides
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp
index 78e6f18ebfc..44c9607f258 100644
--- a/src/mame/machine/c117.cpp
+++ b/src/mame/machine/c117.cpp
@@ -44,6 +44,13 @@ namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *
{
}
+std::vector<std::pair<int, const address_space_config *>> namco_c117_device::memory_space_config() const
+{
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_program_config)
+ };
+}
+
//-------------------------------------------------
// set_cpu_tags - set the tags of the two CPUs
// connected to the device
diff --git a/src/mame/machine/c117.h b/src/mame/machine/c117.h
index 4a1542252e0..14a0867920a 100644
--- a/src/mame/machine/c117.h
+++ b/src/mame/machine/c117.h
@@ -53,7 +53,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; }
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
// internal helpers
diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp
index 9a4aa546340..ba6f0fb8872 100644
--- a/src/mame/machine/cammu.cpp
+++ b/src/mame/machine/cammu.cpp
@@ -140,26 +140,22 @@ void cammu_device::device_start()
{
m_ssw_func.resolve();
- m_main_space = &space(AS_0);
- m_io_space = &space(AS_1);
- m_boot_space = &space(AS_2);
+ m_main_space = &space(0);
+ m_io_space = &space(1);
+ m_boot_space = &space(2);
}
void cammu_device::device_reset()
{
}
-const address_space_config *cammu_device::memory_space_config (address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> cammu_device::memory_space_config() const
{
- switch (spacenum)
- {
- case AS_0: return &m_main_space_config;
- case AS_1: return &m_io_space_config;
- case AS_2: return &m_boot_space_config;
- default: break;
- }
-
- return nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_main_space_config),
+ std::make_pair(1, &m_io_space_config),
+ std::make_pair(2, &m_boot_space_config)
+ };
}
READ32_MEMBER(cammu_device::insn_r)
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h
index cdeb036f49c..718df13e13c 100644
--- a/src/mame/machine/cammu.h
+++ b/src/mame/machine/cammu.h
@@ -29,7 +29,7 @@ protected:
virtual void device_reset() override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config (address_spacenum spacenum) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
virtual u32 get_pte(u32 va, int user, bool data) = 0;
diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp
index 8241ed6cc3c..7abc1647df6 100644
--- a/src/mame/machine/coco.cpp
+++ b/src/mame/machine/coco.cpp
@@ -307,7 +307,7 @@ uint8_t coco_state::floating_space_read(offs_t offset)
//
// Most of the time, the read below will result in floating_bus_read() being
// invoked
- return m_floating->read8(m_floating->space(address_spacenum::AS_0), offset);
+ return m_floating->read8(m_floating->space(0), offset);
}
@@ -317,7 +317,7 @@ uint8_t coco_state::floating_space_read(offs_t offset)
void coco_state::floating_space_write(offs_t offset, uint8_t data)
{
- m_floating->write8(m_floating->space(address_spacenum::AS_0), offset, data);
+ m_floating->write8(m_floating->space(0), offset, data);
}
@@ -1240,7 +1240,7 @@ void coco_state::cart_w(bool state)
address_space &coco_state::cartridge_space()
{
- return m_floating->space(address_spacenum::AS_0);
+ return m_floating->space(0);
}
diff --git a/src/mame/machine/fd1089.cpp b/src/mame/machine/fd1089.cpp
index c9bb76ffcfe..e364581916c 100644
--- a/src/mame/machine/fd1089.cpp
+++ b/src/mame/machine/fd1089.cpp
@@ -228,7 +228,7 @@ fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_typ
m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes")
{
// add the decrypted opcodes map
- m_address_map[AS_OPCODES] = ADDRESS_MAP_NAME(decrypted_opcodes_map);
+ set_addrmap(AS_OPCODES, ADDRESS_MAP_NAME(decrypted_opcodes_map));
}
fd1089a_device::fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp
index 60ae45e8ad8..1ed764cfa58 100644
--- a/src/mame/machine/inder_vid.cpp
+++ b/src/mame/machine/inder_vid.cpp
@@ -81,7 +81,7 @@ WRITE_LINE_MEMBER(inder_vid_device::m68k_gen_int)
}
-static ADDRESS_MAP_START( ramdac_map, AS_0, 8, inder_vid_device )
+static ADDRESS_MAP_START( ramdac_map, 0, 8, inder_vid_device )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w)
ADDRESS_MAP_END
diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp
index 49d7ccd0a7f..236b64b0d7b 100644
--- a/src/mame/machine/interpro_ioga.cpp
+++ b/src/mame/machine/interpro_ioga.cpp
@@ -116,7 +116,7 @@ void interpro_ioga_device::device_start()
// grab the main memory space from the mmu so we can do DMA to/from it
device_memory_interface *mmu;
siblingdevice("mmu")->interface(mmu);
- m_memory_space = &mmu->space(AS_0);
+ m_memory_space = &mmu->space(0);
for (int i = 0; i < IOGA_DMA_CHANNELS; i++)
{
diff --git a/src/mame/machine/namco_c139.cpp b/src/mame/machine/namco_c139.cpp
index ac8b9216a28..aa0235012bc 100644
--- a/src/mame/machine/namco_c139.cpp
+++ b/src/mame/machine/namco_c139.cpp
@@ -78,9 +78,11 @@ void namco_c139_device::device_reset()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *namco_c139_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> namco_c139_device::memory_space_config() const
{
- return (spacenum == AS_DATA) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_DATA, &m_space_config)
+ };
}
//**************************************************************************
diff --git a/src/mame/machine/namco_c139.h b/src/mame/machine/namco_c139.h
index 7eb5f117978..17881be76b1 100644
--- a/src/mame/machine/namco_c139.h
+++ b/src/mame/machine/namco_c139.h
@@ -46,7 +46,7 @@ protected:
// virtual void device_validity_check(validity_checker &valid) const;
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_DATA) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
const address_space_config m_space_config;
uint16_t* m_ram;
diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp
index e46479cd43b..b12b3f7d8c0 100644
--- a/src/mame/machine/prof80mmu.cpp
+++ b/src/mame/machine/prof80mmu.cpp
@@ -60,12 +60,13 @@ void prof80_mmu_device::device_start()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *prof80_mmu_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> prof80_mmu_device::memory_space_config() const
{
- return (spacenum == AS_PROGRAM) ? &m_program_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_program_space_config)
+ };
}
-
//-------------------------------------------------
// par_w -
//-------------------------------------------------
diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h
index 0df2a19d553..a14f61a10a5 100644
--- a/src/mame/machine/prof80mmu.h
+++ b/src/mame/machine/prof80mmu.h
@@ -45,7 +45,7 @@ protected:
virtual void device_start() override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
DECLARE_READ8_MEMBER( program_r );
DECLARE_WRITE8_MEMBER( program_w );
diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicop.cpp
index 55dcd642f74..26a01de3726 100644
--- a/src/mame/machine/seicop.cpp
+++ b/src/mame/machine/seicop.cpp
@@ -233,7 +233,7 @@ WRITE16_MEMBER(seibu_cop_bootleg_device::d104_move_w)
}
// anything that is read thru ROM range 0xc**** is replacement code, therefore on this HW they are latches.
-static ADDRESS_MAP_START( seibucopbl_map, AS_0, 16, seibu_cop_bootleg_device )
+static ADDRESS_MAP_START( seibucopbl_map, 0, 16, seibu_cop_bootleg_device )
AM_RANGE(0x01e, 0x01f) AM_RAM // angle step, PC=0xc0186
AM_RANGE(0x046, 0x049) AM_READWRITE(d104_move_r,d104_move_w)
AM_RANGE(0x070, 0x07f) AM_RAM // DMA registers, PC=0xc0034
@@ -254,9 +254,11 @@ seibu_cop_bootleg_device::seibu_cop_bootleg_device(const machine_config &mconfig
-const address_space_config *seibu_cop_bootleg_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> seibu_cop_bootleg_device::memory_space_config() const
{
- return (spacenum == AS_0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
//-------------------------------------------------
diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicop.h
index 1c25a77e629..e6ccaa94c6b 100644
--- a/src/mame/machine/seicop.h
+++ b/src/mame/machine/seicop.h
@@ -32,7 +32,7 @@ protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
cpu_device *m_host_cpu; /**< reference to the host cpu */
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp
index f59b351cd5e..0d20a5112af 100644
--- a/src/mame/machine/st0016.cpp
+++ b/src/mame/machine/st0016.cpp
@@ -49,6 +49,15 @@ st0016_cpu_device::st0016_cpu_device(const machine_config &mconfig, const char *
}
+std::vector<std::pair<int, const address_space_config *>> st0016_cpu_device::memory_space_config() const
+{
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(AS_PROGRAM, &m_space_config),
+ std::make_pair(AS_IO, &m_io_space_config)
+ };
+}
+
+
//-------------------------------------------------
diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h
index 69959335c87..3b177e5cfd8 100644
--- a/src/mame/machine/st0016.h
+++ b/src/mame/machine/st0016.h
@@ -91,15 +91,8 @@ protected:
const address_space_config m_space_config;
- const address_space_config *memory_space_config(address_spacenum spacenum) const override
- {
- switch (spacenum)
- {
- case AS_IO: return &m_io_space_config;
- case AS_PROGRAM: return &m_space_config;
- default: return z80_device::memory_space_config(spacenum);
- }
- };
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+
required_device<screen_device> m_screen;
private:
diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp
index 2a0d695681e..181a2d2bd2d 100644
--- a/src/mame/video/abc1600.cpp
+++ b/src/mame/video/abc1600.cpp
@@ -86,7 +86,7 @@ DEVICE_ADDRESS_MAP_START( iowr2_map, 8, abc1600_mover_device )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mover_map, AS_0, 16, abc1600_mover_device )
+static ADDRESS_MAP_START( mover_map, 0, 16, abc1600_mover_device )
AM_RANGE(0x00000, 0x3ffff) AM_RAM
ADDRESS_MAP_END
@@ -280,9 +280,11 @@ void abc1600_mover_device::device_reset()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *abc1600_mover_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> abc1600_mover_device::memory_space_config() const
{
- return (spacenum == AS_0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/video/abc1600.h b/src/mame/video/abc1600.h
index 1936e4e26fb..e2b59049523 100644
--- a/src/mame/video/abc1600.h
+++ b/src/mame/video/abc1600.h
@@ -54,7 +54,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
inline uint16_t get_drmsk();
diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp
index b2c72aacc8b..5e06cfa802d 100644
--- a/src/mame/video/c45.cpp
+++ b/src/mame/video/c45.cpp
@@ -245,9 +245,11 @@ void namco_c45_road_device::device_start()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *namco_c45_road_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> namco_c45_road_device::memory_space_config() const
{
- return (spacenum == AS_0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h
index bc9172d1b5e..7559a90ecf3 100644
--- a/src/mame/video/c45.h
+++ b/src/mame/video/c45.h
@@ -40,7 +40,7 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
// constants
diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp
index 1bf1203bcbc..e06d7221999 100644
--- a/src/mame/video/cidelsa.cpp
+++ b/src/mame/video/cidelsa.cpp
@@ -102,12 +102,12 @@ WRITE_LINE_MEMBER( cidelsa_state::prd_w )
/* Page RAM */
-static ADDRESS_MAP_START( cidelsa_page_ram, AS_0, 8, cidelsa_state )
+static ADDRESS_MAP_START( cidelsa_page_ram, 0, 8, cidelsa_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( draco_page_ram, AS_0, 8, draco_state )
+static ADDRESS_MAP_START( draco_page_ram, 0, 8, draco_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp
index 68b2c662b78..be553a3f401 100644
--- a/src/mame/video/comx35.cpp
+++ b/src/mame/video/comx35.cpp
@@ -41,7 +41,7 @@ WRITE8_MEMBER( comx35_state::cdp1869_w )
/* CDP1869 */
-static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, comx35_state )
+static ADDRESS_MAP_START( cdp1869_page_ram, 0, 8, comx35_state )
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp
index a8ccd177b02..fe9ff86ddd4 100644
--- a/src/mame/video/gp9001.cpp
+++ b/src/mame/video/gp9001.cpp
@@ -228,9 +228,11 @@ gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, const char *ta
{
}
-const address_space_config *gp9001vdp_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> gp9001vdp_device::memory_space_config() const
{
- return (spacenum == 0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
TILE_GET_INFO_MEMBER(gp9001vdp_device::get_top0_tile_info)
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index e5b053100e6..97e2cb1bd4e 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -76,7 +76,7 @@ protected:
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
address_space_config m_space_config;
diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp
index a37b23c5d30..3015eca1cd0 100644
--- a/src/mame/video/igs017_igs031.cpp
+++ b/src/mame/video/igs017_igs031.cpp
@@ -92,9 +92,11 @@ igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, const
m_revbits = 0;
}
-const address_space_config *igs017_igs031_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> igs017_igs031_device::memory_space_config() const
{
- return (spacenum == 0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
uint16_t igs017_igs031_device::palette_callback_straight(uint16_t bgr)
diff --git a/src/mame/video/igs017_igs031.h b/src/mame/video/igs017_igs031.h
index 6285b7391d1..1812e819197 100644
--- a/src/mame/video/igs017_igs031.h
+++ b/src/mame/video/igs017_igs031.h
@@ -73,7 +73,7 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
DECLARE_GFXDECODE_MEMBER(gfxinfo);
diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp
index 1c5448d41d4..a29e8de1eea 100644
--- a/src/mame/video/kyocera.cpp
+++ b/src/mame/video/kyocera.cpp
@@ -42,7 +42,7 @@ uint32_t tandy200_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-static ADDRESS_MAP_START( tandy200_lcdc, AS_0, 8, tandy200_state )
+static ADDRESS_MAP_START( tandy200_lcdc, 0, 8, tandy200_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x1fff) AM_RAM
ADDRESS_MAP_END
@@ -89,6 +89,6 @@ MACHINE_CONFIG_START( tandy200_video )
MCFG_PALETTE_INIT_OWNER(tandy200_state,tandy200)
MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL_4_9152MHz/2/2)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, tandy200_lcdc)
+ MCFG_DEVICE_ADDRESS_MAP(0, tandy200_lcdc)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MACHINE_CONFIG_END
diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp
index f70ed61b135..e41c8d62537 100644
--- a/src/mame/video/mikromik.cpp
+++ b/src/mame/video/mikromik.cpp
@@ -59,7 +59,7 @@ I8275_DRAW_CHARACTER_MEMBER( mm1_state::crtc_display_pixels )
// ADDRESS_MAP( mm1_upd7220_map )
//-------------------------------------------------
-static ADDRESS_MAP_START( mm1_upd7220_map, AS_0, 16, mm1_state )
+static ADDRESS_MAP_START( mm1_upd7220_map, 0, 16, mm1_state )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x7fff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
@@ -148,7 +148,7 @@ MACHINE_CONFIG_START( mm1m6_video )
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD(UPD7220_TAG, UPD7220, XTAL_18_720MHz/8)
- MCFG_DEVICE_ADDRESS_MAP(AS_0, mm1_upd7220_map)
+ MCFG_DEVICE_ADDRESS_MAP(0, mm1_upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(mm1_state, hgdc_display_pixels)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MACHINE_CONFIG_END
diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp
index 906d715ec6f..f25105b79f7 100644
--- a/src/mame/video/nick.cpp
+++ b/src/mame/video/nick.cpp
@@ -88,7 +88,7 @@ DEVICE_ADDRESS_MAP_START( vio_map, 8, nick_device )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nick_map, AS_0, 8, nick_device )
+static ADDRESS_MAP_START( nick_map, 0, 8, nick_device )
AM_RANGE(0x0000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -204,9 +204,11 @@ void nick_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *nick_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> nick_device::memory_space_config() const
{
- return (spacenum == 0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h
index c769928e911..e56fc6f0a21 100644
--- a/src/mame/video/nick.h
+++ b/src/mame/video/nick.h
@@ -89,7 +89,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
DECLARE_READ8_MEMBER( vram_r );
DECLARE_WRITE8_MEMBER( vram_w );
diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp
index dfa76bf8308..18560896c99 100644
--- a/src/mame/video/pc8401a.cpp
+++ b/src/mame/video/pc8401a.cpp
@@ -43,12 +43,12 @@ uint32_t pc8500_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
/* SED1330 Interface */
-static ADDRESS_MAP_START( pc8401a_lcdc, AS_0, 8, pc8401a_state )
+static ADDRESS_MAP_START( pc8401a_lcdc, 0, 8, pc8401a_state )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x1fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pc8500_lcdc, AS_0, 8, pc8401a_state )
+static ADDRESS_MAP_START( pc8500_lcdc, 0, 8, pc8401a_state )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp
index 353e34ada0a..8f4ee89f3db 100644
--- a/src/mame/video/pc_t1t.cpp
+++ b/src/mame/video/pc_t1t.cpp
@@ -78,7 +78,7 @@ void pcvideo_t1000_device::device_start()
m_bank = 0;
m_chr_size = 1;
m_ra_offset = 256;
- m_vram->space(AS_0).install_ram(0, 128*1024 - 1, m_ram->pointer());
+ m_vram->space(0).install_ram(0, 128*1024 - 1, m_ram->pointer());
}
@@ -94,12 +94,12 @@ void pcvideo_pcjr_device::device_start()
if(!strncmp(machine().system().name, "ibmpcjx", 7))
{
m_jxkanji = machine().root_device().memregion("kanji")->base();
- m_vram->space(AS_0).install_ram(0, 128*1024 - 1, memshare(":vram")->ptr()); // TODO: fix when this is really understood
+ m_vram->space(0).install_ram(0, 128*1024 - 1, memshare(":vram")->ptr()); // TODO: fix when this is really understood
}
else
{
m_jxkanji = nullptr;
- m_vram->space(AS_0).install_ram(0, 128*1024 - 1, m_ram->pointer());
+ m_vram->space(0).install_ram(0, 128*1024 - 1, m_ram->pointer());
}
}
@@ -110,7 +110,7 @@ void pcvideo_pcjr_device::device_start()
***************************************************************************/
-static ADDRESS_MAP_START(vram_map, AS_0, 8, pcvideo_t1000_device)
+static ADDRESS_MAP_START(vram_map, 0, 8, pcvideo_t1000_device)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x20000, 0x3ffff) AM_NOP
ADDRESS_MAP_END
diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp
index 85a055e2a42..b0c89f075b6 100644
--- a/src/mame/video/pcd.cpp
+++ b/src/mame/video/pcd.cpp
@@ -136,7 +136,7 @@ static ADDRESS_MAP_START( pcx_vid_io, AS_IO, 8, pcx_video_device )
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE(p1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pcx_vram, AS_0, 8, pcx_video_device )
+static ADDRESS_MAP_START( pcx_vram, 0, 8, pcx_video_device )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(vram_r, vram_w)
ADDRESS_MAP_END
@@ -162,7 +162,7 @@ MACHINE_CONFIG_MEMBER( pcx_video_device::device_add_mconfig )
MCFG_SCN2674_GFX_CHARACTER_WIDTH(16)
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(pcx_video_device, display_pixels)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_DEVICE_ADDRESS_MAP(AS_0, pcx_vram)
+ MCFG_DEVICE_ADDRESS_MAP(0, pcx_vram)
MACHINE_CONFIG_END
diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp
index ed9ebe87e20..a5503662384 100644
--- a/src/mame/video/pecom.cpp
+++ b/src/mame/video/pecom.cpp
@@ -43,7 +43,7 @@ WRITE8_MEMBER(pecom_state::pecom_cdp1869_w)
}
}
-static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, pecom_state )
+static ADDRESS_MAP_START( cdp1869_page_ram, 0, 8, pecom_state )
AM_RANGE(0x000, 0x3ff) AM_MIRROR(0x400) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp
index fb2ee4b2321..987dd0450ed 100644
--- a/src/mame/video/seibu_crtc.cpp
+++ b/src/mame/video/seibu_crtc.cpp
@@ -215,7 +215,7 @@ List of default vregs (title screen):
// device type definition
DEFINE_DEVICE_TYPE(SEIBU_CRTC, seibu_crtc_device, "seibu_crtc", "Seibu CRT Controller")
-static ADDRESS_MAP_START( seibu_crtc_vregs, AS_0, 16, seibu_crtc_device )
+static ADDRESS_MAP_START( seibu_crtc_vregs, 0, 16, seibu_crtc_device )
AM_RANGE(0x0014, 0x0015) AM_WRITE(decrypt_key_w)
AM_RANGE(0x001a, 0x001b) AM_READWRITE(reg_1a_r, reg_1a_w)
AM_RANGE(0x001c, 0x001d) AM_WRITE(layer_en_w)
@@ -322,9 +322,11 @@ void seibu_crtc_device::device_reset()
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *seibu_crtc_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> seibu_crtc_device::memory_space_config() const
{
- return (spacenum == AS_0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h
index fe58abbf1cf..444103d8f8c 100644
--- a/src/mame/video/seibu_crtc.h
+++ b/src/mame/video/seibu_crtc.h
@@ -71,7 +71,7 @@ protected:
virtual void device_validity_check(validity_checker &valid) const override;
virtual void device_start() override;
virtual void device_reset() override;
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
private:
devcb_write16 m_decrypt_key_cb;
diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp
index a8d9e5f590c..d717b62da5c 100644
--- a/src/mame/video/tmc600.cpp
+++ b/src/mame/video/tmc600.cpp
@@ -72,7 +72,7 @@ WRITE8_MEMBER( tmc600_state::page_ram_w )
m_color_ram[offset] = m_vismac_color_latch;
}
-static ADDRESS_MAP_START( cdp1869_page_ram, AS_0, 8, tmc600_state )
+static ADDRESS_MAP_START( cdp1869_page_ram, 0, 8, tmc600_state )
AM_RANGE(0x000, 0x3ff) AM_MIRROR(0x400) AM_RAM AM_SHARE("page_ram") AM_WRITE(page_ram_w)
ADDRESS_MAP_END
diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp
index 6e2184f9f42..ac120d8dc6d 100644
--- a/src/mame/video/zx8301.cpp
+++ b/src/mame/video/zx8301.cpp
@@ -56,7 +56,7 @@ DEFINE_DEVICE_TYPE(ZX8301, zx8301_device, "zx8301", "Sinclair ZX8301")
// default address map
-static ADDRESS_MAP_START( zx8301, AS_0, 8, zx8301_device )
+static ADDRESS_MAP_START( zx8301, 0, 8, zx8301_device )
AM_RANGE(0x00000, 0x1ffff) AM_RAM
ADDRESS_MAP_END
@@ -66,9 +66,11 @@ ADDRESS_MAP_END
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *zx8301_device::memory_space_config(address_spacenum spacenum) const
+std::vector<std::pair<int, const address_space_config *>> zx8301_device::memory_space_config() const
{
- return (spacenum == AS_0) ? &m_space_config : nullptr;
+ return std::vector<std::pair<int, const address_space_config *>> {
+ std::make_pair(0, &m_space_config)
+ };
}
diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h
index d2729eed02e..fa777c8142f 100644
--- a/src/mame/video/zx8301.h
+++ b/src/mame/video/zx8301.h
@@ -78,7 +78,7 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
// address space configurations
const address_space_config m_space_config;