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

The AHA/BusLogic reset controllers' BIOS commands now return 0x80 (no device present error) for CD-ROM drives if the device is market as not supporting CD-ROM boot, fixes sending of WRITE (10) to CD-ROM drives followed by hang;

Browse Source 
The CD-ROM and SCSI disk REQUEST SENSE commands no longer incorrectly set the phase to status;
REQUEST SENSE with non-data direction control byte is now treated as a request to send sense bytes from the command directly to the sense buffer;
SCSI and SLiRP threads now terminate themselves again when out of the while loop;
SCSI and SLiRP mutexes are now closed when the threads terminate themselves;
Fixed a bug causing the "Press F12+F8 or middle mouse button to release" string on the title bar to get corrupt.
This commit is contained in:
OBattler
2017-10-14 18:52:25 +02:00
parent 6eb9404d04
commit 7581474aab
8 changed files with 90 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scsi/scsi_aha154x.c
View File

@@ -225,7 +225,7 @@ aha_get_host_id(void *p)
{
x54x_t *dev = (x54x_t *)p;
return dev->nvr[0] & 3;
return dev->nvr[0] & 0x07;
}
@@ -234,7 +234,7 @@ aha_get_irq(void *p)
{
x54x_t *dev = (x54x_t *)p;
return (dev->nvr[1] & 0x0F) + 9;
return (dev->nvr[1] & 0x07) + 9;
}
@@ -243,7 +243,7 @@ aha_get_dma(void *p)
{
x54x_t *dev = (x54x_t *)p;
return (dev->nvr[1] & 0xF0) >> 4;
return (dev->nvr[1] >> 4) & 0x07;
}
@@ -628,9 +628,9 @@ aha_setbios(x54x_t *dev)
if (dev->bios_path == NULL) return;
/* Open the BIOS image file and make sure it exists. */
pclog("%s: loading BIOS from '%ls'\n", dev->name, dev->bios_path);
aha_log("%s: loading BIOS from '%ls'\n", dev->name, dev->bios_path);
if ((f = rom_fopen(dev->bios_path, L"rb")) == NULL) {
pclog("%s: BIOS ROM not found!\n", dev->name);
aha_log("%s: BIOS ROM not found!\n", dev->name);
return;
}
@@ -657,7 +657,7 @@ aha_setbios(x54x_t *dev)
dev->rom2 = NULL;
}
if (temp != 0) {
pclog("%s: BIOS ROM size invalid!\n", dev->name);
aha_log("%s: BIOS ROM size invalid!\n", dev->name);
free(dev->rom1);
if (dev->rom2 != NULL)
free(dev->rom2);
@@ -678,7 +678,7 @@ aha_setbios(x54x_t *dev)
if (temp <= 0x2000)
size = 0x2000;
mask = (size - 1);
pclog("%s: BIOS at 0x%06lX, size %lu, mask %08lx\n",
aha_log("%s: BIOS at 0x%06lX, size %lu, mask %08lx\n",
dev->name, dev->rom_addr, size, mask);
/* Initialize the ROM entry for this BIOS. */
@@ -711,7 +711,7 @@ aha_setbios(x54x_t *dev)
for (i=0; i<8; i++)
if (aha_ports[i] == dev->Base) break;
if (i == 8) {
pclog("%s: invalid I/O address %04x selected!\n",
aha_log("%s: invalid I/O address %04x selected!\n",
dev->name, dev->Base);
return;
}
@@ -791,6 +791,7 @@ aha_init(device_t *info)
dev->reset_duration = AHA_RESET_DURATION_US;
dev->max_id = 7;
dev->int_geom_writable = 0;
dev->cdrom_boot = 0;
dev->ven_thread = aha_thread;
dev->ven_cmd_is_fast = aha_cmd_is_fast;
@@ -845,6 +846,7 @@ aha_init(device_t *info)
dev->rom_shramsz = 128; /* size of shadow RAM */
dev->rom_ioaddr = 0x3F7E; /* [2:0] idx into addr table */
dev->rom_fwhigh = 0x0022; /* firmware version (hi/lo) */
dev->cdrom_boot = 1;
dev->ven_get_host_id = aha_get_host_id; /* function to return host ID from EEPROM */
dev->ven_get_irq = aha_get_irq; /* function to return IRQ from EEPROM */
dev->ven_get_dma = aha_get_dma; /* function to return DMA channel from EEPROM */