mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' of ssh://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2025-12-19 20:39:09 -03:00
parent 40d79cb7e9 fddfeb51ca
commit 7c7ea31bc0
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/m_at_slot1.c
View File

@@ -425,7 +425,7 @@ static const device_config_t bx6_config[] = {
.bios = {
{
.name = "Award Modular BIOS v4.51PG - Revision EG",
.internal_name = "bx6_eg",
.internal_name = "bx6",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
@@ -434,7 +434,7 @@ static const device_config_t bx6_config[] = {
},
{
.name = "Award Modular BIOS v4.51PG - Revision QS",
.internal_name = "bx6",
.internal_name = "bx6_qs",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,

18
src/nvr_at.c
View File

@@ -635,6 +635,13 @@ nvr_reg_write(uint16_t reg, uint8_t val, void *priv)
nvr_reg_common_write(reg, val, nvr, local);
break;
case 0x39:
if (machines[machine].init == machine_at_bx6_init)
nvr_reg_common_write(reg, val | 0x08, nvr, local);
else
nvr_reg_common_write(reg, val, nvr, local);
break;
default: /* non-RTC registers are just NVRAM */
nvr_reg_common_write(reg, val, nvr, local);
break;
@@ -794,6 +801,14 @@ nvr_read(uint16_t addr, void *priv)
ret = nvr->regs[local->addr[addr_id]];
break;
case 0x39:
if (!(local->lock[local->addr[addr_id]] & 0x02)) {
ret = nvr->regs[local->addr[addr_id]];
if (machines[machine].init == machine_at_bx6_init)
ret |= 0x08;
}
break;
case 0x3e:
case 0x3f:
if (!nvr->is_new && (local->flags & FLAG_AMI_1995_HACK)) {
@@ -1216,6 +1231,9 @@ nvr_at_init(const device_t *info)
if (nvr->is_new && (machines[machine].init == machine_at_spitfire_init))
nvr->regs[0x33] = nvr->regs[0x34] = 0xff;
if (nvr->is_new && (machines[machine].init == machine_at_bx6_init))
nvr->regs[0x39] = 0x09;
return nvr;
}