From e8d34f2eb4076b32ba1cda2e92f4ff6279b000b3 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 18 Mar 2017 16:34:41 -0400
Subject: [PATCH] Having farmed out the bus, the Atari itself no longer is/owns
 a 6502.

---
 Machines/Atari2600/Atari2600.hpp | 6 +-----
 Machines/Atari2600/Cartridge.hpp | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Machines/Atari2600/Atari2600.hpp b/Machines/Atari2600/Atari2600.hpp
index c8703fb7c..1c9414a27 100644
--- a/Machines/Atari2600/Atari2600.hpp
+++ b/Machines/Atari2600/Atari2600.hpp
@@ -27,7 +27,6 @@ const unsigned int number_of_upcoming_events = 6;
 const unsigned int number_of_recorded_counters = 7;
 
 class Machine:
-	public CPU6502::Processor<Machine>,
 	public CRTMachine::Machine,
 	public ConfigurationTarget::Machine,
 	public Outputs::CRT::Delegate {
@@ -41,10 +40,7 @@ class Machine:
 
 		void set_digital_input(Atari2600DigitalInput input, bool state);
 		void set_switch_is_enabled(Atari2600Switch input, bool state);
-
-		// to satisfy CPU6502::Processor
-		unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value);
-		void synchronise();
+		void set_reset_line(bool state) { bus_->set_reset_line(state); }
 
 		// to satisfy CRTMachine::Machine
 		virtual void setup_output(float aspect_ratio);
diff --git a/Machines/Atari2600/Cartridge.hpp b/Machines/Atari2600/Cartridge.hpp
index a94d3f71c..24a2d291c 100644
--- a/Machines/Atari2600/Cartridge.hpp
+++ b/Machines/Atari2600/Cartridge.hpp
@@ -22,6 +22,7 @@ class Bus {
 			cycles_since_6532_update_(0) {}
 
 		virtual void run_for_cycles(int number_of_cycles) = 0;
+		virtual void set_reset_line(bool state) = 0;
 
 		// the RIOT, TIA and speaker
 		PIA mos6532_;
@@ -64,6 +65,7 @@ template<class T> class Cartridge:
 			rom_(rom) {}
 
 		void run_for_cycles(int number_of_cycles) { CPU6502::Processor<Cartridge<T>>::run_for_cycles(number_of_cycles); }
+		void set_reset_line(bool state) { CPU6502::Processor<Cartridge<T>>::set_reset_line(state); }
 
 		// to satisfy CPU6502::Processor
 		unsigned int perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value) {