6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 16:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Use logger instead of printf.

Browse Source
This commit is contained in:
Thomas Harte 2024-02-15 13:55:46 -05:00
parent 093a029b8c
commit d9ec11c62e
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Machines/Apple/AppleII/SCSICard.cpp
View File

@ -125,13 +125,13 @@ void SCSICard::perform_bus_operation(Select select, bool is_read, uint16_t addre
case 0xb: case 0xb:
if(!is_read) { if(!is_read) {
printf("TODO: NCR reset\n"); logger_.error().append("TODO: NCR reset");
} }
break; break;
case 0xd: case 0xd:
if(!is_read) { if(!is_read) {
printf("TODO: Enable PDMA\n"); logger_.error().append("TODO: Enable PDMA");
} }
break; break;
@ -143,7 +143,7 @@ void SCSICard::perform_bus_operation(Select select, bool is_read, uint16_t addre
break; break;
default: default:
printf("Unhandled: %04x %c %02x\n", address, is_read ? 'r' : 'w', *value); logger_.error().append("Unhandled: %04x %c %02x\n", address, is_read ? 'r' : 'w', *value);
break; break;
} }
break; break;

3
Machines/Apple/AppleII/SCSICard.hpp
View File

@ -17,6 +17,8 @@
#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp" #include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
#include "../../../Storage/MassStorage/MassStorageDevice.hpp" #include "../../../Storage/MassStorage/MassStorageDevice.hpp"
#include "../../../Outputs/Log.hpp"
#include <array> #include <array>
#include <memory> #include <memory>
@ -47,6 +49,7 @@ class SCSICard: public Card {
SCSI::Bus scsi_bus_; SCSI::Bus scsi_bus_;
NCR::NCR5380::NCR5380 ncr5380_; NCR::NCR5380::NCR5380 ncr5380_;
SCSI::Target::Target<SCSI::DirectAccessDevice> storage_; SCSI::Target::Target<SCSI::DirectAccessDevice> storage_;
Log::Logger<Log::Source::AppleIISCSICard> logger_;
}; };
} }

8
Outputs/Log.hpp
View File

@ -23,6 +23,7 @@ enum class Source {
AmigaCopper, AmigaCopper,
AmigaChipset, AmigaChipset,
AmigaBlitter, AmigaBlitter,
AppleIISCSICard,
AtariST, AtariST,
AtariSTDMAController, AtariSTDMAController,
CommodoreStaticAnalyser, CommodoreStaticAnalyser,
@ -65,10 +66,13 @@ constexpr bool is_enabled(Source source) {
case Source::AmigaChipset: case Source::AmigaChipset:
case Source::AmigaCopper: case Source::AmigaCopper:
case Source::AmigaDisk: case Source::AmigaDisk:
case Source::DirectAccessDevice:
case Source::IWM: case Source::IWM:
case Source::MFP68901: case Source::MFP68901:
case Source::NCR5380: case Source::NCR5380:
case Source::SCC: return false; case Source::SCC:
case Source::SCSI:
return false;
} }
} }
@ -82,9 +86,11 @@ constexpr const char *prefix(Source source) {
case Source::AmigaChipset: return "Chipset"; case Source::AmigaChipset: return "Chipset";
case Source::AmigaCopper: return "Copper"; case Source::AmigaCopper: return "Copper";
case Source::AmigaDisk: return "Disk"; case Source::AmigaDisk: return "Disk";
case Source::AppleIISCSICard: return "SCSI card";
case Source::AtariST: return "AtariST"; case Source::AtariST: return "AtariST";
case Source::AtariSTDMAController: return "DMA"; case Source::AtariSTDMAController: return "DMA";
case Source::CommodoreStaticAnalyser: return "Commodore Static Analyser"; case Source::CommodoreStaticAnalyser: return "Commodore Static Analyser";
case Source::DirectAccessDevice: return "Direct Access Device";
case Source::Enterprise: return "Enterprise"; case Source::Enterprise: return "Enterprise";
case Source::i8272: return "i8272"; case Source::i8272: return "i8272";
case Source::IntelligentKeyboard: return "IKYB"; case Source::IntelligentKeyboard: return "IKYB";