summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/mz6500.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mz6500.cpp')
-rw-r--r--src/mame/drivers/mz6500.cpp31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index a9c1c94fb39..8441cb4c3ba 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -80,26 +80,28 @@ WRITE8_MEMBER( mz6500_state::mz6500_vram_w )
m_video_ram[offset] |= data << mask;
}
-ADDRESS_MAP_START(mz6500_state::mz6500_map)
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00000,0x9ffff) AM_RAM
+void mz6500_state::mz6500_map(address_map &map)
+{
+ map.unmap_value_high();
+ map(0x00000, 0x9ffff).ram();
// AM_RANGE(0xa0000,0xbffff) kanji/dictionary ROM
- AM_RANGE(0xc0000,0xeffff) AM_READWRITE8(mz6500_vram_r,mz6500_vram_w,0xffff)
- AM_RANGE(0xfc000,0xfffff) AM_ROM AM_REGION("ipl", 0)
-ADDRESS_MAP_END
+ map(0xc0000, 0xeffff).rw(this, FUNC(mz6500_state::mz6500_vram_r), FUNC(mz6500_state::mz6500_vram_w));
+ map(0xfc000, 0xfffff).rom().region("ipl", 0);
+}
-ADDRESS_MAP_START(mz6500_state::mz6500_io)
- ADDRESS_MAP_UNMAP_HIGH
+void mz6500_state::mz6500_io(address_map &map)
+{
+ map.unmap_value_high();
// AM_RANGE(0x0000, 0x000f) i8237 dma
// AM_RANGE(0x0010, 0x001f) i8255
- AM_RANGE(0x0020, 0x0021) AM_MIRROR(0xe) AM_DEVICE8("upd765", upd765a_device, map, 0xffff)
+ map(0x0020, 0x0021).mirror(0xe).m(m_fdc, FUNC(upd765a_device::map));
// AM_RANGE(0x0030, 0x003f) i8259 master
// AM_RANGE(0x0040, 0x004f) i8259 slave
// AM_RANGE(0x0050, 0x0050) segment byte for DMA
// AM_RANGE(0x0060, 0x0060) system port A
// AM_RANGE(0x0070, 0x0070) system port C
// AM_RANGE(0x00cd, 0x00cd) MZ-1R32
- AM_RANGE(0x0100, 0x0103) AM_MIRROR(0xc) AM_DEVREADWRITE8("upd7220", upd7220_device, read, write, 0x00ff)
+ map(0x0100, 0x0103).mirror(0xc).rw(m_hgdc, FUNC(upd7220_device::read), FUNC(upd7220_device::write)).umask16(0x00ff);
// AM_RANGE(0x0110, 0x011f) video address / data registers (priority)
// AM_RANGE(0x0120, 0x012f) video registers
// AM_RANGE(0x0130, 0x013f) video register
@@ -111,7 +113,7 @@ ADDRESS_MAP_START(mz6500_state::mz6500_io)
// AM_RANGE(0x0240, 0x0240) z80ctc vector ack
// AM_RANGE(0x0250, 0x0250) z80sio vector ack
// AM_RANGE(0x0270, 0x0270) system port B
-ADDRESS_MAP_END
+}
/* Input ports */
static INPUT_PORTS_START( mz6500 )
@@ -136,9 +138,10 @@ static SLOT_INTERFACE_START( mz6500_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
-ADDRESS_MAP_START(mz6500_state::upd7220_map)
- AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram")
-ADDRESS_MAP_END
+void mz6500_state::upd7220_map(address_map &map)
+{
+ map(0x00000, 0x3ffff).ram().share("video_ram");
+}
MACHINE_CONFIG_START(mz6500_state::mz6500)