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

The AHA and BusLogic SCSI controllers now again correctly set the INIT flag on controller hard reset, fixes their NT drivers.

Browse Source
This commit is contained in:
OBattler
2017-10-17 00:49:32 +02:00
parent 49ccbd680f
commit 52eca87ae1
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scsi/scsi_aha154x.c
View File

@@ -66,6 +66,7 @@ uint16_t aha_ports[] = {
}; };
#pragma pack(push,1)
typedef struct { typedef struct {
uint8_t CustomerSignature[20]; uint8_t CustomerSignature[20];
uint8_t uAutoRetry; uint8_t uAutoRetry;
@@ -74,6 +75,7 @@ typedef struct {
uint8_t uUnknown; uint8_t uUnknown;
addr24 BIOSMailboxAddress; addr24 BIOSMailboxAddress;
} aha_setup_t; } aha_setup_t;
#pragma pack(pop)
#ifdef ENABLE_AHA154X_LOG #ifdef ENABLE_AHA154X_LOG

2
src/scsi/scsi_buslogic.c
View File

@@ -208,6 +208,7 @@ typedef struct {
} MailboxInitExtended_t; } MailboxInitExtended_t;
#pragma pack(pop) #pragma pack(pop)
#pragma pack(push,1)
typedef struct { typedef struct {
rom_t bios; rom_t bios;
int ExtendedLUNCCBFormat; int ExtendedLUNCCBFormat;
@@ -223,6 +224,7 @@ typedef struct {
uint8_t AutoSCSIROM[32768]; uint8_t AutoSCSIROM[32768];
uint8_t SCAMData[65536]; uint8_t SCAMData[65536];
} buslogic_data_t; } buslogic_data_t;
#pragma pack(pop)
enum { enum {

12
src/scsi/scsi_x54x.c
View File

@@ -1450,8 +1450,7 @@ x54x_reset_poll(void *priv)
{ {
x54x_t *dev = (x54x_t *)priv; x54x_t *dev = (x54x_t *)priv;
dev->Status &= ~STAT_STST; dev->Status = STAT_INIT | STAT_IDLE;
dev->Status |= STAT_IDLE;
dev->ResetCB = 0LL; dev->ResetCB = 0LL;
} }
@@ -1661,6 +1660,7 @@ x54x_out(uint16_t port, uint8_t val, void *priv)
case CMD_INQUIRY: /* Inquiry */ case CMD_INQUIRY: /* Inquiry */
memcpy(dev->DataBuf, dev->fw_rev, 4); memcpy(dev->DataBuf, dev->fw_rev, 4);
x54x_log("Adapter inquiry: %c %c %c %c\n", dev->fw_rev[0], dev->fw_rev[1], dev->fw_rev[2], dev->fw_rev[3]);
dev->DataReplyLeft = 4; dev->DataReplyLeft = 4;
break; break;
@@ -1699,13 +1699,14 @@ x54x_out(uint16_t port, uint8_t val, void *priv)
case CMD_RETDEVS: /* return Installed Devices */ case CMD_RETDEVS: /* return Installed Devices */
memset(dev->DataBuf, 0x00, 8); memset(dev->DataBuf, 0x00, 8);
if (dev->ven_get_host_id)
host_id = dev->ven_get_host_id(dev);
for (i=0; i<SCSI_ID_MAX; i++) { for (i=0; i<SCSI_ID_MAX; i++) {
dev->DataBuf[i] = 0x00; dev->DataBuf[i] = 0x00;
/* Skip the HA .. */ /* Skip the HA .. */
if (dev->ven_get_host_id)
host_id = dev->ven_get_host_id(dev);
if (i == host_id) continue; if (i == host_id) continue;
for (j=0; j<SCSI_LUN_MAX; j++) { for (j=0; j<SCSI_LUN_MAX; j++) {
@@ -1735,6 +1736,7 @@ x54x_out(uint16_t port, uint8_t val, void *priv)
dev->DataBuf[2] = dev->ven_get_host_id(dev); dev->DataBuf[2] = dev->ven_get_host_id(dev);
else else
dev->DataBuf[2] = dev->HostID; dev->DataBuf[2] = dev->HostID;
x54x_log("Configuration data: %02X %02X %02X\n", dev->DataBuf[0], dev->DataBuf[1], dev->DataBuf[2]);
dev->DataReplyLeft = 3; dev->DataReplyLeft = 3;
break; break;