Merge pull request #6862 from lemondrops/patch-41

Don't add AT NVR on SiS 496-based machines
This commit is contained in:
Miran Grča
2026-02-28 11:03:19 +01:00
committed by GitHub

View File

@@ -11250,8 +11250,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_ACER | 0x00004200,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x004008f0,
@@ -11297,8 +11297,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_AMI | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11344,8 +11344,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_AMI | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11391,8 +11391,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_VIA | 0x00424600,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11438,8 +11438,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_AMI | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -11486,8 +11486,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_HOLTEK | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11534,8 +11534,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_HOLTEK | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11582,8 +11582,8 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = 3,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_AMI | 0x00004800,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,