1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-11-01 11:16:16 +00:00

Remove more get_s.

This commit is contained in:
Thomas Harte
2025-02-26 20:26:06 -05:00
parent 47bd4dade5
commit ff86cbd48e
55 changed files with 132 additions and 132 deletions

View File

@@ -77,7 +77,7 @@ uint8_t WD1770::read(const int address) {
status |=
(status_.track_zero ? Flag::TrackZero : 0) |
(status_.seek_error ? Flag::SeekError : 0) |
(get_drive().get_is_read_only() ? Flag::WriteProtect : 0) |
(get_drive().is_read_only() ? Flag::WriteProtect : 0) |
(get_drive().get_index_pulse() ? Flag::Index : 0);
break;
@@ -417,7 +417,7 @@ void WD1770::posit_event(const int new_event_type) {
WAIT_FOR_TIME(30);
test_type2_write_protection:
if(command_&0x20 && get_drive().get_is_read_only()) {
if(command_&0x20 && get_drive().is_read_only()) {
update_status([] (Status &status) {
status.write_protect = true;
});
@@ -716,7 +716,7 @@ void WD1770::posit_event(const int new_event_type) {
status.lost_data = false;
});
if(get_drive().get_is_read_only()) {
if(get_drive().is_read_only()) {
update_status([] (Status &status) {
status.write_protect = true;
});

View File

@@ -447,7 +447,7 @@ void i8272::posit_event(const int event_type) {
// command_[6],
// command_[8]);
if(get_drive().get_is_read_only()) {
if(get_drive().is_read_only()) {
status_.set(Status1::NotWriteable);
goto abort;
}
@@ -564,7 +564,7 @@ void i8272::posit_event(const int event_type) {
// Performs format [/write] track.
format_track:
logger.info().append("Format track");
if(get_drive().get_is_read_only()) {
if(get_drive().is_read_only()) {
status_.set(Status1::NotWriteable);
goto abort;
}
@@ -745,7 +745,7 @@ void i8272::posit_event(const int event_type) {
0x08 | // single sided
(get_drive().get_is_track_zero() ? 0x10 : 0x00) |
(get_drive().get_is_ready() ? 0x20 : 0x00) |
(get_drive().get_is_read_only() ? 0x40 : 0x00)
(get_drive().is_read_only() ? 0x40 : 0x00)
)
};
}

View File

@@ -184,7 +184,7 @@ void DiskII::decide_clocking_preference() {
}
bool DiskII::is_write_protected() const {
return (stepper_mask_ & 2) || drives_[active_drive_].get_is_read_only();
return (stepper_mask_ & 2) || drives_[active_drive_].is_read_only();
}
void DiskII::set_state_machine(const std::vector<uint8_t> &state_machine) {

View File

@@ -41,5 +41,5 @@ void DiskIIDrive::set_control_lines(const int lines) {
}
bool DiskIIDrive::read() {
return !!(stepper_mask_ & 2) || get_is_read_only();
return !!(stepper_mask_ & 2) || is_read_only();
}

View File

@@ -129,7 +129,7 @@ bool DoubleDensityDrive::read() {
case CA0|SEL: // Disk locked.
// (0 = write protected)
return !get_is_read_only();
return !is_read_only();
case CA1: // Disk motor running.
// (0 = motor on)
@@ -161,7 +161,7 @@ bool DoubleDensityDrive::read() {
case CA2|CA1: // Single- or double-sided drive.
// (0 = single sided)
return get_head_count() != 1;
return head_count() != 1;
case CA2|CA1|CA0: // "Present/HD" (per the Mac Plus ROM)
// (0 = ??HD??)