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

Make machines with VLSI VL82C113 or OPTi 602 declare a null NVR device because the NVR is on those chips.

Browse Source
This commit is contained in:
OBattler
2026-02-26 20:33:13 +01:00
parent 152bbe5b09
commit a32bb19344
1 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/machine/machine_table.c
View File

@@ -4821,8 +4821,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -6385,8 +6386,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -6482,8 +6484,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00002020,
@@ -8386,8 +8389,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL, /*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8433,8 +8437,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8480,8 +8485,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8527,8 +8533,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -8574,8 +8581,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -8584,7 +8592,6 @@ const machine_t machines[] = {
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
/*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
.vid_device = &gd5426_onboard_device,
.snd_device = NULL,
.net_device = NULL
@@ -9285,8 +9292,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000ce0,
@@ -9332,8 +9340,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -9379,8 +9388,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -11144,8 +11154,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the OPTi 82c602. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11191,8 +11202,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00021400, /* Guess. */
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the OPTi 82c602. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,