From b26dcf8d26cf481267497651888a45364b4390df Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 24 Oct 2026 21:00:11 -0400 Subject: [PATCH] Switch wholesale from `get_xxx_line` to just `xxx`. --- Components/1770/1770.hpp | 4 ++-- Machines/Acorn/Archimedes/InputOutputController.hpp | 4 ++-- Machines/Acorn/BBCMicro/BBCMicro.cpp | 2 +- Machines/Atari/ST/DMAController.cpp | 6 +++--- Machines/Enterprise/EXDos.cpp | 4 ++-- Machines/MSX/DiskROM.cpp | 2 +- Machines/Oric/BD500.cpp | 2 +- Machines/Oric/Microdisc.cpp | 12 ++++++------ Machines/Oric/Microdisc.hpp | 2 +- Machines/Oric/Oric.cpp | 4 ++-- Machines/Tandy/CoCo/DiskController.cpp | 6 +++--- .../Mac/Clock Signal.xcodeproj/project.pbxproj | 2 +- .../xcschemes/Clock Signal Kiosk.xcscheme | 2 +- .../xcshareddata/xcschemes/Clock Signal.xcscheme | 2 +- .../xcschemes/Clock SignalTests.xcscheme | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Components/1770/1770.hpp b/Components/1770/1770.hpp index 87ea67366..4a9c8a20e 100644 --- a/Components/1770/1770.hpp +++ b/Components/1770/1770.hpp @@ -63,10 +63,10 @@ public: }; /// @returns The current value of the IRQ line output. - inline bool get_interrupt_request_line() const { return status_.interrupt_request; } + inline bool interrupt_request() const { return status_.interrupt_request; } /// @returns The current value of the DRQ line output. - inline bool get_data_request_line() const { return status_.data_request; } + inline bool data_request() const { return status_.data_request; } struct Delegate { virtual void wd1770_did_change_output(WD1770 &) = 0; diff --git a/Machines/Acorn/Archimedes/InputOutputController.hpp b/Machines/Acorn/Archimedes/InputOutputController.hpp index 29291a17b..510e42386 100644 --- a/Machines/Acorn/Archimedes/InputOutputController.hpp +++ b/Machines/Acorn/Archimedes/InputOutputController.hpp @@ -491,8 +491,8 @@ struct InputOutputController: public ClockingHint::Observer { }; set(irq_b_, IRQB::SoundBufferPointerUsed, sound_.interrupt()); - set(fiq_, FIQ::FloppyDiscInterrupt, floppy_.get_interrupt_request_line()); - set(fiq_, FIQ::FloppyDiscData, floppy_.get_data_request_line()); + set(fiq_, FIQ::FloppyDiscInterrupt, floppy_.interrupt_request()); + set(fiq_, FIQ::FloppyDiscData, floppy_.data_request()); if(video_.interrupt()) { irq_a_.set(IRQA::VerticalFlyback); diff --git a/Machines/Acorn/BBCMicro/BBCMicro.cpp b/Machines/Acorn/BBCMicro/BBCMicro.cpp index fc79c02b7..3762633e2 100644 --- a/Machines/Acorn/BBCMicro/BBCMicro.cpp +++ b/Machines/Acorn/BBCMicro/BBCMicro.cpp @@ -1286,7 +1286,7 @@ private: Acorn::Floppy::Floppy1770 wd1770_; void wd1770_did_change_output(WD::WD1770 &) override { m6502_.template set( - wd1770_.get_interrupt_request_line() || wd1770_.get_data_request_line() + wd1770_.interrupt_request() || wd1770_.data_request() ); } diff --git a/Machines/Atari/ST/DMAController.cpp b/Machines/Atari/ST/DMAController.cpp index 689271648..9948c8cd8 100644 --- a/Machines/Atari/ST/DMAController.cpp +++ b/Machines/Atari/ST/DMAController.cpp @@ -54,7 +54,7 @@ uint16_t DMAController::read(int address) { // DMA status. case 3: // TODO: should DRQ come from the HDC if that mode is selected? - return 0xfff8 | (error_ ? 0 : 1) | (byte_count_ ? 2 : 0) | (fdc_.get_data_request_line() ? 4 : 0); + return 0xfff8 | (error_ ? 0 : 1) | (byte_count_ ? 2 : 0) | (fdc_.data_request() ? 4 : 0); // DMA addressing. case 4: return uint16_t(0xff00 | ((address_ >> 16) & 0xff)); @@ -138,13 +138,13 @@ void DMAController::run_for(HalfCycles duration) { void DMAController::wd1770_did_change_output(WD::WD1770 &) { // Check for a change in interrupt state. const bool old_interrupt_line = interrupt_line_; - interrupt_line_ = fdc_.get_interrupt_request_line(); + interrupt_line_ = fdc_.interrupt_request(); if(delegate_ && interrupt_line_ != old_interrupt_line) { delegate_->dma_controller_did_change_output(*this); } // Check for a change in DRQ state, if it's the FDC that is currently being watched. - if(byte_count_ && fdc_.get_data_request_line() && (control_ & Control::DRQSource)) { + if(byte_count_ && fdc_.data_request() && (control_ & Control::DRQSource)) { --byte_count_; if(control_ & Control::Direction) { diff --git a/Machines/Enterprise/EXDos.cpp b/Machines/Enterprise/EXDos.cpp index 3dcea8762..a33a4239f 100644 --- a/Machines/Enterprise/EXDos.cpp +++ b/Machines/Enterprise/EXDos.cpp @@ -59,9 +59,9 @@ void EXDos::set_control_register(const uint8_t control) { uint8_t EXDos::get_control_register() { const uint8_t status = - (get_data_request_line() ? 0x80 : 0x00) | + (data_request() ? 0x80 : 0x00) | (disk_did_change_ ? 0x40 : 0x00) | - (get_interrupt_request_line() ? 0x02 : 0x00) | + (interrupt_request() ? 0x02 : 0x00) | (get_drive().get_is_ready() ? 0x01 : 0x00); return status; diff --git a/Machines/MSX/DiskROM.cpp b/Machines/MSX/DiskROM.cpp index a5d5bbaba..760027af5 100644 --- a/Machines/MSX/DiskROM.cpp +++ b/Machines/MSX/DiskROM.cpp @@ -44,7 +44,7 @@ uint8_t DiskROM::read(uint16_t address) { return WD::WD1770::read(address); } if(address == 0x7fff) { - return (get_data_request_line() ? 0x00 : 0x80) | (get_interrupt_request_line() ? 0x00 : 0x40); + return (data_request() ? 0x00 : 0x80) | (interrupt_request() ? 0x00 : 0x40); } return rom_[address & 0x3fff]; } diff --git a/Machines/Oric/BD500.cpp b/Machines/Oric/BD500.cpp index 5c8ef8a76..2fb9425b7 100644 --- a/Machines/Oric/BD500.cpp +++ b/Machines/Oric/BD500.cpp @@ -57,7 +57,7 @@ uint8_t BD500::read(int address) { case 0x0320: case 0x0321: case 0x0322: case 0x0323: return WD::WD1770::read(address); - case 0x312: return (get_data_request_line() ? 0x80 : 0x00) | (get_interrupt_request_line() ? 0x40 : 0x00); + case 0x312: return (data_request() ? 0x80 : 0x00) | (interrupt_request() ? 0x40 : 0x00); } } diff --git a/Machines/Oric/Microdisc.cpp b/Machines/Oric/Microdisc.cpp index 29aaddf80..60e8e8878 100644 --- a/Machines/Oric/Microdisc.cpp +++ b/Machines/Oric/Microdisc.cpp @@ -93,9 +93,9 @@ void Microdisc::set_control_register(const uint8_t control, const uint8_t change } if(irq_enable(changes)) { - const bool had_irq = interrupt_request_line(); + const bool had_irq = interrupt_request(); irq_enable_ = irq_enable(control); - const bool has_irq = interrupt_request_line(); + const bool has_irq = interrupt_request(); if(has_irq != had_irq && delegate_) { delegate_->wd1770_did_change_output(*this); } @@ -106,16 +106,16 @@ void Microdisc::set_control_register(const uint8_t control, const uint8_t change } } -bool Microdisc::interrupt_request_line() const { - return irq_enable_ && WD1770::get_interrupt_request_line(); +bool Microdisc::interrupt_request() const { + return irq_enable_ && WD1770::interrupt_request(); } uint8_t Microdisc::interrupt_request_register() const { - return 0x7f | (WD1770::get_interrupt_request_line() ? 0x00 : 0x80); + return 0x7f | (WD1770::interrupt_request() ? 0x00 : 0x80); } uint8_t Microdisc::data_request_register() const { - return 0x7f | (get_data_request_line() ? 0x00 : 0x80); + return 0x7f | (data_request() ? 0x00 : 0x80); } void Microdisc::set_head_load_request(const bool head_load) { diff --git a/Machines/Oric/Microdisc.hpp b/Machines/Oric/Microdisc.hpp index 5be8a0f28..543d79df0 100644 --- a/Machines/Oric/Microdisc.hpp +++ b/Machines/Oric/Microdisc.hpp @@ -22,7 +22,7 @@ public: uint8_t interrupt_request_register() const; uint8_t data_request_register() const; - bool interrupt_request_line() const; + bool interrupt_request() const; void run_for(const Cycles); diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 3e7a4ce27..fd914b395 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -781,12 +781,12 @@ private: // The Microdisc directly provides an interrupt line. if constexpr (disk_interface == DiskInterface::Microdisc) { - irq_line |= microdisc_.get_interrupt_request_line(); + irq_line |= microdisc_.interrupt_request(); } // The Jasmin reroutes its data request line to the processor's interrupt line. if constexpr (disk_interface == DiskInterface::Jasmin) { - irq_line |= jasmin_.get_data_request_line(); + irq_line |= jasmin_.data_request(); } m6502_.set_irq_line(irq_line); diff --git a/Machines/Tandy/CoCo/DiskController.cpp b/Machines/Tandy/CoCo/DiskController.cpp index 5ed44e950..82d29d31a 100644 --- a/Machines/Tandy/CoCo/DiskController.cpp +++ b/Machines/Tandy/CoCo/DiskController.cpp @@ -60,8 +60,8 @@ void DiskController::wd1770_did_change_output(WD::WD1770 &) { } void DiskController::update_halt_nmi() { - enable_halt_ &= !get_interrupt_request_line(); + enable_halt_ &= !interrupt_request(); - nmi_ = get_interrupt_request_line() && double_density_; - halt_ = !get_data_request_line() && enable_halt_; + nmi_ = interrupt_request() && double_density_; + halt_ = !data_request() && enable_halt_; } diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index f491cdf5e..51d267cb3 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -6072,7 +6072,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 2700; + LastUpgradeCheck = 2710; ORGANIZATIONNAME = "Thomas Harte"; TargetAttributes = { 4B055A691FAE763F0060FFFF = { diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme index a260c01c0..52e3a2317 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme @@ -1,6 +1,6 @@