summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mmodular.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mmodular.cpp')
-rw-r--r--src/mame/drivers/mmodular.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index 0bea946e5c0..df952d60bff 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -57,6 +57,11 @@ public:
void van16(machine_config &config);
void alm16(machine_config &config);
void gen32(machine_config &config);
+ void alm16_mem(address_map &map);
+ void alm32_mem(address_map &map);
+ void gen32_mem(address_map &map);
+ void van16_mem(address_map &map);
+ void van32_mem(address_map &map);
};
@@ -72,13 +77,14 @@ public:
DECLARE_READ8_MEMBER(berlinp_input_r);
void berlinp(machine_config &config);
+ void berlinp_mem(address_map &map);
private:
required_device<mephisto_board_device> m_board;
required_ioport m_keys;
};
-static ADDRESS_MAP_START(alm16_mem, AS_PROGRAM, 16, mmodular_state)
+ADDRESS_MAP_START(mmodular_state::alm16_mem)
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
AM_RANGE( 0xc00000, 0xc00001 ) AM_DEVREAD8("board", mephisto_board_device, input_r, 0xff00)
@@ -94,7 +100,7 @@ static ADDRESS_MAP_START(alm16_mem, AS_PROGRAM, 16, mmodular_state)
AM_RANGE( 0x800000, 0x803fff ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START(van16_mem, AS_PROGRAM, 16, mmodular_state)
+ADDRESS_MAP_START(mmodular_state::van16_mem)
AM_IMPORT_FROM(alm16_mem)
AM_RANGE( 0x000000, 0x03ffff ) AM_ROM
@@ -104,7 +110,7 @@ static ADDRESS_MAP_START(van16_mem, AS_PROGRAM, 16, mmodular_state)
// AM_RANGE( 0xe80006, 0xe80007 ) AM_READ(read_unknown3 ) // Bavaria sensors
ADDRESS_MAP_END
-static ADDRESS_MAP_START(alm32_mem, AS_PROGRAM, 32, mmodular_state)
+ADDRESS_MAP_START(mmodular_state::alm32_mem)
AM_RANGE( 0x00000000, 0x0001ffff ) AM_ROM
AM_RANGE( 0x800000fc, 0x800000ff ) AM_DEVREAD8("board", mephisto_board_device, input_r, 0xff000000)
@@ -121,7 +127,7 @@ static ADDRESS_MAP_START(alm32_mem, AS_PROGRAM, 32, mmodular_state)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(van32_mem, AS_PROGRAM, 32, mmodular_state)
+ADDRESS_MAP_START(mmodular_state::van32_mem)
AM_IMPORT_FROM(alm32_mem)
AM_RANGE( 0x00000000, 0x0003ffff ) AM_ROM
@@ -131,7 +137,7 @@ static ADDRESS_MAP_START(van32_mem, AS_PROGRAM, 32, mmodular_state)
// AM_RANGE( 0x9800000c, 0x9800000f ) AM_READ(read_unknown3 ) // Bavaria sensors
ADDRESS_MAP_END
-static ADDRESS_MAP_START(gen32_mem, AS_PROGRAM, 32, mmodular_state)
+ADDRESS_MAP_START(mmodular_state::gen32_mem)
AM_RANGE( 0x00000000, 0x0003ffff ) AM_ROM
AM_RANGE( 0xc8000004, 0xc8000007 ) AM_DEVWRITE8("board", mephisto_board_device, mux_w, 0xff000000)
@@ -161,7 +167,7 @@ READ8_MEMBER(berlinp_state::berlinp_input_r)
return m_board->input_r(space, offset) ^ 0xff;
}
-static ADDRESS_MAP_START(berlinp_mem, AS_PROGRAM, 32, berlinp_state)
+ADDRESS_MAP_START(berlinp_state::berlinp_mem)
AM_RANGE( 0x000000, 0x03ffff ) AM_ROM
AM_RANGE( 0x800000, 0x800003 ) AM_READ8(berlinp_input_r, 0xff000000)