diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/fp6000.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/fp6000.cpp')
-rw-r--r-- | src/mame/drivers/fp6000.cpp | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index 44da3a053ef..35d3ba0912a 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -176,14 +176,15 @@ WRITE8_MEMBER(fp6000_state::fp6000_6845_data_w) m_crtc->register_w(space, offset, data); } -ADDRESS_MAP_START(fp6000_state::fp6000_map) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000,0xbffff) AM_RAM - AM_RANGE(0xc0000,0xdffff) AM_RAM AM_SHARE("gvram")//gvram - AM_RANGE(0xe0000,0xe0fff) AM_RAM AM_SHARE("vram") - AM_RANGE(0xe7000,0xe7fff) AM_READWRITE8(fp6000_pcg_r,fp6000_pcg_w,0xffff) - AM_RANGE(0xf0000,0xfffff) AM_ROM AM_REGION("ipl", 0) -ADDRESS_MAP_END +void fp6000_state::fp6000_map(address_map &map) +{ + map.unmap_value_high(); + map(0x00000, 0xbffff).ram(); + map(0xc0000, 0xdffff).ram().share("gvram");//gvram + map(0xe0000, 0xe0fff).ram().share("vram"); + map(0xe7000, 0xe7fff).rw(this, FUNC(fp6000_state::fp6000_pcg_r), FUNC(fp6000_state::fp6000_pcg_w)); + map(0xf0000, 0xfffff).rom().region("ipl", 0); +} /* Hack until I understand what UART is this one ... */ READ8_MEMBER(fp6000_state::fp6000_key_r) @@ -226,17 +227,18 @@ READ16_MEMBER(fp6000_state::pit_r) return machine().rand(); } -ADDRESS_MAP_START(fp6000_state::fp6000_io) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x08, 0x09) AM_READ(ex_board_r) // BIOS of some sort ... - AM_RANGE(0x0a, 0x0b) AM_READ_PORT("DSW") // installed RAM id? - AM_RANGE(0x10, 0x11) AM_READNOP - AM_RANGE(0x20, 0x23) AM_READWRITE8(fp6000_key_r,fp6000_key_w,0x00ff) - AM_RANGE(0x38, 0x39) AM_READ(pit_r) // pit? - AM_RANGE(0x70, 0x71) AM_WRITE8(fp6000_6845_address_w,0x00ff) - AM_RANGE(0x72, 0x73) AM_WRITE8(fp6000_6845_data_w,0x00ff) - AM_RANGE(0x74, 0x75) AM_READ(unk_r) //bit 6 busy flag -ADDRESS_MAP_END +void fp6000_state::fp6000_io(address_map &map) +{ + map.unmap_value_high(); + map(0x08, 0x09).r(this, FUNC(fp6000_state::ex_board_r)); // BIOS of some sort ... + map(0x0a, 0x0b).portr("DSW"); // installed RAM id? + map(0x10, 0x11).nopr(); + map(0x20, 0x23).rw(this, FUNC(fp6000_state::fp6000_key_r), FUNC(fp6000_state::fp6000_key_w)).umask16(0x00ff); + map(0x38, 0x39).r(this, FUNC(fp6000_state::pit_r)); // pit? + map(0x70, 0x70).w(this, FUNC(fp6000_state::fp6000_6845_address_w)); + map(0x72, 0x72).w(this, FUNC(fp6000_state::fp6000_6845_data_w)); + map(0x74, 0x75).r(this, FUNC(fp6000_state::unk_r)); //bit 6 busy flag +} /* Input ports */ static INPUT_PORTS_START( fp6000 ) |