summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/f-32.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/f-32.cpp')
-rw-r--r--src/mame/drivers/f-32.cpp68
1 files changed, 36 insertions, 32 deletions
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index e82ab423f88..6e2229a9d9e 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -82,12 +82,13 @@ uint32_t mosaicf2_state::screen_update_mosaicf2(screen_device &screen, bitmap_in
-ADDRESS_MAP_START(mosaicf2_state::common_map)
- AM_RANGE(0x00000000, 0x001fffff) AM_RAM
- AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0x80000000, 0x80ffffff) AM_ROM AM_REGION("user2",0)
- AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
-ADDRESS_MAP_END
+void mosaicf2_state::common_map(address_map &map)
+{
+ map(0x00000000, 0x001fffff).ram();
+ map(0x40000000, 0x4003ffff).ram().share("videoram");
+ map(0x80000000, 0x80ffffff).rom().region("user2", 0);
+ map(0xfff00000, 0xffffffff).rom().region("user1", 0);
+}
READ32_MEMBER(mosaicf2_state::f32_input_port_1_r)
{
@@ -101,19 +102,20 @@ READ32_MEMBER(mosaicf2_state::f32_input_port_1_r)
}
-ADDRESS_MAP_START(mosaicf2_state::mosaicf2_io)
- AM_RANGE(0x4000, 0x4003) AM_DEVREAD8("oki", okim6295_device, read, 0x000000ff)
- AM_RANGE(0x4810, 0x4813) AM_DEVREAD8("ymsnd", ym2151_device, status_r, 0x000000ff)
- AM_RANGE(0x5000, 0x5003) AM_READ_PORT("P1")
- AM_RANGE(0x5200, 0x5203) AM_READ(f32_input_port_1_r)
- AM_RANGE(0x5400, 0x5403) AM_READ_PORT("EEPROMIN")
- AM_RANGE(0x6000, 0x6003) AM_DEVWRITE8("oki", okim6295_device, write, 0x000000ff)
- AM_RANGE(0x6800, 0x6803) AM_DEVWRITE8("ymsnd", ym2151_device, data_w, 0x000000ff)
- AM_RANGE(0x6810, 0x6813) AM_DEVWRITE8("ymsnd", ym2151_device, register_w, 0x000000ff)
- AM_RANGE(0x7000, 0x7003) AM_WRITE_PORT("EEPROMCLK")
- AM_RANGE(0x7200, 0x7203) AM_WRITE_PORT("EEPROMCS")
- AM_RANGE(0x7400, 0x7403) AM_WRITE_PORT("EEPROMOUT")
-ADDRESS_MAP_END
+void mosaicf2_state::mosaicf2_io(address_map &map)
+{
+ map(0x4003, 0x4003).r("oki", FUNC(okim6295_device::read));
+ map(0x4813, 0x4813).r("ymsnd", FUNC(ym2151_device::status_r));
+ map(0x5000, 0x5003).portr("P1");
+ map(0x5200, 0x5203).r(this, FUNC(mosaicf2_state::f32_input_port_1_r));
+ map(0x5400, 0x5403).portr("EEPROMIN");
+ map(0x6003, 0x6003).w("oki", FUNC(okim6295_device::write));
+ map(0x6803, 0x6803).w("ymsnd", FUNC(ym2151_device::data_w));
+ map(0x6813, 0x6813).w("ymsnd", FUNC(ym2151_device::register_w));
+ map(0x7000, 0x7003).portw("EEPROMCLK");
+ map(0x7200, 0x7203).portw("EEPROMCS");
+ map(0x7400, 0x7403).portw("EEPROMOUT");
+}
static INPUT_PORTS_START( mosaicf2 )
@@ -221,22 +223,24 @@ INPUT_PORTS_END
-ADDRESS_MAP_START(mosaicf2_state::royalpk2_map)
- AM_RANGE(0x00000000, 0x003fffff) AM_RAM
- AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_SHARE("videoram")
- AM_RANGE(0x80000000, 0x807fffff) AM_ROM AM_REGION("user2",0)
- AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
-ADDRESS_MAP_END
+void mosaicf2_state::royalpk2_map(address_map &map)
+{
+ map(0x00000000, 0x003fffff).ram();
+ map(0x40000000, 0x4003ffff).ram().share("videoram");
+ map(0x80000000, 0x807fffff).rom().region("user2", 0);
+ map(0xfff00000, 0xffffffff).rom().region("user1", 0);
+}
-ADDRESS_MAP_START(mosaicf2_state::royalpk2_io)
- AM_RANGE(0x4900, 0x4903) AM_READ_PORT("SYSTEM_P2")
+void mosaicf2_state::royalpk2_io(address_map &map)
+{
+ map(0x4900, 0x4903).portr("SYSTEM_P2");
- AM_RANGE(0x4a00, 0x4a03) AM_READ_PORT("EEPROMIN")
+ map(0x4a00, 0x4a03).portr("EEPROMIN");
- AM_RANGE(0x6800, 0x6803) AM_WRITE_PORT("EEPROMCLK")
- AM_RANGE(0x6900, 0x6903) AM_WRITE_PORT("EEPROMCS")
- AM_RANGE(0x6a00, 0x6a03) AM_WRITE_PORT("EEPROMOUT")
-ADDRESS_MAP_END
+ map(0x6800, 0x6803).portw("EEPROMCLK");
+ map(0x6900, 0x6903).portw("EEPROMCS");
+ map(0x6a00, 0x6a03).portw("EEPROMOUT");
+}
MACHINE_CONFIG_START(mosaicf2_state::royalpk2)