summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/rex6000.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/rex6000.cpp')
-rw-r--r--src/mame/drivers/rex6000.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 0ee0bd471c8..d1631f2e5e8 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -124,6 +124,9 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(sec_timer);
DECLARE_QUICKLOAD_LOAD_MEMBER(rex6000);
void rex6000(machine_config &config);
+ void rex6000_banked_map(address_map &map);
+ void rex6000_io(address_map &map);
+ void rex6000_mem(address_map &map);
};
@@ -148,6 +151,8 @@ public:
uint32_t screen_update_oz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void oz750(machine_config &config);
+ void oz750_banked_map(address_map &map);
+ void oz750_io(address_map &map);
private:
int oz_wzd_extract_tag(const std::vector<uint8_t> &data, const char *tag, char *dest_buf);
@@ -365,7 +370,7 @@ WRITE8_MEMBER( oz750_state::kb_mask_w )
m_kb_mask = (m_kb_mask & 0xff00) | data;
}
-static ADDRESS_MAP_START(rex6000_banked_map, AS_PROGRAM, 8, rex6000_state)
+ADDRESS_MAP_START(rex6000_state::rex6000_banked_map)
AM_RANGE( 0x0000000, 0x00fffff ) AM_DEVREADWRITE("flash0a", intelfsh8_device, read, write)
AM_RANGE( 0x0100000, 0x01fffff ) AM_DEVREADWRITE("flash0b", intelfsh8_device, read, write)
AM_RANGE( 0x0c00000, 0x0cfffff ) AM_DEVREADWRITE("flash1a", intelfsh8_device, read, write)
@@ -375,7 +380,7 @@ static ADDRESS_MAP_START(rex6000_banked_map, AS_PROGRAM, 8, rex6000_state)
AM_RANGE( 0x2000000, 0x2007fff ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START(oz750_banked_map, AS_PROGRAM, 8, oz750_state)
+ADDRESS_MAP_START(oz750_state::oz750_banked_map)
AM_RANGE( 0x0000000, 0x01fffff ) AM_DEVREADWRITE("flash0a", intelfsh8_device, read, write)
AM_RANGE( 0x0200000, 0x02fffff ) AM_MIRROR(0x100000) AM_DEVREADWRITE("flash1a", intelfsh8_device, read, write)
AM_RANGE( 0x0600000, 0x07fffff ) AM_READWRITE(lcd_io_r, lcd_io_w)
@@ -384,7 +389,7 @@ static ADDRESS_MAP_START(oz750_banked_map, AS_PROGRAM, 8, oz750_state)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(rex6000_mem, AS_PROGRAM, 8, rex6000_state)
+ADDRESS_MAP_START(rex6000_state::rex6000_mem)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0x7fff ) AM_DEVREADWRITE("flash0a", intelfsh8_device, read, write)
AM_RANGE( 0x8000, 0x9fff ) AM_DEVREADWRITE("bank0", address_map_bank_device, read8, write8)
@@ -392,7 +397,7 @@ static ADDRESS_MAP_START(rex6000_mem, AS_PROGRAM, 8, rex6000_state)
AM_RANGE( 0xc000, 0xffff ) AM_RAMBANK("ram") //system RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rex6000_io, AS_IO, 8, rex6000_state)
+ADDRESS_MAP_START(rex6000_state::rex6000_io)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x04 ) AM_READWRITE(bankswitch_r, bankswitch_w)
@@ -406,7 +411,7 @@ static ADDRESS_MAP_START( rex6000_io, AS_IO, 8, rex6000_state)
AM_RANGE( 0x60, 0x6f ) AM_READWRITE(touchscreen_r, touchscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oz750_io, AS_IO, 8, oz750_state)
+ADDRESS_MAP_START(oz750_state::oz750_io)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x04 ) AM_READWRITE(bankswitch_r, bankswitch_w)