diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 0c22f94e4..4e68020d4 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -760,6 +760,7 @@ extern int machine_at_acerv10_init(const machine_t *); /* SiS 471 */ extern int machine_at_win471_init(const machine_t *); +extern int machine_at_win471t_init(const machine_t *); extern int machine_at_vi15g_init(const machine_t *); extern int machine_at_vli486sv2g_init(const machine_t *); extern int machine_at_dvent4xx_init(const machine_t *); diff --git a/src/machine/m_at_socket3.c b/src/machine/m_at_socket3.c index b98d27627..008394505 100644 --- a/src/machine/m_at_socket3.c +++ b/src/machine/m_at_socket3.c @@ -314,6 +314,24 @@ machine_at_win471_init(const machine_t *model) return ret; } +int +machine_at_win471t_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear("roms/machines/win471t/486-SiS_AB6680759.BIN", + 0x000f0000, 65536, 0); + + if (bios_only || !ret) + return ret; + + machine_at_sis_85c471_common_init(model); + + device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params); + + return ret; +} + int machine_at_vi15g_init(const machine_t *model) { diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 45fdb6bc3..1ffae2fda 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -8778,13 +8778,13 @@ const machine_t machines[] = { .gpio_acpi_handler = NULL, .cpu = { .package = CPU_PKG_SOCKET3, - .block = CPU_BLOCK_NONE, + .block = CPU_BLOCK(CPU_Cx5x86), .min_bus = 0, .max_bus = 0, .min_voltage = 0, .max_voltage = 0, .min_multi = 0, - .max_multi = 0 + .max_multi = 2 }, .bus_flags = MACHINE_VLB, .flags = MACHINE_APM, @@ -8809,6 +8809,50 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + /* JETKey 5.0 KBC */ + { + .name = "[SiS 471] ABIT AB-AH4T", + .internal_name = "win471t", + .type = MACHINE_TYPE_486_S3, + .chipset = MACHINE_CHIPSET_SIS_471, + .init = machine_at_win471t_init, + .p1_handler = machine_generic_p1_handler, + .gpio_handler = NULL, + .available_flag = MACHINE_AVAILABLE, + .gpio_acpi_handler = NULL, + .cpu = { + .package = CPU_PKG_SOCKET3, + .block = CPU_BLOCK_NONE, + .min_bus = 0, + .max_bus = 0, + .min_voltage = 0, + .max_voltage = 0, + .min_multi = 0, + .max_multi = 0 + }, + .bus_flags = MACHINE_VLB, + .flags = MACHINE_APM | MACHINE_ACPI, + .ram = { + .min = 1024, + .max = 131072, + .step = 1024 + }, + .nvrmask = 127, + .jumpered_ecp_dma = 0, + .default_jumpered_ecp_dma = -1, + .kbc_device = &kbc_at_device, + .kbc_params = KBC_VEN_AMI | KBC_FLAG_IS_CLONE | KBC_FLAG_IS_ASIC | 0x00004800, + .kbc_p1 = 0x00000cf0, + .gpio = 0xffffffff, + .gpio_acpi = 0xffffffff, + .device = NULL, + .kbd_device = NULL, + .fdc_device = NULL, + .sio_device = NULL, + .vid_device = NULL, + .snd_device = NULL, + .net_device = NULL + }, /* Has AMIKey-2 'H' keyboard BIOS. */ { .name = "[SiS 471] AOpen Vi15G",