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

AT NVR fixes for PIIX4.

Browse Source
This commit is contained in:
OBattler
2020-03-01 00:16:58 +01:00
parent 490c04fcae
commit 1972afd8aa
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvr_at.c
View File

@@ -286,12 +286,15 @@
#define RTC_CENTURY_VIA 0x7F /* century register for VIA VT82C586B */ #define RTC_CENTURY_VIA 0x7F /* century register for VIA VT82C586B */
#define RTC_REGS 14 /* number of registers */ #define RTC_REGS 14 /* number of registers */
#define FLAG_LS_HACK 0x01
#define FLAG_PIIX4 0x02
typedef struct { typedef struct {
int8_t stat; int8_t stat;
uint8_t cent; uint8_t cent;
uint8_t def, ls_hack; uint8_t def, flags;
uint8_t addr[8], wp[2]; uint8_t addr[8], wp[2];
@@ -585,7 +588,7 @@ nvr_write(uint16_t addr, uint8_t val, void *priv)
case 0x2e: case 0x2e:
case 0x2f: case 0x2f:
if (local->ls_hack) { if (local->flags & FLAG_LS_HACK) {
/* 2E and 2F are a simple sum of the values of 0E to 2D. */ /* 2E and 2F are a simple sum of the values of 0E to 2D. */
for (i = 0x0e; i < 0x2e; i++) for (i = 0x0e; i < 0x2e; i++)
checksum += (uint16_t) nvr->regs[i]; checksum += (uint16_t) nvr->regs[i];
@@ -622,6 +625,8 @@ nvr_write(uint16_t addr, uint8_t val, void *priv)
/* Some chipsets use a 256 byte NVRAM but ports 70h and 71h always access only 128 bytes. */ /* Some chipsets use a 256 byte NVRAM but ports 70h and 71h always access only 128 bytes. */
if (addr_id == 0x0) if (addr_id == 0x0)
local->addr[addr_id] &= 0x7f; local->addr[addr_id] &= 0x7f;
else if ((addr_id == 0x1) && (local->flags & FLAG_PIIX4))
local->addr[addr_id] = (local->addr[addr_id] & 0x7f) | 0x80;
if (!(machines[machine].flags & MACHINE_MCA) && if (!(machines[machine].flags & MACHINE_MCA) &&
!(machines[machine].flags & MACHINE_NONMI)) !(machines[machine].flags & MACHINE_NONMI))
nmi_mask = (~val & 0x80); nmi_mask = (~val & 0x80);
@@ -658,7 +663,7 @@ nvr_read(uint16_t addr, void *priv)
break; break;
case 0x2c: case 0x2c:
if (local->ls_hack) if (local->flags & FLAG_LS_HACK)
ret = nvr->regs[local->addr[addr_id]] & 0x7f; ret = nvr->regs[local->addr[addr_id]] & 0x7f;
else else
ret = nvr->regs[local->addr[addr_id]]; ret = nvr->regs[local->addr[addr_id]];
@@ -666,7 +671,7 @@ nvr_read(uint16_t addr, void *priv)
case 0x2e: case 0x2e:
case 0x2f: case 0x2f:
if (local->ls_hack) { if (local->flags & FLAG_LS_HACK) {
checksum = (nvr->regs[0x2e] << 8) | nvr->regs[0x2f]; checksum = (nvr->regs[0x2e] << 8) | nvr->regs[0x2f];
if (nvr->regs[0x2c] & 0x80) if (nvr->regs[0x2c] & 0x80)
checksum -= 0x80; checksum -= 0x80;
@@ -793,7 +798,7 @@ nvr_at_init(const device_t *info)
/* This is machine specific. */ /* This is machine specific. */
nvr->size = machines[machine].nvrmask + 1; nvr->size = machines[machine].nvrmask + 1;
local->def = 0x00; local->def = 0x00;
local->ls_hack = 0; local->flags = 0x00;
switch(info->local & 7) { switch(info->local & 7) {
case 0: /* standard AT, no century register */ case 0: /* standard AT, no century register */
nvr->irq = 8; nvr->irq = 8;
@@ -801,10 +806,12 @@ nvr_at_init(const device_t *info)
break; break;
case 5: /* Lucky Star LS-486E */ case 5: /* Lucky Star LS-486E */
local->ls_hack = 1; local->flags |= FLAG_LS_HACK;
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case 1: /* standard AT */ case 1: /* standard AT */
if (info->local == 9)
local->flags |= FLAG_PIIX4;
nvr->irq = 8; nvr->irq = 8;
local->cent = RTC_CENTURY_AT; local->cent = RTC_CENTURY_AT;
break; break;