Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-05-28 17:41:40 +00:00
Code Issues Projects Releases Wiki Activity

scsicdrom: Allow INQUIRY allocation length != 36.

Browse Source 
Truncate for < 36 and zero fill for > 36.
This commit is contained in:
joevt 2024-03-10 04:09:19 -07:00 committed by dingusdev
parent e872f08273
commit 274e380b34
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devices/common/scsi/scsicdrom.cpp
View File

@ -207,7 +207,7 @@ void ScsiCdrom::inquiry() {
}
if (alloc_len > 36) {
LOG_F(WARNING, "%s: more than 36 bytes requested in INQUIRY", this->name.c_str());
LOG_F(ERROR, "%s: more than 36 bytes requested in INQUIRY", this->name.c_str());
}
this->data_buf[0] = 5; // device type: CD-ROM
@ -221,8 +221,17 @@ void ScsiCdrom::inquiry() {
std::memcpy(&this->data_buf[8], vendor_info, 8);
std::memcpy(&this->data_buf[16], prod_info, 16);
std::memcpy(&this->data_buf[32], rev_info, 4);
//std::memcpy(&this->data_buf[36], serial_number, 8);
//etc.
this->bytes_out = 36;
if (alloc_len < 36) {
LOG_F(ERROR, "Inappropriate Allocation Length: %d", alloc_len);
}
else {
bzero(&this->data_buf[36], alloc_len - 36);
}
this->bytes_out = alloc_len;
this->msg_buf[0] = ScsiMessage::COMMAND_COMPLETE;
this->switch_phase(ScsiPhase::DATA_IN);