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

The Adaptec AHA-154x/1640 SCSI controllers now return the correct sequence of bytes on base address + 3, fixes ASPI4DOS.SYS version 3.36.

Browse Source
This commit is contained in:
OBattler
2018-02-16 11:57:31 +01:00
parent 6cab207231
commit 86af6c6ac1
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/scsi/scsi_x54x.c
View File

@@ -11,7 +11,7 @@
* series of SCSI Host Adapters made by Mylex. * series of SCSI Host Adapters made by Mylex.
* These controllers were designed for various buses. * These controllers were designed for various buses.
* *
* Version: @(#)scsi_x54x.c 1.0.11 2018/01/06 * Version: @(#)scsi_x54x.c 1.0.12 2018/02/15
* *
* Authors: TheCollector1995, <mariogplayer@gmail.com> * Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1372,7 +1372,17 @@ x54x_in(uint16_t port, void *priv)
break; break;
case 3: case 3:
if (dev->int_geom_writable)
ret = dev->Geometry; ret = dev->Geometry;
else {
dev->Geometry++;
switch(dev->Geometry & 3) {
case 0: ret = 'A'; break;
case 1: ret = 'D'; break;
case 2: ret = 'A'; break;
case 3: ret = 'P'; break;
}
}
break; break;
} }
@@ -1433,7 +1443,11 @@ static void
x54x_reset(x54x_t *dev) x54x_reset(x54x_t *dev)
{ {
clear_irq(dev); clear_irq(dev);
if (dev->int_geom_writable)
dev->Geometry = 0x80; dev->Geometry = 0x80;
else
dev->Geometry = 0x00;
dev->Geometry = 0x00;
dev->Command = 0xFF; dev->Command = 0xFF;
dev->CmdParam = 0; dev->CmdParam = 0;
dev->CmdParamLeft = 0; dev->CmdParamLeft = 0;