diff options
Diffstat (limited to 'src/mame/drivers/bbcbc.cpp')
-rw-r--r-- | src/mame/drivers/bbcbc.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp index e5b8a07fa64..ea0ba852ccb 100644 --- a/src/mame/drivers/bbcbc.cpp +++ b/src/mame/drivers/bbcbc.cpp @@ -40,34 +40,33 @@ class bbcbc_state : public driver_device { public: bbcbc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_buttons(*this, "BUTTONS.%u", 0) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_buttons(*this, "BUTTONS.%u", 0) { } - required_device<cpu_device> m_maincpu; - required_ioport_array<3> m_buttons; + DECLARE_READ8_MEMBER(input_r); + DECLARE_WRITE8_MEMBER(input_select_w); +private: uint8_t m_input_select; - virtual void machine_start() override; virtual void machine_reset() override; - - DECLARE_READ8_MEMBER(input_r); - DECLARE_WRITE8_MEMBER(input_select_w); + required_device<cpu_device> m_maincpu; + required_ioport_array<3> m_buttons; }; #define MAIN_CLOCK XTAL_4_433619MHz -static ADDRESS_MAP_START( bbcbc_prg, AS_PROGRAM, 8, bbcbc_state ) +static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, bbcbc_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0xbfff) AM_DEVREAD("cartslot", generic_slot_device, read_rom) AM_RANGE(0xe000, 0xe7ff) AM_RAM ADDRESS_MAP_END -static ADDRESS_MAP_START( bbcbc_io, AS_IO, 8, bbcbc_state ) +static ADDRESS_MAP_START( io_map, AS_IO, 8, bbcbc_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x7f) AM_DEVREADWRITE_MOD("z80pio", z80pio_device, read, write, rshift<5>) AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("tms9129", tms9129_device, vram_read, vram_write) @@ -108,8 +107,8 @@ static const z80_daisy_config bbcbc_daisy_chain[] = static MACHINE_CONFIG_START( bbcbc ) MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK / 8 ) - MCFG_CPU_PROGRAM_MAP(bbcbc_prg) - MCFG_CPU_IO_MAP(bbcbc_io) + MCFG_CPU_PROGRAM_MAP(mem_map) + MCFG_CPU_IO_MAP(io_map) MCFG_Z80_DAISY_CHAIN(bbcbc_daisy_chain) MCFG_DEVICE_ADD("z80pio", Z80PIO, MAIN_CLOCK/8) |