From ea243259ed4bab298219accaf67b759cd940593b Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Thu, 17 Mar 2022 22:16:04 +0000 Subject: bbc_tube_6502: Corrected 6502 variants used in the 2nd processors. --- src/devices/bus/bbc/tube/tube_6502.cpp | 7 +++++-- src/devices/bus/bbc/tube/tube_6502.h | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp index f35de49c1ac..841dd69332a 100644 --- a/src/devices/bus/bbc/tube/tube_6502.cpp +++ b/src/devices/bus/bbc/tube/tube_6502.cpp @@ -127,7 +127,7 @@ ROM_END void bbc_tube_6502_device::device_add_mconfig(machine_config &config) { - M65C02(config, m_maincpu, 12_MHz_XTAL / 4); + M65SC02(config, m_maincpu, 12_MHz_XTAL / 4); // G65SC02 m_maincpu->set_addrmap(AS_PROGRAM, &bbc_tube_6502_device::tube_6502_mem); TUBE(config, m_ula); @@ -143,6 +143,7 @@ void bbc_tube_6502p_device::device_add_mconfig(machine_config &config) { bbc_tube_6502_device::device_add_mconfig(config); + M6502(config.replace(), m_maincpu, 12_MHz_XTAL / 4); // SY6502C m_maincpu->set_addrmap(AS_PROGRAM, &bbc_tube_6502p_device::tube_6502p_mem); } @@ -150,6 +151,7 @@ void bbc_tube_6502e_device::device_add_mconfig(machine_config &config) { bbc_tube_6502_device::device_add_mconfig(config); + M65SC02(config.replace(), m_maincpu, 12_MHz_XTAL / 4); // G65SC02 m_maincpu->set_addrmap(AS_PROGRAM, &bbc_tube_6502e_device::tube_6502e_mem); m_ram->set_default_size("256K").set_default_value(0); @@ -159,7 +161,8 @@ void bbc_tube_65c102_device::device_add_mconfig(machine_config &config) { bbc_tube_6502_device::device_add_mconfig(config); - m_maincpu->set_clock(16_MHz_XTAL / 4); + R65C02(config.replace(), m_maincpu, 16_MHz_XTAL / 4); // R65C102 + m_maincpu->set_addrmap(AS_PROGRAM, &bbc_tube_65c102_device::tube_6502_mem); } //------------------------------------------------- diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h index d6c2f6d0eec..920e9ab1cc9 100644 --- a/src/devices/bus/bbc/tube/tube_6502.h +++ b/src/devices/bus/bbc/tube/tube_6502.h @@ -17,7 +17,7 @@ #define MAME_BUS_BBC_TUBE_6502_H #include "tube.h" -#include "cpu/m6502/m65c02.h" +#include "cpu/m6502/m65sc02.h" #include "machine/ram.h" #include "machine/tube.h" @@ -27,9 +27,9 @@ // ======================> bbc_tube_6502_device -class bbc_tube_6502_device : - public device_t, - public device_bbc_tube_interface +class bbc_tube_6502_device + : public device_t + , public device_bbc_tube_interface { public: // construction/destruction @@ -54,7 +54,7 @@ protected: virtual uint8_t tube_r(offs_t offset); virtual void tube_w(offs_t offset, uint8_t data); - required_device m_maincpu; + required_device m_maincpu; memory_view m_view; required_device m_ula; required_device m_ram; -- cgit v1.2.3