6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-20 10:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Resolve newfound log ambiguity.

Browse Source
This commit is contained in:
Thomas Harte
2025-03-07 23:34:12 -05:00
parent cee2484108
commit bff10c1714
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Components/8530/z8530.cpp
+18 -18
View File
@@ -14,7 +14,7 @@ using namespace Zilog::SCC;
namespace {
Log::Logger<Log::Source::SCC> log;
Log::Logger<Log::Source::SCC> logger;
}
@@ -54,7 +54,7 @@ std::uint8_t z8530::read(const int address) {
case 2: // Handled non-symmetrically between channels.
if(address & 1) {
log.error().append("Unimplemented: register 2 status bits");
logger.error().append("Unimplemented: register 2 status bits");
} else {
result = interrupt_vector_;
@@ -111,11 +111,11 @@ void z8530::write(const int address, const std::uint8_t value) {
case 2: // Interrupt vector register; used only by Channel B.
// So there's only one of these.
interrupt_vector_ = value;
log.info().append("Interrupt vector set to %d", value);
logger.info().append("Interrupt vector set to %d", value);
break;
case 9: // Master interrupt and reset register; there is also only one of these.
log.info().append("Master interrupt and reset register: %02x", value);
logger.info().append("Master interrupt and reset register: %02x", value);
master_interrupt_control_ = value;
break;
}
@@ -152,7 +152,7 @@ uint8_t z8530::Channel::read(const bool data, const uint8_t pointer) {
if(data) {
return data_;
} else {
log.info().append("Control read from register %d", pointer);
logger.info().append("Control read from register %d", pointer);
// Otherwise, this is a control read...
switch(pointer) {
default:
@@ -237,10 +237,10 @@ void z8530::Channel::write(const bool data, const uint8_t pointer, const uint8_t
data_ = value;
return;
} else {
log.info().append("Control write: %02x to register %d", value, pointer);
logger.info().append("Control write: %02x to register %d", value, pointer);
switch(pointer) {
default:
log.info().append("Unrecognised control write: %02x to register %d", value, pointer);
logger.info().append("Unrecognised control write: %02x to register %d", value, pointer);
break;
case 0x0: // Write register 0 — CRC reset and other functions.
@@ -248,13 +248,13 @@ void z8530::Channel::write(const bool data, const uint8_t pointer, const uint8_t
switch(value >> 6) {
default: /* Do nothing. */ break;
case 1:
log.error().append("TODO: reset Rx CRC checker.");
logger.error().append("TODO: reset Rx CRC checker.");
break;
case 2:
log.error().append("TODO: reset Tx CRC checker.");
logger.error().append("TODO: reset Tx CRC checker.");
break;
case 3:
log.error().append("TODO: reset Tx underrun/EOM latch.");
logger.error().append("TODO: reset Tx underrun/EOM latch.");
break;
}
@@ -262,24 +262,24 @@ void z8530::Channel::write(const bool data, const uint8_t pointer, const uint8_t
switch((value >> 3)&7) {
default: /* Do nothing. */ break;
case 2:
// log.info().append("reset ext/status interrupts.");
// logger.info().append("reset ext/status interrupts.");
external_status_interrupt_ = false;
external_interrupt_status_ = 0;
break;
case 3:
log.error().append("TODO: send abort (SDLC).");
logger.error().append("TODO: send abort (SDLC).");
break;
case 4:
log.error().append("TODO: enable interrupt on next Rx character.");
logger.error().append("TODO: enable interrupt on next Rx character.");
break;
case 5:
log.error().append("TODO: reset Tx interrupt pending.");
logger.error().append("TODO: reset Tx interrupt pending.");
break;
case 6:
log.error().append("TODO: reset error.");
logger.error().append("TODO: reset error.");
break;
case 7:
log.error().append("TODO: reset highest IUS.");
logger.error().append("TODO: reset highest IUS.");
break;
}
break;
@@ -304,7 +304,7 @@ void z8530::Channel::write(const bool data, const uint8_t pointer, const uint8_t
b1 = 1 => transmit buffer empty interrupt is enabled; 0 => it isn't.
b0 = 1 => external interrupt is enabled; 0 => it isn't.
*/
log.info().append("Interrupt mask: %02x", value);
logger.info().append("Interrupt mask: %02x", value);
break;
case 0x2: // Write register 2 - interrupt vector.
@@ -319,7 +319,7 @@ void z8530::Channel::write(const bool data, const uint8_t pointer, const uint8_t
case 2: receive_bit_count = 6; break;
case 3: receive_bit_count = 8; break;
}
log.info().append("Receive bit count: %d", receive_bit_count);
logger.info().append("Receive bit count: %d", receive_bit_count);
/*
b7,b6: