summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mephisto_berlin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mephisto_berlin.cpp')
-rw-r--r--src/mame/drivers/mephisto_berlin.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/mame/drivers/mephisto_berlin.cpp b/src/mame/drivers/mephisto_berlin.cpp
index 588d829596b..5567e78800f 100644
--- a/src/mame/drivers/mephisto_berlin.cpp
+++ b/src/mame/drivers/mephisto_berlin.cpp
@@ -33,6 +33,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_board(*this, "board")
+ , m_display(*this, "display")
, m_keys(*this, "KEY")
{ }
@@ -48,6 +49,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<mephisto_board_device> m_board;
+ required_device<mephisto_display_module2_device> m_display;
required_ioport m_keys;
};
@@ -59,10 +61,9 @@ private:
u8 berlin_state::input_r()
{
- if (m_board->mux_r() == 0xff)
- return m_keys->read();
- else
- return m_board->input_r() ^ 0xff;
+ // display i/o d7 selects keypad
+ u8 data = (m_display->io_r() & 0x80) ? 0 : m_keys->read();
+ return ~m_board->input_r() | data;
}
@@ -84,8 +85,8 @@ void berlin_state::berlin_mem(address_map &map)
map(0x900000, 0x903fff).m("nvram_map", FUNC(address_map_bank_device::amap8)).umask16(0xff00);
map(0xa00000, 0xa00000).r(FUNC(berlin_state::input_r));
map(0xb00000, 0xb00000).w(m_board, FUNC(mephisto_board_device::mux_w));
- map(0xc00000, 0xc00000).w("display", FUNC(mephisto_display_module2_device::latch_w));
- map(0xd00008, 0xd00008).w("display", FUNC(mephisto_display_module2_device::io_w));
+ map(0xc00000, 0xc00000).w(m_display, FUNC(mephisto_display_module2_device::latch_w));
+ map(0xd00008, 0xd00008).w(m_display, FUNC(mephisto_display_module2_device::io_w));
map(0xe00000, 0xe00000).w(m_board, FUNC(mephisto_board_device::led_w));
}
@@ -96,8 +97,8 @@ void berlin_state::berlinp_mem(address_map &map)
map(0x800000, 0x800000).r(FUNC(berlin_state::input_r));
map(0x900000, 0x900000).w(m_board, FUNC(mephisto_board_device::mux_w));
map(0xa00000, 0xa00000).w(m_board, FUNC(mephisto_board_device::led_w));
- map(0xb00000, 0xb00000).w("display", FUNC(mephisto_display_module2_device::io_w));
- map(0xc00000, 0xc00000).w("display", FUNC(mephisto_display_module2_device::latch_w));
+ map(0xb00000, 0xb00000).w(m_display, FUNC(mephisto_display_module2_device::io_w));
+ map(0xc00000, 0xc00000).w(m_display, FUNC(mephisto_display_module2_device::latch_w));
map(0xd00000, 0xd07fff).m("nvram_map", FUNC(address_map_bank_device::amap8)).umask32(0xff000000);
}
@@ -109,14 +110,14 @@ void berlin_state::berlinp_mem(address_map &map)
static INPUT_PORTS_START( berlin )
PORT_START("KEY")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ENTER") PORT_CODE(KEYCODE_ENTER)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CLEAR") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL)
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("UP") PORT_CODE(KEYCODE_UP)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("DOWN") PORT_CODE(KEYCODE_DOWN)
- PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("LEFT") PORT_CODE(KEYCODE_LEFT)
- PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RIGHT") PORT_CODE(KEYCODE_RIGHT)
- PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("NEW GAME (1/2)") PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_F1)
- PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("NEW GAME (2/2)") PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_F1)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Clear") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL)
+ PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP)
+ PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
+ PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
+ PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)
+ PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("New Game (1/2)") PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_F1) // combine for NEW GAME
+ PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("New Game (2/2)") PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_F1) // "
INPUT_PORTS_END
@@ -137,10 +138,10 @@ void berlin_state::berlin(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
ADDRESS_MAP_BANK(config, "nvram_map").set_map(&berlin_state::nvram_map).set_options(ENDIANNESS_BIG, 8, 13);
- MEPHISTO_BUTTONS_BOARD(config, m_board);
+ MEPHISTO_BUTTONS_BOARD(config, m_board); // internal
subdevice<sensorboard_device>("board:board")->set_nvram_enable(true);
- MEPHISTO_DISPLAY_MODULE2(config, "display");
+ MEPHISTO_DISPLAY_MODULE2(config, m_display); // internal
config.set_default_layout(layout_mephisto_berlin);
}