From e6854ff8dbec5284ee4f0039f5cf1072710387cf Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 1 Aug 2017 17:06:57 -0400 Subject: [PATCH] Corrected typo: the input to an AY is BDIR, not BCDIR. --- Components/AY38910/AY38910.cpp | 6 +++--- Components/AY38910/AY38910.hpp | 2 +- Machines/AmstradCPC/AmstradCPC.cpp | 2 +- Machines/Oric/Oric.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Components/AY38910/AY38910.cpp b/Components/AY38910/AY38910.cpp index 22769b805..c05dad2e6 100644 --- a/Components/AY38910/AY38910.cpp +++ b/Components/AY38910/AY38910.cpp @@ -244,12 +244,12 @@ void AY38910::set_control_lines(ControlLines control_lines) { switch((int)control_lines) { default: new_state = Inactive; break; - case (int)(BCDIR | BC2 | BC1): - case BCDIR: + case (int)(BDIR | BC2 | BC1): + case BDIR: case BC1: new_state = LatchAddress; break; case (int)(BC2 | BC1): new_state = Read; break; - case (int)(BCDIR | BC2): new_state = Write; break; + case (int)(BDIR | BC2): new_state = Write; break; } if(new_state != control_state_) { diff --git a/Components/AY38910/AY38910.hpp b/Components/AY38910/AY38910.hpp index 34aefe1da..6a6d9d2f9 100644 --- a/Components/AY38910/AY38910.hpp +++ b/Components/AY38910/AY38910.hpp @@ -29,7 +29,7 @@ class AY38910: public ::Outputs::Filter { enum ControlLines { BC1 = (1 << 0), BC2 = (1 << 1), - BCDIR = (1 << 2) + BDIR = (1 << 2) }; /// Sets the value the AY would read from its data lines if it were not outputting. diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index d59bd610b..7724b524e 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -263,7 +263,7 @@ class i8255PortHandler : public Intel::i8255::PortHandler { // TODO: set casette output: ((value >> 5) & 1) ay_->set_control_lines( (GI::AY38910::ControlLines)( - ((value & 0x80) ? GI::AY38910::BCDIR : 0) | + ((value & 0x80) ? GI::AY38910::BDIR : 0) | ((value & 0x40) ? GI::AY38910::BC1 : 0) | GI::AY38910::BC2 )); diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 10e4f6b7e..74160be0d 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -244,7 +244,7 @@ void Machine::VIA::run_for(const Cycles cycles) { void Machine::VIA::update_ay() { ay8910->run_for(cycles_since_ay_update_.flush()); - ay8910->set_control_lines( (GI::AY38910::ControlLines)((ay_bdir_ ? GI::AY38910::BCDIR : 0) | (ay_bc1_ ? GI::AY38910::BC1 : 0) | GI::AY38910::BC2)); + ay8910->set_control_lines( (GI::AY38910::ControlLines)((ay_bdir_ ? GI::AY38910::BDIR : 0) | (ay_bc1_ ? GI::AY38910::BC1 : 0) | GI::AY38910::BC2)); } #pragma mark - TapePlayer