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

A slight AT NVR code clean-up.

Browse Source
This commit is contained in:
OBattler
2021-08-24 21:11:47 +02:00
parent d30ad04a88
commit ccdf583b26
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nvr_at.c
View File

@@ -559,6 +559,26 @@ timer_tick(nvr_t *nvr)
} }
static void
nvr_reg_common_write(uint16_t reg, uint8_t val, nvr_t *nvr, local_t *local)
{
if ((reg == 0x2c) && (local->flags & FLAG_LS_HACK))
nvr->new = 0;
if ((reg == 0x52) && (local->flags & FLAG_APOLLO_HACK))
nvr->new = 0;
if ((reg >= 0x38) && (reg <= 0x3f) && local->wp[0])
return;
if ((reg >= 0xb8) && (reg <= 0xbf) && local->wp[1])
return;
if (local->lock[reg])
return;
if (nvr->regs[reg] != val) {
nvr->regs[reg] = val;
nvr_dosave = 1;
}
}
/* This must be exposed because ACPI uses it. */ /* This must be exposed because ACPI uses it. */
void void
nvr_reg_write(uint16_t reg, uint8_t val, void *priv) nvr_reg_write(uint16_t reg, uint8_t val, void *priv)
@@ -604,28 +624,17 @@ nvr_reg_write(uint16_t reg, uint8_t val, void *priv)
nvr->regs[0x2f] = checksum & 0xff; nvr->regs[0x2f] = checksum & 0xff;
break; break;
} }
/*FALLTHROUGH*/ nvr_reg_common_write(reg, val, nvr, local);
break;
case 0x32: case 0x32:
if ((reg == 0x32) && (local->cent == RTC_CENTURY_VIA) && local->wp_32) if ((reg == 0x32) && (local->cent == RTC_CENTURY_VIA) && local->wp_32)
break; break;
/* FALLTHROUGH */ nvr_reg_common_write(reg, val, nvr, local);
break;
default: /* non-RTC registers are just NVRAM */ default: /* non-RTC registers are just NVRAM */
if ((reg == 0x2c) && (local->flags & FLAG_LS_HACK)) nvr_reg_common_write(reg, val, nvr, local);
nvr->new = 0;
if ((reg == 0x52) && (local->flags & FLAG_APOLLO_HACK))
nvr->new = 0;
if ((reg >= 0x38) && (reg <= 0x3f) && local->wp[0])
break;
if ((reg >= 0xb8) && (reg <= 0xbf) && local->wp[1])
break;
if (local->lock[reg])
break;
if (nvr->regs[reg] != val) {
nvr->regs[reg] = val;
nvr_dosave = 1;
}
break; break;
} }