Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-08-07 17:25:08 +00:00
Code Issues Projects Releases Wiki Activity

scsihd: Reorder switch statement.

Browse Source 
Order by case value to match scsicdrom.
This commit is contained in:
joevt
2024-03-09 23:51:07 -08:00
committed by dingusdev
parent da9770c99b
commit e51bc0cea5
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,9 +81,6 @@ void ScsiHardDisk::process_command() {
case ScsiCommand::FORMAT_UNIT: case ScsiCommand::FORMAT_UNIT:
this->format(); this->format();
break; break;
case ScsiCommand::INQUIRY:
this->inquiry();
break;
case ScsiCommand::READ_BLK_LIMITS: case ScsiCommand::READ_BLK_LIMITS:
this->illegal_command(cmd); this->illegal_command(cmd);
break; break;
@@ -92,25 +89,17 @@ void ScsiHardDisk::process_command() {
transfer_len = cmd[4]; transfer_len = cmd[4];
read(lba, transfer_len, 6); read(lba, transfer_len, 6);
break; 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);
break;
case ScsiCommand::WRITE_6: case ScsiCommand::WRITE_6:
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3]; lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
transfer_len = cmd[4]; transfer_len = cmd[4];
write(lba, transfer_len, 6); write(lba, transfer_len, 6);
break; 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);
this->switch_phase(ScsiPhase::DATA_OUT);
break;
case ScsiCommand::SEEK_6: case ScsiCommand::SEEK_6:
this->illegal_command(cmd); this->illegal_command(cmd);
break; break;
case ScsiCommand::INQUIRY:
this->inquiry();
break;
case ScsiCommand::VERIFY_6: case ScsiCommand::VERIFY_6:
this->illegal_command(cmd); this->illegal_command(cmd);
break; break;
@@ -138,6 +127,17 @@ void ScsiHardDisk::process_command() {
case ScsiCommand::READ_CAPACITY_10: case ScsiCommand::READ_CAPACITY_10:
this->read_capacity_10(); this->read_capacity_10();
break; 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);
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);
this->switch_phase(ScsiPhase::DATA_OUT);
break;
case ScsiCommand::VERIFY_10: case ScsiCommand::VERIFY_10:
this->illegal_command(cmd); this->illegal_command(cmd);
break; break;