summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jokrwild.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jokrwild.cpp')
-rw-r--r--src/mame/drivers/jokrwild.cpp29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 5abe0c584da..7616b724ad6 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -178,21 +178,22 @@ READ8_MEMBER(jokrwild_state::rng_r)
* Memory Map Information *
*************************/
-ADDRESS_MAP_START(jokrwild_state::jokrwild_map)
- AM_RANGE(0x0000, 0x03ff) AM_RAM_WRITE(jokrwild_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0x0400, 0x07ff) AM_RAM //FIXME: backup RAM
- AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(jokrwild_colorram_w) AM_SHARE("colorram")
- AM_RANGE(0x2400, 0x27ff) AM_RAM //stack RAM
- AM_RANGE(0x4004, 0x4007) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
- AM_RANGE(0x4008, 0x400b) AM_DEVREADWRITE("pia1", pia6821_device, read, write) //optical sensor is here
+void jokrwild_state::jokrwild_map(address_map &map)
+{
+ map(0x0000, 0x03ff).ram().w(this, FUNC(jokrwild_state::jokrwild_videoram_w)).share("videoram");
+ map(0x0400, 0x07ff).ram(); //FIXME: backup RAM
+ map(0x2000, 0x23ff).ram().w(this, FUNC(jokrwild_state::jokrwild_colorram_w)).share("colorram");
+ map(0x2400, 0x27ff).ram(); //stack RAM
+ map(0x4004, 0x4007).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+ map(0x4008, 0x400b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //optical sensor is here
// AM_RANGE(0x4010, 0x4010) AM_READNOP /* R ???? */
- AM_RANGE(0x6000, 0x6000) AM_DEVWRITE("crtc", mc6845_device, address_w)
- AM_RANGE(0x6001, 0x6001) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0x6100, 0x6100) AM_READ_PORT("SW1")
- AM_RANGE(0x6200, 0x6203) AM_READ(rng_r)//another PIA?
- AM_RANGE(0x6300, 0x6300) AM_READ_PORT("SW2")
- AM_RANGE(0x8000, 0xffff) AM_ROM
-ADDRESS_MAP_END
+ map(0x6000, 0x6000).w("crtc", FUNC(mc6845_device::address_w));
+ map(0x6001, 0x6001).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+ map(0x6100, 0x6100).portr("SW1");
+ map(0x6200, 0x6203).r(this, FUNC(jokrwild_state::rng_r));//another PIA?
+ map(0x6300, 0x6300).portr("SW2");
+ map(0x8000, 0xffff).rom();
+}
/* I/O byte R/W