80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the Rancho RT1000A/B aspi manager loading (rtaspi10.sys).

Browse Source
This commit is contained in:
TC1995
2022-06-27 15:35:55 +02:00
parent 595e79d327
commit 0898913d05
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scsi/scsi_ncr5380.c
View File

@@ -749,6 +749,8 @@ ncr_read(uint16_t port, void *priv)
break; break;
case 2: /* Mode register */ case 2: /* Mode register */
if (((ncr->mode & 0x30) == 0x30) && (ncr_dev->type <= 1))
ncr->mode = 0;
ncr_log("Read: Mode register\n"); ncr_log("Read: Mode register\n");
ret = ncr->mode; ret = ncr->mode;
break; break;
@@ -764,6 +766,10 @@ ncr_read(uint16_t port, void *priv)
ncr_bus_read(ncr_dev); ncr_bus_read(ncr_dev);
ncr_log("NCR cur bus stat=%02x\n", ncr->cur_bus & 0xff); ncr_log("NCR cur bus stat=%02x\n", ncr->cur_bus & 0xff);
ret |= (ncr->cur_bus & 0xff); ret |= (ncr->cur_bus & 0xff);
if ((ncr->icr & ICR_SEL) && (ncr_dev->type != 3))
ret |= 0x02;
if ((ncr->icr & ICR_BSY) && (ncr_dev->type != 3))
ret |= 0x40;
break; break;
case 5: /* Bus and Status register */ case 5: /* Bus and Status register */
@@ -782,9 +788,9 @@ ncr_read(uint16_t port, void *priv)
ncr_bus_read(ncr_dev); ncr_bus_read(ncr_dev);
bus = ncr->cur_bus; bus = ncr->cur_bus;
if (bus & BUS_ACK) if ((bus & BUS_ACK) || ((ncr->icr & ICR_ACK) && (ncr_dev->type != 3)))
ret |= STATUS_ACK; ret |= STATUS_ACK;
if (bus & BUS_ATN) if ((bus & BUS_ATN) || ((ncr->icr & ICR_ATN) && (ncr_dev->type != 3)))
ret |= 0x02; ret |= 0x02;
if ((bus & BUS_REQ) && (ncr->mode & MODE_DMA)) { if ((bus & BUS_REQ) && (ncr->mode & MODE_DMA)) {
@@ -920,8 +926,6 @@ memio_write(uint32_t addr, uint8_t val, void *priv)
addr &= 0x3fff; addr &= 0x3fff;
ncr_log("memio_write(%08x,%02x) %i %02x\n", addr, val, ncr_dev->buffer_host_pos, ncr_dev->status_ctrl);
if (addr >= 0x3a00) if (addr >= 0x3a00)
ncr_dev->ext_ram[addr - 0x3a00] = val; ncr_dev->ext_ram[addr - 0x3a00] = val;
else switch (addr & 0x3f80) { else switch (addr & 0x3f80) {