Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-06-11 04:29:37 +00:00
Code Issues Projects Releases Wiki Activity

atabasedevice: rework task file registers.

Browse Source
This commit is contained in:
Maxim Poliakovski 2022-12-08 00:16:10 +01:00
parent 6173a782f2
commit df1a56305a
5 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
devices/common/ata/atabasedevice.cpp
View File

@ -37,36 +37,44 @@ AtaBaseDevice::AtaBaseDevice(const std::string name)
this->set_name(name);
supports_types(HWCompType::IDE_DEV);
regs[IDE_Reg::ERROR] = IDE_Error::ANMF;
regs[IDE_Reg::SEC_COUNT] = 0x1;
regs[IDE_Reg::SEC_NUM] = 0x1;
regs[IDE_Reg::STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
regs[IDE_Reg::ALT_STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
device_reset();
}
void AtaBaseDevice::device_reset()
{
this->r_error = 1; // Device 0 passed, Device 1 passed or not present
this->r_sect_count = 1;
this->r_sect_num = 1;
// set ATA protocol signature
this->r_cylinder_lo = 0;
this->r_cylinder_hi = 0;
this->r_status = IDE_Status::DRDY | IDE_Status::DSC;
}
uint16_t AtaBaseDevice::read(const uint8_t reg_addr) {
switch (reg_addr) {
case IDE_Reg::IDE_DATA:
LOG_F(0, "Retrieving DATA from IDE: %x", regs[IDE_Reg::IDE_DATA]);
return regs[IDE_Reg::IDE_DATA];
LOG_F(WARNING, "Retrieving data from %s", this->name.c_str());
return 0xFFFFU;
case IDE_Reg::ERROR:
return regs[IDE_Reg::ERROR];
return this->r_error;
case IDE_Reg::SEC_COUNT:
return regs[IDE_Reg::SEC_COUNT];
return this->r_sect_count;
case IDE_Reg::SEC_NUM:
return regs[IDE_Reg::SEC_NUM];
return this->r_sect_num;
case IDE_Reg::CYL_LOW:
return regs[IDE_Reg::CYL_LOW];
return this->r_cylinder_lo;
case IDE_Reg::CYL_HIGH:
return regs[IDE_Reg::CYL_HIGH];
case IDE_Reg::DRIVE_HEAD:
return regs[IDE_Reg::DRIVE_HEAD];
return this->r_cylinder_hi;
case IDE_Reg::DEVICE_HEAD:
return this->r_dev_head;
case IDE_Reg::STATUS:
return regs[IDE_Reg::STATUS];
// TODO: clear pending interrupt
return this->r_status;
case IDE_Reg::ALT_STATUS:
return regs[IDE_Reg::ALT_STATUS];
case IDE_Reg::TIME_CONFIG:
return regs[IDE_Reg::TIME_CONFIG];
return this->r_status;
default:
LOG_F(WARNING, "Attempted to read unknown IDE register: %x", reg_addr);
return 0;
@ -76,36 +84,34 @@ uint16_t AtaBaseDevice::read(const uint8_t reg_addr) {
void AtaBaseDevice::write(const uint8_t reg_addr, const uint16_t value) {
switch (reg_addr) {
case IDE_Reg::IDE_DATA:
regs[IDE_Reg::IDE_DATA] = value;
LOG_F(WARNING, "Pushing data to %s", this->name.c_str());
break;
case IDE_Reg::FEATURES:
regs[IDE_Reg::FEATURES] = value;
this->r_features = value;
break;
case IDE_Reg::SEC_COUNT:
regs[IDE_Reg::SEC_COUNT] = value;
this->r_sect_count = value;
break;
case IDE_Reg::SEC_NUM:
regs[IDE_Reg::SEC_NUM] = value;
this->r_sect_num = value;
break;
case IDE_Reg::CYL_LOW:
regs[IDE_Reg::CYL_LOW] = value;
this->r_cylinder_lo = value;
break;
case IDE_Reg::CYL_HIGH:
regs[IDE_Reg::CYL_HIGH] = value;
this->r_cylinder_hi = value;
break;
case IDE_Reg::DRIVE_HEAD:
regs[IDE_Reg::DRIVE_HEAD] = value;
case IDE_Reg::DEVICE_HEAD:
this->r_dev_head = value;
break;
case IDE_Reg::COMMAND:
regs[IDE_Reg::COMMAND] = value;
LOG_F(0, "Executing COMMAND for IDE: %x", value);
perform_command();
this->r_command = value;
if (is_selected()) {
perform_command();
}
break;
case IDE_Reg::DEV_CTRL:
regs[IDE_Reg::DEV_CTRL] = value;
break;
case IDE_Reg::TIME_CONFIG:
regs[IDE_Reg::TIME_CONFIG] = value;
this->r_dev_ctrl = value;
break;
default:
LOG_F(WARNING, "Attempted to write unknown IDE register: %x", reg_addr);

19
devices/common/ata/atabasedevice.h
View File

@ -40,8 +40,25 @@ public:
virtual int perform_command() = 0;
void device_reset();
private:
bool is_selected() { return ((this->r_dev_head >> 4) & 1) == this->my_dev_id; };
protected:
uint8_t regs[33] = {};
uint8_t my_dev_id = 0; // my IDE device ID configured by the host
// IDE aka task file registers
uint8_t r_error;
uint8_t r_features;
uint8_t r_sect_count;
uint8_t r_sect_num;
uint8_t r_cylinder_lo;
uint8_t r_cylinder_hi;
uint8_t r_dev_head;
uint8_t r_command;
uint8_t r_status;
uint8_t r_dev_ctrl;
};
#endif // ATA_BASE_DEVICE_H

2
devices/common/ata/atadefs.h
View File

@ -35,7 +35,7 @@ enum IDE_Reg : int {
SEC_NUM = 0x3, // sector number
CYL_LOW = 0x4, // cylinder low
CYL_HIGH = 0x5, // cylinder high
DRIVE_HEAD = 0x6, // drive/head
DEVICE_HEAD = 0x6, // device/head
STATUS = 0x7, // status (read)
COMMAND = 0x7, // command (write)
ALT_STATUS = 0x16, // alt status (read)

2
devices/common/ata/atahd.cpp
View File

@ -30,6 +30,6 @@ AtaHardDisk::AtaHardDisk() : AtaBaseDevice("ATA-HD")
int AtaHardDisk::perform_command()
{
LOG_F(INFO, "%s: command 0x%x requested", this->name.c_str(), regs[IDE_Reg::COMMAND]);
LOG_F(INFO, "%s: command 0x%x requested", this->name.c_str(), this->r_command);
return -1;
}

2
devices/common/ata/idechannel.cpp
View File

@ -52,7 +52,7 @@ uint16_t IdeChannel::read(const uint8_t reg_addr, const int size)
void IdeChannel::write(const uint8_t reg_addr, const uint16_t val, const int size)
{
// keep track of the currently selected device
if (reg_addr == IDE_Reg::DRIVE_HEAD) {
if (reg_addr == IDE_Reg::DEVICE_HEAD) {
this->cur_dev = (val >> 4) & 1;
}