Macintosh-Tools
/
dingusppc
mirror of https://github.com/dingusdev/dingusppc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsihd: Cleanup. 

Use this qualifier.
Use macros for reading 2 byte or 4 byte big endian data.
This commit is contained in:
joevt 2024-03-10 00:45:44 -08:00 committed by dingusdev
parent 44da89979f
commit a868f4eee4
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
devices/common/scsi/scsihd.cpp
View File

@ -51,12 +51,7 @@ void ScsiHardDisk::insert_image(std::string filename) {
}
void ScsiHardDisk::process_command() {
uint32_t lba = 0;
uint16_t transfer_len = 0;
uint16_t alloc_len = 0;
uint8_t page_code = 0;
uint8_t subpage_code = 0;
uint32_t lba;
this->pre_xfer_action = nullptr;
this->post_xfer_action = nullptr;
@ -69,14 +64,13 @@ void ScsiHardDisk::process_command() {
switch (cmd[0]) {
case ScsiCommand::TEST_UNIT_READY:
test_unit_ready();
this->test_unit_ready();
break;
case ScsiCommand::REWIND:
this->illegal_command(cmd);
break;
case ScsiCommand::REQ_SENSE:
alloc_len = cmd[4];
req_sense(alloc_len);
this->req_sense(cmd[4]);
break;
case ScsiCommand::FORMAT_UNIT:
this->format();
@ -86,13 +80,11 @@ void ScsiHardDisk::process_command() {
break;
case ScsiCommand::READ_6:
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
transfer_len = cmd[4];
read(lba, transfer_len, 6);
this->read(lba, cmd[4], 6);
break;
case ScsiCommand::WRITE_6:
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
transfer_len = cmd[4];
write(lba, transfer_len, 6);
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
this->write(lba, cmd[4], 6);
break;
case ScsiCommand::SEEK_6:
this->illegal_command(cmd);
@ -128,14 +120,12 @@ void ScsiHardDisk::process_command() {
this->read_capacity_10();
break;
case ScsiCommand::READ_10:
lba = (cmd[2] << 24) + (cmd[3] << 16) + (cmd[4] << 8) + cmd[5];
transfer_len = (cmd[7] << 8) + cmd[8];
read(lba, transfer_len, 10);
lba = READ_DWORD_BE_U(&cmd[2]);
this->read(lba, READ_WORD_BE_U(&cmd[7]), 10);
break;
case ScsiCommand::WRITE_10:
lba = (cmd[2] << 24) + (cmd[3] << 16) + (cmd[4] << 8) + cmd[5];
transfer_len = (cmd[7] << 8) + cmd[8];
write(lba, transfer_len, 10);
lba = READ_DWORD_BE_U(&cmd[2]);
this->write(lba, READ_WORD_BE_U(&cmd[7]), 10);
this->switch_phase(ScsiPhase::DATA_OUT);
break;
case ScsiCommand::VERIFY_10:
@ -192,7 +182,6 @@ bool ScsiHardDisk::prepare_data() {
LOG_F(WARNING, "%s: unexpected phase in prepare_data", this->name.c_str());
return false;
}
return true;
}
@ -273,10 +262,7 @@ void ScsiHardDisk::mode_sense_6() {
this->data_buf[ 2] = 0; // medium is write enabled
this->data_buf[ 3] = 8; // block description length
this->data_buf[ 4] = 0; // density code
this->data_buf[ 5] = (this->total_blocks >> 16) & 0xFFU;
this->data_buf[ 6] = (this->total_blocks >> 8) & 0xFFU;
this->data_buf[ 7] = (this->total_blocks ) & 0xFFU;
WRITE_DWORD_BE_A(&this->data_buf[4], this->total_blocks);
WRITE_DWORD_BE_A(&this->data_buf[8], this->sector_size);
this->data_buf[12] = page_code;
@ -333,15 +319,14 @@ void ScsiHardDisk::read_capacity_10() {
uint32_t last_lba = this->total_blocks - 1;
uint32_t blk_len = this->sector_size;
WRITE_DWORD_BE_A(&data_buf[0], last_lba);
WRITE_DWORD_BE_A(&data_buf[4], blk_len);
WRITE_DWORD_BE_A(&this->data_buf[0], last_lba);
WRITE_DWORD_BE_A(&this->data_buf[4], blk_len);
this->bytes_out = 8;
this->switch_phase(ScsiPhase::DATA_IN);
}
void ScsiHardDisk::format() {
LOG_F(WARNING, "%s: attempt to format the disk!", this->name.c_str());
@ -356,7 +341,7 @@ void ScsiHardDisk::format() {
void ScsiHardDisk::read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
uint32_t transfer_size = transfer_len;
std::memset(data_buf, 0, sizeof(data_buf));
std::memset(this->data_buf, 0, sizeof(this->data_buf));
if (cmd_len == 6 && transfer_len == 0) {
transfer_size = 256;
@ -365,7 +350,7 @@ void ScsiHardDisk::read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
transfer_size *= this->sector_size;
uint64_t device_offset = (uint64_t)lba * this->sector_size;
this->disk_img.read(data_buf, device_offset, transfer_size);
this->disk_img.read(this->data_buf, device_offset, transfer_size);
this->bytes_out = transfer_size;