6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-21 18:37:11 +00:00
Code Issues Projects Releases Wiki Activity

Avoid repetition of 'PC'.

Browse Source
This commit is contained in:
Thomas Harte 2025-03-07 13:44:49 -05:00
parent 9135402d9e
commit 2c165c3873
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Machines/PCCompatible/KeyboardController.hpp
View File

@ -19,7 +19,7 @@ class KeyboardController;
template <Analyser::Static::PCCompatible::Model model>
class KeyboardController<model, typename std::enable_if_t<is_xt(model)>> {
public:
KeyboardController(PICs<model> &pics, PCSpeaker &) : pics_(pics) {}
KeyboardController(PICs<model> &pics, Speaker &) : pics_(pics) {}
// KB Status Port 61h high bits:
//; 01 - normal operation. wait for keypress, when one comes in,
@ -102,7 +102,7 @@ private:
template <Analyser::Static::PCCompatible::Model model>
class KeyboardController<model, typename std::enable_if_t<is_at(model)>> {
public:
KeyboardController(PICs<model> &pics, PCSpeaker &speaker) : pics_(pics), speaker_(speaker) {}
KeyboardController(PICs<model> &pics, Speaker &speaker) : pics_(pics), speaker_(speaker) {}
void run_for([[maybe_unused]] const Cycles cycles) {
}
@ -146,7 +146,7 @@ private:
Log::Logger<Log::Source::PCCompatible> log_;
PICs<model> &pics_;
PCSpeaker &speaker_;
Speaker &speaker_;
uint8_t refresh_toggle_ = 0;
};

10
Machines/PCCompatible/PCCompatible.cpp
View File

@ -62,7 +62,7 @@ template <> struct Adaptor<Target::VideoAdaptor::CGA> { using type = CGA; };
template <Analyser::Static::PCCompatible::Model model>
class PITObserver {
public:
PITObserver(PICs<model> &pics, PCSpeaker &speaker) : pics_(pics), speaker_(speaker) {}
PITObserver(PICs<model> &pics, Speaker &speaker) : pics_(pics), speaker_(speaker) {}
template <int channel>
void update_output(const bool new_level) {
@ -78,7 +78,7 @@ public:
private:
PICs<model> &pics_;
PCSpeaker &speaker_;
Speaker &speaker_;
};
template <Analyser::Static::PCCompatible::Model model>
@ -88,7 +88,7 @@ template <Analyser::Static::PCCompatible::Model model>
class i8255PortHandler : public Intel::i8255::PortHandler {
public:
i8255PortHandler(
PCSpeaker &speaker,
Speaker &speaker,
KeyboardController<model> &keyboard,
const Target::VideoAdaptor adaptor,
const int drive_count
@ -178,7 +178,7 @@ private:
uint8_t low_switches_ = 0;
bool use_high_switches_ = false;
PCSpeaker &speaker_;
Speaker &speaker_;
KeyboardController<model> &keyboard_;
bool enable_keyboard_ = false;
@ -854,7 +854,7 @@ public:
private:
static constexpr auto x86_model = processor_model(pc_model);
PCSpeaker speaker_;
Speaker speaker_;
PICs<pc_model> pics_;
DMA<pc_model> dma_;
Video video_;

4
Machines/PCCompatible/Speaker.hpp
View File

@ -14,8 +14,8 @@
namespace PCCompatible {
struct PCSpeaker {
PCSpeaker() :
struct Speaker {
Speaker() :
toggle(queue),
speaker(toggle) {}