1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-03 11:30:02 +00:00

Merge pull request #268 from TomHarte/SerialPortVIAInitialisation

Resolvws out-of-order initialisation within the C1540.
This commit is contained in:
Thomas Harte 2017-11-11 12:37:48 -05:00 committed by GitHub
commit 25e9dcc800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -151,8 +151,7 @@ void MachineBase::drive_via_did_set_data_density(void *driveVIA, int density) {
#pragma mark - SerialPortVIA
SerialPortVIA::SerialPortVIA(MOS::MOS6522::MOS6522<SerialPortVIA> &via) :
port_b_(0x00), attention_acknowledge_level_(false), attention_level_input_(true), data_level_output_(false), via_(via) {}
SerialPortVIA::SerialPortVIA(MOS::MOS6522::MOS6522<SerialPortVIA> &via) : via_(via) {}
uint8_t SerialPortVIA::get_port_input(MOS::MOS6522::Port port) {
if(port) return port_b_;

View File

@ -49,9 +49,11 @@ class SerialPortVIA: public MOS::MOS6522::IRQDelegatePortHandler {
private:
MOS::MOS6522::MOS6522<SerialPortVIA> &via_;
uint8_t port_b_;
uint8_t port_b_ = 0x0;
std::weak_ptr<::Commodore::Serial::Port> serial_port_;
bool attention_acknowledge_level_, attention_level_input_, data_level_output_;
bool attention_acknowledge_level_ = false;
bool attention_level_input_ = true;
bool data_level_output_ = false;
void update_data_line();
};