Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated to calculate the length of CA command

This commit is contained in:
Tony Kuker 2022-01-09 04:41:08 +00:00
parent f09fb6dd2f
commit d2123b2f86
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raspberrypi/controllers/sasidev_ctrl.cpp
View File

@ -1206,7 +1206,7 @@ bool SASIDEV::XferOut(bool cont)
case SASIDEV::eCmdUnknownPowerViewCA:
case SASIDEV::eCmdUnknownPowerViewCB:
case SASIDEV::eCmdUnknownPowerViewCC:
LOGWARN("Finished receiving a Powerview Command ($%02X) in %s", (WORD)ctrl.cmd[0] , __PRETTY_FUNCTION__)
LOGWARN("Finished receiving a Powerview Command ($%02X) in %s. Length: %08X (%d)", (WORD)ctrl.cmd[0] , __PRETTY_FUNCTION__, ctrl.length, ctrl.length);
return true;
break;
case SASIDEV::eCmdSetMcastAddr:

29
src/raspberrypi/devices/scsi_powerview.cpp
View File

@ -222,9 +222,34 @@ void SCSIPowerView::UnknownCommandCA(SASIDEV *controller)
{
// Set transfer amount
ctrl->length = ctrl->cmd[6];
// ctrl->length = ctrl->cmd[6];
uint16_t width_x = ctrl->cmd[5] + (ctrl->cmd[4] << 8);
uint16_t height_y = ctrl->cmd[7] + (ctrl->cmd[6] << 8);
ctrl->length = width_x * height_y;
// if(ctrl->cmd[9] == 0){
// ctrl->length = 0x9600;
// }
// else {
// ctrl->length = ctrl->cmd[7] * 2;
// }
LOGWARN("%s Message Length %d", __PRETTY_FUNCTION__, (int)ctrl->length);
dump_command(controller);
LOGWARN(" %02X%02X%02X%02X %02X%02X%02X%02X %02X%02X%02X [%02X %02X]\n",
ctrl->cmd[0],
ctrl->cmd[1],
ctrl->cmd[2],
ctrl->cmd[3],
ctrl->cmd[4],
ctrl->cmd[5],
ctrl->cmd[6],
ctrl->cmd[7],
ctrl->cmd[8],
ctrl->cmd[9],
ctrl->cmd[10],
ctrl->cmd[11],
ctrl->cmd[12]);
if (ctrl->length <= 0) {
// Failure (Error)
controller->Error();