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

Start fix for SCSI Hard Drive

Browse Source
This commit is contained in:
dingusdev 2023-08-02 07:53:19 -07:00
parent a7601c36bd
commit b23bb04dac
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,8 +92,7 @@ void ScsiHardDisk::process_command() {
req_sense(alloc_len); req_sense(alloc_len);
break; break;
case ScsiCommand::INQUIRY: case ScsiCommand::INQUIRY:
alloc_len = (cmd[3] << 8) + cmd[4]; this->inquiry();
inquiry(alloc_len);
break; break;
case ScsiCommand::READ_6: case ScsiCommand::READ_6:
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3]; lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
@ -125,13 +124,10 @@ void ScsiHardDisk::process_command() {
mode_select_6(param_len); mode_select_6(param_len);
break; break;
case ScsiCommand::MODE_SENSE_6: case ScsiCommand::MODE_SENSE_6:
page_code = cmd[2] & 0x1F; this->mode_sense_6();
subpage_code = cmd[3];
alloc_len = cmd[4];
mode_sense_6(page_code, subpage_code, alloc_len);
break; break;
case ScsiCommand::READ_CAPACITY_10: case ScsiCommand::READ_CAPACITY_10:
read_capacity_10(); this->read_capacity_10();
break; break;
default: default:
LOG_F(WARNING, "SCSI_HD: unrecognized command: %x", cmd[0]); LOG_F(WARNING, "SCSI_HD: unrecognized command: %x", cmd[0]);
@ -180,18 +176,31 @@ int ScsiHardDisk::req_sense(uint16_t alloc_len) {
return ScsiError::NO_ERROR; // placeholder - no sense return ScsiError::NO_ERROR; // placeholder - no sense
} }
void ScsiHardDisk::inquiry(uint16_t alloc_len) { void ScsiHardDisk::inquiry() {
if (alloc_len >= 48) { int page_num = cmd_buf[2];
uint8_t empty_filler[1 << 17] = {0x0}; int alloc_len = cmd_buf[4];
std::memcpy(img_buffer, empty_filler, (1 << 17));
img_buffer[2] = 0x1; if (page_num) {
img_buffer[3] = 0x2; ABORT_F("SCSI_CDROM: invalid page number in INQUIRY");
img_buffer[4] = 0x31; }
img_buffer[7] = 0x1C;
if (alloc_len >= 36) {
this->img_buffer[0] = 0; // device type: Direct-access block device (hard drive)
this->img_buffer[1] = 0x80; // removable media
this->img_buffer[2] = 2; // ANSI version: SCSI-2
this->img_buffer[3] = 1; // response data format
this->img_buffer[4] = 0x1F; // additional length
this->img_buffer[5] = 0;
this->img_buffer[6] = 0;
this->img_buffer[7] = 0x18; // supports synchronous xfers and linked commands
std::memcpy(img_buffer + 8, vendor_info, 8); std::memcpy(img_buffer + 8, vendor_info, 8);
std::memcpy(img_buffer + 16, prod_info, 16); std::memcpy(img_buffer + 16, prod_info, 16);
std::memcpy(img_buffer + 32, rev_info, 8); std::memcpy(img_buffer + 32, rev_info, 4);
std::memcpy(img_buffer + 40, serial_info, 8);
this->bytes_out = 36;
this->msg_buf[0] = ScsiMessage::COMMAND_COMPLETE;
this->switch_phase(ScsiPhase::DATA_IN);
} }
else { else {
LOG_F(WARNING, "Inappropriate Allocation Length: %d", alloc_len); LOG_F(WARNING, "Inappropriate Allocation Length: %d", alloc_len);
@ -212,8 +221,9 @@ int ScsiHardDisk::mode_select_6(uint8_t param_len) {
} }
} }
void ScsiHardDisk::mode_sense_6(uint8_t page_code, uint8_t subpage_code, uint8_t alloc_len) { void ScsiHardDisk::mode_sense_6() {
LOG_F(WARNING, "Page Code %d; Subpage Code: %d", page_code, subpage_code); uint8_t page_code = this->cmd_buf[2] & 0x3F;
uint8_t alloc_len = this->cmd_buf[4];
} }
void ScsiHardDisk::read_capacity_10() { void ScsiHardDisk::read_capacity_10() {

8
devices/common/scsi/scsihd.h
View File

@ -51,9 +51,9 @@ protected:
int send_diagnostic(); int send_diagnostic();
int mode_select_6(uint8_t param_len); int mode_select_6(uint8_t param_len);
void mode_sense_6(uint8_t page_code, uint8_t subpage_code, uint8_t alloc_len); void mode_sense_6();
void format(); void format();
void inquiry(uint16_t alloc_len); void inquiry();
void read_capacity_10(); void read_capacity_10();
void read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len); void read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len);
void write(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len); void write(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len);
@ -65,6 +65,7 @@ private:
uint64_t img_size; uint64_t img_size;
int total_blocks; int total_blocks;
uint64_t file_offset = 0; uint64_t file_offset = 0;
int bytes_out = 0;
char img_buffer[1 << 21]; // TODO: add proper buffer management! char img_buffer[1 << 21]; // TODO: add proper buffer management!
@ -75,8 +76,7 @@ private:
//inquiry info //inquiry info
char vendor_info[8] = {'D', 'i', 'n', 'g', 'u', 's', 'D', '\0'}; char vendor_info[8] = {'D', 'i', 'n', 'g', 'u', 's', 'D', '\0'};
char prod_info[16] = {'E', 'm', 'u', 'l', 'a', 't', 'e', 'd', ' ', 'D', 'i', 's', 'k', '\0'}; char prod_info[16] = {'E', 'm', 'u', 'l', 'a', 't', 'e', 'd', ' ', 'D', 'i', 's', 'k', '\0'};
char rev_info[8] = {'d', 'i', '0', '0', '0', '0', '0', '1'}; char rev_info[4] = {'d', 'i', '0', '1'};
char serial_info[8] = {'0', '0', '0', '0', '0', '0', '0', '0'};
}; };
#endif // SCSI_HD_H #endif // SCSI_HD_H