diff options
Diffstat (limited to 'src/mame/drivers/mac.cpp')
-rw-r--r-- | src/mame/drivers/mac.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index a1a0eb73354..1936032f791 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -591,7 +591,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mac_state::mac_scanline) ADDRESS MAPS ***************************************************************************/ -static ADDRESS_MAP_START(mac512ke_map, AS_PROGRAM, 16, mac_state ) +ADDRESS_MAP_START(mac_state::mac512ke_map) AM_RANGE(0x800000, 0x9fffff) AM_READ(mac_scc_r) AM_RANGE(0xa00000, 0xbfffff) AM_WRITE(mac_scc_w) AM_RANGE(0xc00000, 0xdfffff) AM_READWRITE(mac_iwm_r, mac_iwm_w) @@ -599,7 +599,7 @@ static ADDRESS_MAP_START(mac512ke_map, AS_PROGRAM, 16, mac_state ) AM_RANGE(0xfffff0, 0xffffff) AM_READWRITE(mac_autovector_r, mac_autovector_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(macplus_map, AS_PROGRAM, 16, mac_state ) +ADDRESS_MAP_START(mac_state::macplus_map) AM_RANGE(0x580000, 0x5fffff) AM_READWRITE(macplus_scsi_r, macplus_scsi_w) AM_RANGE(0x800000, 0x9fffff) AM_READ(mac_scc_r) AM_RANGE(0xa00000, 0xbfffff) AM_WRITE(mac_scc_w) @@ -608,7 +608,7 @@ static ADDRESS_MAP_START(macplus_map, AS_PROGRAM, 16, mac_state ) AM_RANGE(0xfffff0, 0xffffff) AM_READWRITE(mac_autovector_r, mac_autovector_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(macse_map, AS_PROGRAM, 16, mac_state ) +ADDRESS_MAP_START(mac_state::macse_map) AM_RANGE(0x580000, 0x5fffff) AM_READWRITE(macplus_scsi_r, macplus_scsi_w) AM_RANGE(0x900000, 0x9fffff) AM_READ(mac_scc_r) AM_RANGE(0xb00000, 0xbfffff) AM_WRITE(mac_scc_w) @@ -617,7 +617,7 @@ static ADDRESS_MAP_START(macse_map, AS_PROGRAM, 16, mac_state ) AM_RANGE(0xfffff0, 0xffffff) AM_READWRITE(mac_autovector_r, mac_autovector_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(macprtb_map, AS_PROGRAM, 16, mac_state ) +ADDRESS_MAP_START(mac_state::macprtb_map) AM_RANGE(0x900000, 0x93ffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0c0000) AM_RANGE(0xf60000, 0xf6ffff) AM_READWRITE(mac_iwm_r, mac_iwm_w) AM_RANGE(0xf70000, 0xf7ffff) AM_READWRITE(mac_via_r, mac_via_w) @@ -629,7 +629,7 @@ static ADDRESS_MAP_START(macprtb_map, AS_PROGRAM, 16, mac_state ) AM_RANGE(0xfffff0, 0xffffff) AM_READWRITE(mac_autovector_r, mac_autovector_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(maclc_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::maclc_map) ADDRESS_MAP_GLOBAL_MASK(0x80ffffff) // V8 uses bit 31 and 23-0 for address decoding only AM_RANGE(0xa00000, 0xafffff) AM_ROM AM_REGION("bootrom", 0) // ROM (in 32-bit mode) @@ -646,7 +646,7 @@ static ADDRESS_MAP_START(maclc_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0xf40000, 0xfbffff) AM_RAM AM_SHARE("vram") ADDRESS_MAP_END -static ADDRESS_MAP_START(maclc3_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::maclc3_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) @@ -665,7 +665,7 @@ static ADDRESS_MAP_START(maclc3_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0x60000000, 0x600fffff) AM_RAM AM_MIRROR(0x0ff00000) AM_SHARE("vram") ADDRESS_MAP_END -static ADDRESS_MAP_START(macii_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macii_map) AM_RANGE(0x40000000, 0x4003ffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ffc0000) // MMU remaps I/O without the F @@ -681,7 +681,7 @@ static ADDRESS_MAP_START(macii_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0x50040000, 0x50041fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) ADDRESS_MAP_END -static ADDRESS_MAP_START(maciici_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::maciici_map) AM_RANGE(0x40000000, 0x4007ffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff80000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) @@ -696,7 +696,7 @@ static ADDRESS_MAP_START(maciici_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0x50040000, 0x50041fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) ADDRESS_MAP_END -static ADDRESS_MAP_START(macse30_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macse30_map) AM_RANGE(0x40000000, 0x4003ffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ffc0000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) @@ -714,7 +714,7 @@ static ADDRESS_MAP_START(macse30_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0xfeffe000, 0xfeffffff) AM_ROM AM_REGION("se30vrom", 0x0) ADDRESS_MAP_END -static ADDRESS_MAP_START(maciifx_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::maciifx_map) AM_RANGE(0x40000000, 0x4007ffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff80000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00f00000) @@ -732,7 +732,7 @@ static ADDRESS_MAP_START(maciifx_map, AS_PROGRAM, 32, mac_state ) ADDRESS_MAP_END // ROM detects the "Jaws" ASIC by checking for I/O space mirrored at 0x01000000 boundries -static ADDRESS_MAP_START(macpb140_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macpb140_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x01f00000) @@ -748,7 +748,7 @@ static ADDRESS_MAP_START(macpb140_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0xfee08000, 0xfeffffff) AM_RAM AM_SHARE("vram") ADDRESS_MAP_END -static ADDRESS_MAP_START(macpb160_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macpb160_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50f00000, 0x50f01fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) @@ -765,7 +765,7 @@ static ADDRESS_MAP_START(macpb160_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0x60000000, 0x6001ffff) AM_RAM AM_SHARE("vram") AM_MIRROR(0x0ffe0000) ADDRESS_MAP_END -static ADDRESS_MAP_START(macpb165c_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macpb165c_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50f00000, 0x50f01fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) @@ -787,7 +787,7 @@ static ADDRESS_MAP_START(macpb165c_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0xfcff8000, 0xfcffffff) AM_ROM AM_REGION("vrom", 0x0000) ADDRESS_MAP_END -static ADDRESS_MAP_START(macpd210_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::macpd210_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50f00000, 0x50f01fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) @@ -806,7 +806,7 @@ static ADDRESS_MAP_START(macpd210_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0x60000000, 0x6001ffff) AM_RAM AM_SHARE("vram") AM_MIRROR(0x0ffe0000) ADDRESS_MAP_END -static ADDRESS_MAP_START(quadra700_map, AS_PROGRAM, 32, mac_state ) +ADDRESS_MAP_START(mac_state::quadra700_map) AM_RANGE(0x40000000, 0x400fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0ff00000) AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff) AM_MIRROR(0x00fc0000) @@ -825,7 +825,7 @@ static ADDRESS_MAP_START(quadra700_map, AS_PROGRAM, 32, mac_state ) AM_RANGE(0xf9800200, 0xf980023f) AM_READWRITE(dafb_dac_r, dafb_dac_w) ADDRESS_MAP_END -static ADDRESS_MAP_START(pwrmac_map, AS_PROGRAM, 64, mac_state ) +ADDRESS_MAP_START(mac_state::pwrmac_map) AM_RANGE(0x00000000, 0x007fffff) AM_RAM // 8 MB standard AM_RANGE(0x40000000, 0x403fffff) AM_ROM AM_REGION("bootrom", 0) AM_MIRROR(0x0fc00000) |