From f4cd0aa38ef49b5a0825cac60d6da2aa8d0c6c2f Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 23 Jan 2016 13:09:56 -0500
Subject: [PATCH] Ensured that all relevant information is given to the tape
 class. Made an attempt not to write to a screen output buffer if we don't
 have one. Added some debug printing.

---
 Machines/Electron/Electron.cpp | 22 +++++++++++++++++-----
 Machines/Electron/Electron.hpp |  7 ++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp
index ebb56eaf9..cdde445c2 100644
--- a/Machines/Electron/Electron.cpp
+++ b/Machines/Electron/Electron.cpp
@@ -104,10 +104,14 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 					case 0x1:
 					break;
 					case 0x2:
+						printf("%02x to [2] mutates %04x ", *value, _startScreenAddress);
 						_startScreenAddress = (_startScreenAddress & 0xfe00) | (uint16_t)(((*value) & 0xe0) << 1);
+						printf("into %04x\n", _startScreenAddress);
 					break;
 					case 0x3:
+						printf("%02x to [3] mutates %04x ", *value, _startScreenAddress);
 						_startScreenAddress = (_startScreenAddress & 0x01ff) | (uint16_t)(((*value) & 0x3f) << 9);
+						printf("into %04x\n", _startScreenAddress);
 					break;
 					case 0x4:
 						if(isReadOperation(operation))
@@ -117,8 +121,9 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 						}
 						else
 						{
+							_tape.set_data_register(*value);
+							_tape.clear_interrupts(Interrupt::ReceiveDataFull);
 						}
-//						printf("Cassette\n");
 					break;
 					case 0x5:
 						if(!isReadOperation(operation))
@@ -158,6 +163,7 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 						{
 							update_audio();
 							_speaker.set_divider(*value);
+							_tape.set_counter(*value);
 						}
 					break;
 					case 0x7:
@@ -185,10 +191,13 @@ unsigned int Machine::perform_bus_operation(CPU6502::BusOperation operation, uin
 							{
 								update_audio();
 								_speaker.set_is_enabled(new_speaker_is_enabled);
+								_tape.set_is_enabled(!new_speaker_is_enabled);
 							}
 
 							_tape.set_is_running(((*value)&0x40) ? true : false);
-							// TODO: tape mode, caps lock LED
+							_tape.set_is_in_input_mode(((*value)&0x04) ? false : true);
+
+							// TODO: caps lock LED
 						}
 					break;
 					default:
@@ -450,7 +459,7 @@ inline void Machine::update_display()
 	uint8_t pixels = _ram[_currentScreenAddress];\
 	_currentScreenAddress = _currentScreenAddress+8
 
-						if(pixels_to_output)
+						if(pixels_to_output && _writePointer)
 						{
 							switch(_screenMode)
 							{
@@ -511,7 +520,10 @@ inline void Machine::update_display()
 						else
 							_startLineAddress++;
 
-						_crt->output_data((unsigned int)((_writePointer - _currentLine) * _currentOutputDivider), _currentOutputDivider);
+						if(_writePointer)
+							_crt->output_data((unsigned int)((_writePointer - _currentLine) * _currentOutputDivider), _currentOutputDivider);
+						else
+							_crt->output_data(80 * crt_cycles_multiplier, _currentOutputDivider);
 						_crt->output_blank(24 * crt_cycles_multiplier);
 						_displayOutputPosition += 24;
 						_currentLine = nullptr;
@@ -660,7 +672,7 @@ inline void Tape::clear_interrupts(uint8_t interrupts)
 
 inline void Tape::run_for_cycles(unsigned int number_of_cycles)
 {
-	if(_is_running && _tape != nullptr)
+	if(_is_running && _is_enabled && _tape != nullptr)
 	{
 		while(number_of_cycles--)
 		{
diff --git a/Machines/Electron/Electron.hpp b/Machines/Electron/Electron.hpp
index 100a6476a..0921aca6b 100644
--- a/Machines/Electron/Electron.hpp
+++ b/Machines/Electron/Electron.hpp
@@ -64,6 +64,8 @@ class Tape {
 		void set_tape(std::shared_ptr<Storage::Tape> tape);
 
 		inline uint8_t get_data_register() { return (uint8_t)(_data_register >> 2); }
+		inline void set_data_register(uint8_t value) {}
+		inline void set_counter(uint8_t value) {}
 
 		inline uint8_t get_interrupt_status() { return _interrupt_status; }
 		inline void clear_interrupts(uint8_t interrupts);
@@ -76,7 +78,9 @@ class Tape {
 
 		inline void run_for_cycles(unsigned int number_of_cycles);
 
-		void set_is_running(bool is_running) { _is_running = is_running; }
+		inline void set_is_running(bool is_running) { _is_running = is_running; }
+		inline void set_is_enabled(bool is_enabled) { _is_enabled = is_enabled; }
+		inline void set_is_in_input_mode(bool is_in_input_mode) {}
 
 	private:
 		inline void push_tape_bit(uint16_t bit);
@@ -89,6 +93,7 @@ class Tape {
 		uint32_t _time_into_pulse;
 
 		bool _is_running;
+		bool _is_enabled;
 
 		int _bits_since_start;
 		uint16_t _data_register;