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

SiS 5598 uses Generic NVR at the moment

Browse Source
This commit is contained in:
Panagiotis
2021-04-21 22:32:16 +03:00
committed by GitHub
parent 24bfeec551
commit 711bbff6ad
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chipset/sis_5598.c
View File

@@ -930,7 +930,7 @@ sis_5598_init(const device_t *info)
/* ACPI */ /* ACPI */
dev->acpi = device_add(&acpi_sis_device); dev->acpi = device_add(&acpi_sis_device);
dev->nvr = device_add(&sis_nvr_device); dev->nvr = device_add(&at_nvr_device);
/* DDMA */ /* DDMA */
dev->ddma = device_add(&ddma_device); dev->ddma = device_add(&ddma_device);

1
src/include/86box/nvr.h
View File

@@ -93,7 +93,6 @@ extern const device_t ps_nvr_device;
extern const device_t amstrad_nvr_device; extern const device_t amstrad_nvr_device;
extern const device_t ibmat_nvr_device; extern const device_t ibmat_nvr_device;
extern const device_t piix4_nvr_device; extern const device_t piix4_nvr_device;
extern const device_t sis_nvr_device;
extern const device_t ls486e_nvr_device; extern const device_t ls486e_nvr_device;
extern const device_t ami_apollo_nvr_device; extern const device_t ami_apollo_nvr_device;
extern const device_t via_nvr_device; extern const device_t via_nvr_device;

11
src/nvr_at.c
View File

@@ -932,7 +932,7 @@ nvr_at_init(const device_t *info)
case 1: /* standard AT */ case 1: /* standard AT */
case 5: /* Lucky Star LS-486E */ case 5: /* Lucky Star LS-486E */
case 6: /* AMI Apollo */ case 6: /* AMI Apollo */
if ((info->local == 9) || (info->local == 16)) if (info->local == 9)
local->flags |= FLAG_PIIX4; local->flags |= FLAG_PIIX4;
else { else {
if ((info->local & 7) == 5) if ((info->local & 7) == 5)
@@ -1079,15 +1079,6 @@ const device_t piix4_nvr_device = {
NULL NULL
}; };
const device_t sis_nvr_device = {
"SiS PC/AT NVRAM",
DEVICE_ISA | DEVICE_AT,
11,
nvr_at_init, nvr_at_close, NULL,
{ NULL }, nvr_at_speed_changed,
NULL
};
const device_t ls486e_nvr_device = { const device_t ls486e_nvr_device = {
"Lucky Star LS-486E PC/AT NVRAM", "Lucky Star LS-486E PC/AT NVRAM",
DEVICE_ISA | DEVICE_AT, DEVICE_ISA | DEVICE_AT,