SiS 5595 fixes, added the PC Chips M747, and corrected the name of the Aptiva.
This commit is contained in:
@@ -7186,11 +7186,11 @@ const machine_t machines[] = {
|
||||
},
|
||||
/* Has IBM PS/2 Type 1 KBC firmware. */
|
||||
{
|
||||
.name = "[OPTi 802G] IBM Aptiva CM",
|
||||
.internal_name = "aptiva_cm",
|
||||
.name = "[OPTi 802G] IBM Aptiva 510/710/Vision",
|
||||
.internal_name = "aptiva_510",
|
||||
.type = MACHINE_TYPE_486_S3,
|
||||
.chipset = MACHINE_CHIPSET_OPTI_895_802G,
|
||||
.init = machine_at_aptiva_cm_init,
|
||||
.init = machine_at_aptiva_510_init,
|
||||
.p1_handler = NULL,
|
||||
.gpio_handler = NULL,
|
||||
.available_flag = MACHINE_AVAILABLE,
|
||||
@@ -14513,6 +14513,46 @@ const machine_t machines[] = {
|
||||
.snd_device = &es1371_onboard_device, /* ES1373 but we currently don't emulate that. */
|
||||
.net_device = NULL
|
||||
},
|
||||
/* Has the SiS (5)600 chipset with on-chip KBC. */
|
||||
{
|
||||
.name = "[SiS 5600] PC Chips M747",
|
||||
.internal_name = "m747",
|
||||
.type = MACHINE_TYPE_SLOT1,
|
||||
.chipset = MACHINE_CHIPSET_SIS_5600,
|
||||
.init = machine_at_m747_init,
|
||||
.p1_handler = NULL,
|
||||
.gpio_handler = NULL,
|
||||
.available_flag = MACHINE_AVAILABLE,
|
||||
.gpio_acpi_handler = NULL,
|
||||
.cpu = {
|
||||
.package = CPU_PKG_SLOT1,
|
||||
.block = CPU_BLOCK_NONE,
|
||||
.min_bus = 66666667,
|
||||
.max_bus = 100000000,
|
||||
.min_voltage = 1300,
|
||||
.max_voltage = 3500,
|
||||
.min_multi = 1.5,
|
||||
.max_multi = 8.0
|
||||
},
|
||||
.bus_flags = MACHINE_PS2_PCI,
|
||||
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB,
|
||||
.ram = {
|
||||
.min = 8192,
|
||||
.max = 1572864,
|
||||
.step = 1024
|
||||
},
|
||||
.nvrmask = 255,
|
||||
.kbc_device = NULL,
|
||||
.kbc_p1 = 0xff,
|
||||
.gpio = 0xffffffff,
|
||||
.gpio_acpi = 0xffffffff,
|
||||
.device = NULL,
|
||||
.fdc_device = NULL,
|
||||
.sio_device = NULL,
|
||||
.vid_device = NULL,
|
||||
.snd_device = NULL,
|
||||
.net_device = NULL
|
||||
},
|
||||
|
||||
/* Slot 1/2 machines */
|
||||
/* 440GX */
|
||||
|
||||
Reference in New Issue
Block a user