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

AHA-1542CP and ISA PnP memory range fixes, fixes AHA-1542CP on Packard Bell PB450.

Browse Source
This commit is contained in:
OBattler
2025-01-07 02:42:09 +01:00
parent e833e1da3f
commit c3faf20226
2 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/device/isapnp.c
View File

@@ -137,6 +137,8 @@ isapnp_device_config_changed(isapnp_card_t *card, isapnp_device_t *ld)
card->config.mem[i].size = (ld->regs[reg_base + 3] << 16) | (ld->regs[reg_base + 4] << 8); card->config.mem[i].size = (ld->regs[reg_base + 3] << 16) | (ld->regs[reg_base + 4] << 8);
if (ld->regs[reg_base + 2] & 0x01) /* upper limit */ if (ld->regs[reg_base + 2] & 0x01) /* upper limit */
card->config.mem[i].size -= card->config.mem[i].base; card->config.mem[i].size -= card->config.mem[i].base;
else
card->config.mem[i].size = (card->config.mem[i].size | 0xff) ^ 0xffffffff;
} }
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 4; i++) {
reg_base = (i == 0) ? 0x76 : (0x80 + (16 * i)); reg_base = (i == 0) ? 0x76 : (0x80 + (16 * i));
@@ -789,10 +791,25 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
break; break;
} }
isapnp_log("ISAPnP: >>%s Memory range %d with %d bytes at %06X-%06X, align %d", isapnp_log("ISAPnP: >>%s Memory range %d with %d bytes at %06X-%06X to %06X-%06X, align %d",
in_df ? ">" : "", mem_range, /* %s */ in_df ? ">" : "",
*((uint16_t *) &card->rom[i + 10]) << 8, *((uint16_t *) &card->rom[i + 4]) << 8, ((card->rom[i + 3] & 0x4) ? 0 : (*((uint16_t *) &card->rom[i + 4]) << 8)) + (*((uint16_t *) &card->rom[i + 6]) << 8), /* %d */ mem_range,
(*((uint16_t *) &card->rom[i + 8]) + 1) << 16); /* %d */ *((uint16_t *) &card->rom[i + 8]),
/* %06X */ *((uint16_t *) &card->rom[i + 4]) << 8,
/* %06X */ ((card->rom[i + 3] & 0x4) ?
/* High address. */
(*((uint16_t *) &card->rom[i + 10]) << 8) :
/* Range. */
(*((uint16_t *) &card->rom[i + 4]) << 8)) +
(*((uint16_t *) &card->rom[i + 10]) << 8),
/* %06X */ *((uint16_t *) &card->rom[i + 6]) << 8,
/* %06X */ ((card->rom[i + 3] & 0x4) ?
/* High address. */
(*((uint16_t *) &card->rom[i + 10]) << 8) :
/* Range. */
(*((uint16_t *) &card->rom[i + 6]) << 8)) +
(*((uint16_t *) &card->rom[i + 10]) << 8),
/* %d */ *((uint16_t *) &card->rom[i + 8]));
res = 1 << mem_range; res = 1 << mem_range;
mem_range++; mem_range++;
} else { } else {
@@ -806,9 +823,25 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
break; break;
} }
isapnp_log("ISAPnP: >>%s 32-bit memory range %d with %d bytes at %08X-%08X, align %d", in_df ? ">" : "", mem_range_32, isapnp_log("ISAPnP: >>%s 32-bit memory range %d with %d bytes at %08X-%08X, align %d",
*((uint32_t *) &card->rom[i + 16]) << 8, *((uint32_t *) &card->rom[i + 4]) << 8, ((card->rom[i + 3] & 0x4) ? 0 : (*((uint32_t *) &card->rom[i + 4]) << 8)) + (*((uint32_t *) &card->rom[i + 8]) << 8), /* %s */ in_df ? ">" : "",
*((uint32_t *) &card->rom[i + 12])); /* %d */ mem_range_32,
/* %d */ *((uint32_t *) &card->rom[i + 12]),
/* %08X */ *((uint32_t *) &card->rom[i + 4]),
/* %08X */ ((card->rom[i + 3] & 0x4) ?
/* High address. */
*((uint32_t *) &card->rom[i + 16]) :
/* Range. */
*((uint32_t *) &card->rom[i + 4])) +
*((uint32_t *) &card->rom[i + 16]),
/* %08X */ *((uint32_t *) &card->rom[i + 8]),
/* %08X */ ((card->rom[i + 3] & 0x4) ?
/* High address. */
*((uint32_t *) &card->rom[i + 16]) :
/* Range. */
*((uint32_t *) &card->rom[i + 8])) +
*((uint32_t *) &card->rom[i + 16]),
/* %d */ *((uint32_t *) &card->rom[i + 12]));
res = 1 << (4 + mem_range_32); res = 1 << (4 + mem_range_32);
mem_range_32++; mem_range_32++;
} }

8
src/scsi/scsi_aha154x.c
View File

@@ -678,6 +678,7 @@ aha_pnp_config_changed(uint8_t ld, isapnp_device_config_t *config, void *priv)
aha_eeprom_save(dev); aha_eeprom_save(dev);
dev->rom_addr = config->mem[0].base; dev->rom_addr = config->mem[0].base;
aha_log("Base = %08X, Size = %08X\n", config->mem[0].base, config->mem[0].size);
if (dev->rom_addr) { if (dev->rom_addr) {
mem_mapping_enable(&dev->bios.mapping); mem_mapping_enable(&dev->bios.mapping);
aha_log("SCSI BIOS set to: %08X-%08X\n", dev->rom_addr, dev->rom_addr + config->mem[0].size - 1); aha_log("SCSI BIOS set to: %08X-%08X\n", dev->rom_addr, dev->rom_addr + config->mem[0].size - 1);
@@ -869,13 +870,12 @@ aha_setmcode(x54x_t *dev)
} }
aha1542cp_pnp_rom = (uint8_t *) malloc(dev->pnp_len + 7); aha1542cp_pnp_rom = (uint8_t *) malloc(dev->pnp_len + 7);
fseek(fp, dev->pnp_offset, SEEK_SET); fseek(fp, dev->pnp_offset, SEEK_SET);
(void) !fread(aha1542cp_pnp_rom, dev->pnp_len, 1, fp); (void) !fread(aha1542cp_pnp_rom, 4, 1, fp);
memset(&(aha1542cp_pnp_rom[4]), 0x00, 5); memset(&(aha1542cp_pnp_rom[4]), 0x00, 5);
fseek(fp, dev->pnp_offset + 4, SEEK_SET); fseek(fp, dev->pnp_offset + 4, SEEK_SET);
(void) !fread(&(aha1542cp_pnp_rom[9]), dev->pnp_len - 4, 1, fp); (void) !fread(&(aha1542cp_pnp_rom[9]), dev->pnp_len - 4, 1, fp);
/* Even the real AHA-1542CP microcode seem to be flipping bit /* Patch determined from Dizzy's AHA-1542CP PNP ROM dump. */
4 to not erroneously indicate there is a range length. */ aha1542cp_pnp_rom[0x26] = 0x03;
aha1542cp_pnp_rom[0x87] |= 0x04;
/* Insert the terminator and the checksum byte that will later /* Insert the terminator and the checksum byte that will later
be filled in by the isapnp code. */ be filled in by the isapnp code. */
aha1542cp_pnp_rom[dev->pnp_len + 5] = 0x79; aha1542cp_pnp_rom[dev->pnp_len + 5] = 0x79;