claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Removed the last vestiges of non-abstracted behavior from scsi_buslogic.c, except for the initialization stuff that has to be moved to scsi.c but I'll only be able to do it when I can work on scsi_aha154x.c to avoid double SCSI device initialization.

Browse Source
This commit is contained in:
OBattler
2017-08-22 05:51:10 +02:00
parent 935f36f80b
commit 6cbf1a1c5a
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/scsi_buslogic.c
View File

@@ -1128,7 +1128,7 @@ BuslogicSCSIBIOSRequestSetup(Buslogic_t *bl, uint8_t *CmdBuf, uint8_t *DataInBuf
BuslogicSCSIBIOSDataBufferAllocate(ESCSICmd, ESCSICmd->TargetId, ESCSICmd->LogicalUnit); BuslogicSCSIBIOSDataBufferAllocate(ESCSICmd, ESCSICmd->TargetId, ESCSICmd->LogicalUnit);
if (SCSIDevices[ESCSICmd->TargetId][ESCSICmd->LogicalUnit].LunType == SCSI_NONE) { if (!scsi_device_present(ESCSICmd->TargetId, ESCSICmd->LogicalUnit)) {
SpecificLog("SCSI Target ID %i and LUN %i have no device attached\n",ESCSICmd->TargetId,ESCSICmd->LogicalUnit); SpecificLog("SCSI Target ID %i and LUN %i have no device attached\n",ESCSICmd->TargetId,ESCSICmd->LogicalUnit);
BuslogicSCSIBIOSDataBufferFree(ESCSICmd, ESCSICmd->TargetId, ESCSICmd->LogicalUnit); BuslogicSCSIBIOSDataBufferFree(ESCSICmd, ESCSICmd->TargetId, ESCSICmd->LogicalUnit);
/* BuslogicSCSIBIOSSenseBufferFree(ESCSICmd, Id, Lun, 0, 0); */ /* BuslogicSCSIBIOSSenseBufferFree(ESCSICmd, Id, Lun, 0, 0); */
@@ -1178,9 +1178,6 @@ BuslogicSCSIBIOSRequestSetup(Buslogic_t *bl, uint8_t *CmdBuf, uint8_t *DataInBuf
DataInBuf[3] = SCSI_STATUS_CHECK_CONDITION; DataInBuf[3] = SCSI_STATUS_CHECK_CONDITION;
} }
/* BuslogicInOperation = (SCSIDevices[Id][Lun].LunType == SCSI_DISK) ? 0x13 : 3; */
pclog("SCSI (%i:%i) -> %i\n", ESCSICmd->TargetId, ESCSICmd->LogicalUnit, SCSIDevices[ESCSICmd->TargetId][ESCSICmd->LogicalUnit].LunType);
bl->DataReplyLeft = DataReply; bl->DataReplyLeft = DataReply;
} }
@@ -1875,7 +1872,7 @@ BuslogicWrite(uint16_t Port, uint8_t Val, void *p)
for (i=0; i<8; i++) { for (i=0; i<8; i++) {
bl->DataBuf[i] = 0; bl->DataBuf[i] = 0;
for (j=0; j<8; j++) { for (j=0; j<8; j++) {
if (SCSIDevices[i][j].LunType != SCSI_NONE) if (scsi_device_present(i, j))
bl->DataBuf[i] |= (1 << j); bl->DataBuf[i] |= (1 << j);
} }
} }
@@ -1972,7 +1969,7 @@ BuslogicWrite(uint16_t Port, uint8_t Val, void *p)
for (i = 8; i < 15; i++) { for (i = 8; i < 15; i++) {
bl->DataBuf[i-8] = 0; bl->DataBuf[i-8] = 0;
for (j=0; j<8; j++) { for (j=0; j<8; j++) {
if (SCSIDevices[i][j].LunType != SCSI_NONE) if (scsi_device_present(i, j))
bl->DataBuf[i-8] |= (1<<j); bl->DataBuf[i-8] |= (1<<j);
} }
} }
@@ -1985,7 +1982,7 @@ BuslogicWrite(uint16_t Port, uint8_t Val, void *p)
uint16_t TargetsPresentMask = 0; uint16_t TargetsPresentMask = 0;
for (i=0; i<15; i++) { for (i=0; i<15; i++) {
if (SCSIDevices[i][0].LunType != SCSI_NONE) if (scsi_device_present(i, j))
TargetsPresentMask |= (1 << i); TargetsPresentMask |= (1 << i);
} }
bl->DataBuf[0] = TargetsPresentMask & 0xFF; bl->DataBuf[0] = TargetsPresentMask & 0xFF;
@@ -2417,8 +2414,7 @@ BuslogicSCSIRequestSetup(Buslogic_t *bl, uint32_t CCBPointer, Mailbox32_t *Mailb
req->CmdBlock.common.ControlByte); req->CmdBlock.common.ControlByte);
} }
BuslogicInOperation = (SCSIDevices[Id][Lun].LunType == SCSI_DISK) ? 0x11 : 1; BuslogicInOperation = 1;
pclog("SCSI (%i:%i) -> %i\n", Id, Lun, SCSIDevices[Id][Lun].LunType);
} }
} }
@@ -2546,7 +2542,7 @@ BuslogicCommandCallback(void *p)
return; return;
} }
} else if (BuslogicInOperation == 1) { } else if (BuslogicInOperation == 1) {
pclog("BusLogic Callback: Process CD-ROM request\n"); pclog("BusLogic Callback: Process SCSI request\n");
BuslogicSCSICommand(bl); BuslogicSCSICommand(bl);
if (bl->Req.CmdBlock.common.Cdb[0] == 0x42) if (bl->Req.CmdBlock.common.Cdb[0] == 0x42)
{ {
@@ -2557,9 +2553,6 @@ BuslogicCommandCallback(void *p)
} else if (BuslogicInOperation == 2) { } else if (BuslogicInOperation == 2) {
pclog("BusLogic Callback: Send incoming mailbox\n"); pclog("BusLogic Callback: Send incoming mailbox\n");
BuslogicMailboxIn(bl); BuslogicMailboxIn(bl);
} else if (BuslogicInOperation == 0x11) {
pclog("BusLogic Callback: Process hard disk request\n");
BuslogicSCSICommand(bl);
} else { } else {
fatal("Invalid BusLogic callback phase: %i\n", BuslogicInOperation); fatal("Invalid BusLogic callback phase: %i\n", BuslogicInOperation);
} }