This commit is contained in:
Jasmine Iwanek
2023-10-13 14:16:14 -04:00
parent beb71eed1e
commit 31c7e2b83a
2 changed files with 9 additions and 7 deletions

View File

@@ -12024,9 +12024,10 @@ const machine_t machines[] = {
.step = 8192
},
.nvrmask = 255,
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.kbc_device = &keyboard_ps2_ami_pci_device,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
@@ -12103,9 +12104,10 @@ const machine_t machines[] = {
.step = 8192
},
.nvrmask = 255,
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.kbc_device = &keyboard_ps2_ami_pci_device,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,

View File

@@ -863,7 +863,6 @@ nvr_reset(nvr_t *nvr)
static void
nvr_start(nvr_t *nvr)
{
int fdd;
const local_t *local = (local_t *) nvr->data;
struct tm tm;
@@ -881,6 +880,7 @@ nvr_start(nvr_t *nvr)
if (machines[machine].flags & MACHINE_COREBOOT) {
/* Sync floppy drive types on coreboot machines, as SeaBIOS
lacks a setup utility and just leaves these untouched. */
uint8_t fdd;
nvr->regs[RTC_FDD_TYPES] = 0x00;
nvr->regs[RTC_INST_EQUIP] |= 0xc0;