mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Final round of clean-ups - AT / PS/2 KBC devices reduced to a single kbc_at_device added with parameters.

Browse Source
This commit is contained in:
OBattler
2025-08-23 16:12:48 +02:00
parent 713c5a3e59
commit d333ea8b4f
19 changed files with 484 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chipset/sis_5571.c
View File

@@ -167,7 +167,7 @@ sis_5571_init(UNUSED(const device_t *info))
dev->ide = device_add_linked(&sis_5572_ide_device, dev->sis);
dev->usb = device_add_linked(&sis_5572_usb_device, dev->sis);
device_add_params(&kbc_at_sis_device, (void *) 0x00000000);
device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
return dev;
}

2
src/chipset/sis_5581.c
View File

@@ -167,7 +167,7 @@ sis_5581_init(UNUSED(const device_t *info))
dev->ide = device_add_linked(&sis_5582_ide_device, dev->sis);
dev->usb = device_add_linked(&sis_5582_usb_device, dev->sis);
device_add_params(&kbc_at_sis_device, (void *) 0x00000000);
device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
return dev;
}

2
src/chipset/sis_5591.c
View File

@@ -179,7 +179,7 @@ sis_5591_init(UNUSED(const device_t *info))
else
dev->pmu = device_add_linked(&sis_5595_pmu_device, dev->sis);
device_add_params(&kbc_at_sis_device, (void *) 0x00000000);
device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
return dev;
}

2
src/chipset/sis_5600.c
View File

@@ -179,7 +179,7 @@ sis_5600_init(UNUSED(const device_t *info))
else
dev->pmu = device_add_linked(&sis_5595_pmu_device, dev->sis);
device_add_params(&kbc_at_sis_device, (void *) 0x00000000);
device_add_params(&kbc_at_device, (void *) KBC_VEN_SIS);
return dev;
}

2
src/chipset/umc_8886.c
View File

@@ -420,7 +420,7 @@ umc_8886_init(const device_t *info)
}
if (machine_get_kbc_device(machine) == NULL)
device_add(&kbc_at_umc_device);
device_add_params(&kbc_at_device, (void *) KBC_VEN_UMC);
umc_8886_reset(dev);

12
src/chipset/via_pipc.c
View File

@@ -1775,7 +1775,7 @@ pipc_init(const device_t *info)
acpi_set_irq_mode(dev->acpi, 0);
}
uint32_t kbc_params = 0x00004200;
uint32_t kbc_params = 0x00424600;
/*
NOTE: The VIA VT82C42N returns 0x46 ('F') in command 0xA1 (so it
emulates the AMI KF/AMIKey KBC firmware), and 0x42 ('B') in
@@ -1791,19 +1791,21 @@ pipc_init(const device_t *info)
switch (dev->local) {
/* 596A, 596B, 686B, and 8231 are guesses because we have no probes yet. */
case VIA_PIPC_586A: case VIA_PIPC_596A:
kbc_params = 0x00004300;
kbc_params = 0x00434600;
break;
case VIA_PIPC_586B: case VIA_PIPC_596B:
kbc_params = 0x00004400;
kbc_params = 0x00444600;
break;
case VIA_PIPC_686A: case VIA_PIPC_686B:
case VIA_PIPC_8231:
kbc_params = 0x00004500;
kbc_params = 0x00454600;
break;
}
kbc_params |= KBC_VEN_VIA;
if (machine_get_kbc_device(machine) == NULL)
device_add_params(&kbc_at_via_device, (void *) (uintptr_t) kbc_params);
device_add_params(&kbc_at_device, (void *) (uintptr_t) kbc_params);
return dev;
}