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

Inquiry cmd fixed

Browse Source
This commit is contained in:
dingusdev 2022-10-26 09:30:05 -07:00
parent f792b38ea3
commit 2065f3588b
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
devices/common/scsi/scsi_hd.cpp
View File

@ -73,7 +73,7 @@ void ScsiHardDisk::process_command(uint8_t* cmd) {
req_sense(alloc_len);
case ScsiCommand::INQUIRY:
alloc_len = (cmd[3] << 8) + cmd[4];
req_sense(alloc_len);
inquiry(alloc_len);
case ScsiCommand::READ_6:
lba = ((cmd[1] & 0x1F) << 16) + (cmd[2] << 8) + cmd[3];
transfer_len = cmd[4];
@ -123,17 +123,22 @@ int ScsiHardDisk::req_sense(uint16_t alloc_len) {
return ScsiError::NO_ERROR; // placeholder - no sense
}
void ScsiHardDisk::inquiry() {
uint8_t empty_filler[1 << 17] = {0x0};
memcpy(img_buffer, empty_filler, (1 << 17));
img_buffer[2] = 0x1;
img_buffer[3] = 0x2;
img_buffer[4] = 0x31;
img_buffer[7] = 0x1C;
memcpy(img_buffer + 8, vendor_info, 8);
memcpy(img_buffer + 16, prod_info, 16);
memcpy(img_buffer + 32, rev_info, 8);
memcpy(img_buffer + 40, serial_info, 8);
void ScsiHardDisk::inquiry(uint16_t alloc_len) {
if (alloc_len >= 48) {
uint8_t empty_filler[1 << 17] = {0x0};
memcpy(img_buffer, empty_filler, (1 << 17));
img_buffer[2] = 0x1;
img_buffer[3] = 0x2;
img_buffer[4] = 0x31;
img_buffer[7] = 0x1C;
memcpy(img_buffer + 8, vendor_info, 8);
memcpy(img_buffer + 16, prod_info, 16);
memcpy(img_buffer + 32, rev_info, 8);
memcpy(img_buffer + 40, serial_info, 8);
}
else {
LOG_F(WARNING, "Inappropriate Allocation Length: %d", alloc_len);
}
}
int ScsiHardDisk::send_diagnostic() {

2
devices/common/scsi/scsi_hd.h
View File

@ -45,7 +45,7 @@ public:
void mode_sense_6(uint8_t page_code, uint8_t subpage_code, uint8_t alloc_len);
void format();
void inquiry();
void inquiry(uint16_t alloc_len);
void read_capacity_10();
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);