Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-02-13 02:30:32 +00:00
Code Issues Projects Releases Wiki Activity

swim3: Add enums and use them.

Browse Source
This commit is contained in:
joevt 2024-04-28 05:11:35 -07:00 committed by dingusdev
parent 2a92ce78f5
commit e72b571069
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devices/floppy/swim3.cpp
View File

@ -92,8 +92,8 @@ uint8_t Swim3Ctrl::read(uint8_t reg_offset)
case Swim3Reg::Setup:
return this->setup_reg;
case Swim3Reg::Handshake_Mode1:
if (this->mode_reg & 2) { // internal drive?
status_addr = ((this->mode_reg & 0x20) >> 2) | (this->phase_lines & 7);
if (this->mode_reg & SWIM3_DRIVE_1) { // internal drive?
status_addr = ((this->mode_reg & SWIM3_HEAD_SELECT) >> 2) | (this->phase_lines & 7);
rddata_val = this->int_drive->status(status_addr) & 1;
// transfer rddata_val to both bit 2 (RDDATA) and bit 3 (SENSE)
@ -140,14 +140,14 @@ void Swim3Ctrl::write(uint8_t reg_offset, uint8_t value)
case Swim3Reg::Phase:
this->phase_lines = value & 0xF;
if (this->phase_lines & 8) { // CA3 aka LSTRB high -> sending a command to the drive
if (this->mode_reg & 2) { // if internal drive is selected
if (this->mode_reg & SWIM3_DRIVE_1) { // if internal drive is selected
this->int_drive->command(
((this->mode_reg & 0x20) >> 3) | (this->phase_lines & 3),
((this->mode_reg & SWIM3_HEAD_SELECT) >> 3) | (this->phase_lines & 3),
(value >> 2) & 1
);
}
} else if (this->phase_lines == 4 && (this->mode_reg & 2)) {
status_addr = ((this->mode_reg & 0x20) >> 2) | (this->phase_lines & 7);
} else if (this->phase_lines == 4 && (this->mode_reg & SWIM3_DRIVE_1)) {
status_addr = ((this->mode_reg & SWIM3_HEAD_SELECT) >> 2) | (this->phase_lines & 7);
this->rd_line = this->int_drive->status(status_addr) & 1;
}
break;
@ -239,7 +239,7 @@ void Swim3Ctrl::start_stepping()
return;
}
if ((((this->mode_reg & 0x20) >> 3) | (this->phase_lines & 3))
if ((((this->mode_reg & SWIM3_HEAD_SELECT) >> 3) | (this->phase_lines & 3))
!= MacSuperdrive::CommandAddr::Do_Step) {
LOG_F(WARNING, "SWIM3: invalid command address on the phase lines!");
return;

13
devices/floppy/swim3.h
View File

@ -57,10 +57,14 @@ enum Swim3Reg : uint8_t {
/** Mode register bits. */
enum {
SWIM3_INT_ENA = 0x01,
SWIM3_GO = 0x08,
SWIM3_WR_MODE = 0x10,
SWIM3_GO_STEP = 0x80,
SWIM3_INT_ENA = 0x01,
SWIM3_DRIVE_1 = 0x02,
SWIM3_DRIVE_2 = 0x04,
SWIM3_GO = 0x08,
SWIM3_WR_MODE = 0x10,
SWIM3_HEAD_SELECT = 0x20,
SWIM3_FORMAT_MODE = 0x40,
SWIM3_GO_STEP = 0x80,
};
/** Interrupt flags. */
@ -69,6 +73,7 @@ enum {
INT_STEP_DONE = 0x02,
INT_ID_READ = 0x04,
INT_SECT_DONE = 0x08,
INT_SENSE = 0x10, // unused by SWIM3 driver
};
// SWIM3 internal states.