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

The SCSI controller now use TIMER_USEC based time.

Browse Source
This commit is contained in:
OBattler
2017-08-09 20:03:15 +02:00
parent aad11eac50
commit c77e04461a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scsi_aha154x.c
View File

@@ -1375,7 +1375,7 @@ aha_write(uint16_t port, uint8_t val, void *priv)
/* If there are no mailboxes configured, don't even try to do anything. */
if (dev->MailboxCount) {
if (!AHA_Callback) {
AHA_Callback = SCSI_DELAY_TM * SCSI_TIME;
AHA_Callback = 1 * TIMER_USEC;
}
}
return;
@@ -2110,7 +2110,7 @@ aha_cmd_cb(void *priv)
if (dev->MailboxCount) {
aha_do_mail(dev);
} else {
AHA_Callback += SCSI_DELAY_TM * SCSI_TIME;
AHA_Callback += 1 * TIMER_USEC;
return;
}
} else if (AHA_InOperation == 1) {
@@ -2119,7 +2119,7 @@ aha_cmd_cb(void *priv)
if (dev->Req.CmdBlock.common.Cdb[0] == 0x42)
{
/* This is needed since CD Audio inevitably means READ SUBCHANNEL spam. */
AHA_Callback += 1000 * SCSI_TIME;
AHA_Callback += 1000 * TIMER_USEC;
return;
}
} else if (AHA_InOperation == 2) {
@@ -2132,7 +2132,7 @@ aha_cmd_cb(void *priv)
fatal("Invalid BusLogic callback phase: %i\n", AHA_InOperation);
}
AHA_Callback += SCSI_DELAY_TM * SCSI_TIME;
AHA_Callback += 1 * TIMER_USEC;
}
uint8_t aha_mca_read(int port, void *p)

8
src/scsi_buslogic.c
View File

@@ -1080,7 +1080,7 @@ BuslogicWrite(uint16_t Port, uint8_t Val, void *p)
/* If there are no mailboxes configured, don't even try to do anything. */
if (bl->MailboxCount) {
if (!BuslogicCallback) {
BuslogicCallback = 50 * SCSI_TIME;
BuslogicCallback = 1 * TIMER_USEC;
}
}
return;
@@ -1996,7 +1996,7 @@ BuslogicCommandCallback(void *p)
if (bl->MailboxCount) {
BuslogicProcessMailbox(bl);
} else {
BuslogicCallback += 50 * SCSI_TIME;
BuslogicCallback += 1 * TIMER_USEC;
return;
}
} else if (BuslogicInOperation == 1) {
@@ -2005,7 +2005,7 @@ BuslogicCommandCallback(void *p)
if (bl->Req.CmdBlock.common.Cdb[0] == 0x42)
{
/* This is needed since CD Audio inevitably means READ SUBCHANNEL spam. */
BuslogicCallback += 1000 * SCSI_TIME;
BuslogicCallback += 1000 * TIMER_USEC;
return;
}
} else if (BuslogicInOperation == 2) {
@@ -2018,7 +2018,7 @@ BuslogicCommandCallback(void *p)
fatal("Invalid BusLogic callback phase: %i\n", BuslogicInOperation);
}
BuslogicCallback += 50 * SCSI_TIME;
BuslogicCallback += 1 * TIMER_USEC;
}