diff options
Diffstat (limited to 'src/mame/drivers/junior.cpp')
-rw-r--r-- | src/mame/drivers/junior.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index bae6c5b28ce..b6872389740 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -35,12 +35,13 @@ class junior_state : public driver_device { public: junior_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_riot(*this, "riot") - , - m_maincpu(*this, "maincpu") { } + : driver_device(mconfig, type, tag) + , m_riot(*this, "riot") + , m_maincpu(*this, "maincpu") + { + } - required_device<mos6532_t> m_riot; + required_device<mos6532_new_device> m_riot; DECLARE_READ8_MEMBER(junior_riot_a_r); DECLARE_READ8_MEMBER(junior_riot_b_r); DECLARE_WRITE8_MEMBER(junior_riot_a_w); @@ -62,8 +63,8 @@ static ADDRESS_MAP_START(junior_mem, AS_PROGRAM, 8, junior_state) ADDRESS_MAP_GLOBAL_MASK(0x1FFF) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x03ff) AM_RAM // 1K RAM - AM_RANGE(0x1a00, 0x1a7f) AM_DEVICE("riot", mos6532_t, ram_map) - AM_RANGE(0x1a80, 0x1a9f) AM_DEVICE("riot", mos6532_t, io_map) + AM_RANGE(0x1a00, 0x1a7f) AM_DEVICE("riot", mos6532_new_device, ram_map) + AM_RANGE(0x1a80, 0x1a9f) AM_DEVICE("riot", mos6532_new_device, io_map) AM_RANGE(0x1c00, 0x1fff) AM_ROM // Monitor ADDRESS_MAP_END @@ -211,7 +212,7 @@ void junior_state::machine_reset() } -static MACHINE_CONFIG_START( junior, junior_state ) +static MACHINE_CONFIG_START( junior ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",M6502, XTAL_1MHz) MCFG_CPU_PROGRAM_MAP(junior_mem) @@ -221,7 +222,7 @@ static MACHINE_CONFIG_START( junior, junior_state ) MCFG_DEFAULT_LAYOUT( layout_junior ) /* Devices */ - MCFG_DEVICE_ADD("riot", MOS6532n, XTAL_1MHz) + MCFG_DEVICE_ADD("riot", MOS6532_NEW, XTAL_1MHz) MCFG_MOS6530n_IN_PA_CB(READ8(junior_state, junior_riot_a_r)) MCFG_MOS6530n_OUT_PA_CB(WRITE8(junior_state, junior_riot_a_w)) MCFG_MOS6530n_IN_PB_CB(READ8(junior_state, junior_riot_b_r)) @@ -249,5 +250,5 @@ ROM_END /* Driver */ -/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ -COMP( 1980, junior, 0, 0, junior, junior, driver_device, 0, "Elektor Electronics", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW) +/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ +COMP( 1980, junior, 0, 0, junior, junior, junior_state, 0, "Elektor Electronics", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW) |