From fea5ac681b99705754e293e10a3c21cb5da3fdb2 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 7 Feb 2023 18:06:50 -0500 Subject: [PATCH 1/4] Handful of function renames --- src/device.c | 4 ++-- src/include/86box/machine.h | 8 ++++---- src/machine/machine.c | 2 +- src/machine/machine_table.c | 8 ++++---- src/qt/qt_settingsmachine.cpp | 4 ++-- src/win/win_settings.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/device.c b/src/device.c index 81e19e2dc..12d06580a 100644 --- a/src/device.c +++ b/src/device.c @@ -748,7 +748,7 @@ device_is_valid(const device_t *device, int m) int machine_get_config_int(char *s) { - const device_t *d = machine_getdevice(machine); + const device_t *d = machine_get_device(machine); const device_config_t *c; if (d == NULL) @@ -768,7 +768,7 @@ machine_get_config_int(char *s) char * machine_get_config_string(char *s) { - const device_t *d = machine_getdevice(machine); + const device_t *d = machine_get_device(machine); const device_config_t *c; if (d == NULL) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index a6571a1fd..a2417a1bc 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -324,10 +324,10 @@ extern char *machine_get_internal_name(void); extern int machine_get_machine_from_internal_name(char *s); extern void machine_init(void); #ifdef EMU_DEVICE_H -extern const device_t *machine_getdevice(int m); -extern const device_t *machine_getviddevice(int m); -extern const device_t *machine_getsnddevice(int m); -extern const device_t *machine_getnetdevice(int m); +extern const device_t *machine_get_device(int m); +extern const device_t *machine_get_vid_device(int m); +extern const device_t *machine_get_snd_device(int m); +extern const device_t *machine_get_net_device(int m); #endif extern char *machine_get_internal_name_ex(int m); extern int machine_get_nvrmask(int m); diff --git a/src/machine/machine.c b/src/machine/machine.c index 7a69f4879..893700c7e 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -138,7 +138,7 @@ int machine_available(int m) { int ret; - device_t *d = (device_t *) machine_getdevice(m); + device_t *d = (device_t *) machine_get_device(m); bios_only = 1; diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 587e854c9..c489889a3 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -12245,7 +12245,7 @@ machine_getname_ex(int m) } const device_t * -machine_getdevice(int m) +machine_get_device(int m) { if (machines[m].device) return (machines[m].device); @@ -12254,7 +12254,7 @@ machine_getdevice(int m) } const device_t * -machine_getviddevice(int m) +machine_get_vid_device(int m) { if (machines[m].vid_device) return (machines[m].vid_device); @@ -12263,7 +12263,7 @@ machine_getviddevice(int m) } const device_t * -machine_getsnddevice(int m) +machine_get_snd_device(int m) { if (machines[m].snd_device) return (machines[m].snd_device); @@ -12272,7 +12272,7 @@ machine_getsnddevice(int m) } const device_t * -machine_getnetdevice(int m) +machine_get_net_device(int m) { if (machines[m].net_device) return (machines[m].net_device); diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp index b88397e30..e08b07997 100644 --- a/src/qt/qt_settingsmachine.cpp +++ b/src/qt/qt_settingsmachine.cpp @@ -169,7 +169,7 @@ SettingsMachine::on_comboBoxMachine_currentIndexChanged(int index) } int machineId = ui->comboBoxMachine->currentData().toInt(); - const auto *device = machine_getdevice(machineId); + const auto *device = machine_get_device(machineId); ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr)); auto *modelCpu = ui->comboBoxCPU->model(); @@ -304,6 +304,6 @@ SettingsMachine::on_pushButtonConfigure_clicked() { // deviceconfig_inst_open int machineId = ui->comboBoxMachine->currentData().toInt(); - const auto *device = machine_getdevice(machineId); + const auto *device = machine_get_device(machineId); DeviceConfig::ConfigureDevice(device, 0, qobject_cast(Settings::settings)); } diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 37a8aafb0..07822f28b 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -755,7 +755,7 @@ win_settings_machine_recalc_machine(HWND hdlg) lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); - d = (device_t *) machine_getdevice(temp_machine); + d = (device_t *) machine_get_device(temp_machine); settings_enable_window(hdlg, IDC_CONFIGURE_MACHINE, d && d->config); settings_reset_content(hdlg, IDC_COMBO_CPU_TYPE); @@ -987,7 +987,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; case IDC_CONFIGURE_MACHINE: temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)]; - temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_getdevice(temp_machine)); + temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_get_device(temp_machine)); break; } From 118ab005f0a22a106b31dd73fbc582965c7eb354 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 7 Feb 2023 18:08:11 -0500 Subject: [PATCH 2/4] Switch kbc to device_t kbd_device --- src/include/86box/keyboard.h | 2 - src/include/86box/machine.h | 7 +- src/machine/machine_table.c | 662 ++++++++++++++++++----------------- 3 files changed, 342 insertions(+), 329 deletions(-) diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h index db18ac789..1f7d8860c 100644 --- a/src/include/86box/keyboard.h +++ b/src/include/86box/keyboard.h @@ -39,8 +39,6 @@ typedef struct { #define RSHIFT_OFF 0x105 /* KBC #define's */ -#define KBC_UNKNOWN 0x0000 /* As yet unknown keyboard */ - /* IBM-style controllers */ #define KBC_IBM_PC_XT 0x0000 /* IBM PC/XT */ #define KBC_IBM_PCJR 0x0001 /* IBM PCjr */ diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index a2417a1bc..694552c50 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -288,7 +288,11 @@ typedef struct _machine_ { const machine_memory_t ram; int ram_granularity; int nvrmask; - uint16_t kbc; +#ifdef EMU_DEVICE_H + const device_t *kbc_device; +#else + void *kbc_device; +#endif /* EMU_DEVICE_H */ /* Bits: 7-0 Set bits are forced set on P1 (no forced set = 0x00); 15-8 Clear bits are forced clear on P1 (no foced clear = 0xff). */ @@ -324,6 +328,7 @@ extern char *machine_get_internal_name(void); extern int machine_get_machine_from_internal_name(char *s); extern void machine_init(void); #ifdef EMU_DEVICE_H +extern const device_t *machine_get_kbc_device(int m); extern const device_t *machine_get_device(int m); extern const device_t *machine_get_vid_device(int m); extern const device_t *machine_get_snd_device(int m); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index c489889a3..a8f8643c0 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -230,7 +230,7 @@ const machine_t machines[] = { .step = 16 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -266,7 +266,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc82_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -302,7 +302,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_IBM_PCJR, + .kbc_device = NULL, /* TODO: No specific kbd_device yet */ .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &pcjr_device, @@ -338,7 +338,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -374,7 +374,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt86_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -410,7 +410,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -446,7 +446,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -482,7 +482,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -518,7 +518,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc82_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -554,7 +554,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_compaq_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -590,7 +590,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -626,7 +626,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc82_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -662,7 +662,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -698,7 +698,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -734,7 +734,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -770,7 +770,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -806,7 +806,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -842,7 +842,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -878,7 +878,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -914,7 +914,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -950,7 +950,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -986,7 +986,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1022,7 +1022,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_OLIVETTI_XT, + .kbc_device = &keyboard_xt_olivetti_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &m19_vid_device, @@ -1058,7 +1058,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1094,7 +1094,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1130,7 +1130,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1166,7 +1166,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1202,7 +1202,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pravetz_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1238,7 +1238,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1274,7 +1274,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 15, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1310,7 +1310,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1346,7 +1346,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_TANDY, + .kbc_device = &keyboard_tandy_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device, @@ -1382,7 +1382,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_TANDY, + .kbc_device = &keyboard_tandy_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device_hx, @@ -1418,7 +1418,7 @@ const machine_t machines[] = { .step = 768 }, .nvrmask = 63, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_t1x00_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &t1000_video_device, @@ -1454,7 +1454,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1491,7 +1491,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1499,7 +1499,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_LASERXT) */ /* Has a standard PS/2 KBC (so, use IBM PS/2 Type 1). */ { .name = "[8088] Xi8088", @@ -1529,7 +1529,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_VIA_VT82C4XN_XI8088, + .kbc_device = &keyboard_ps2_xi8088_device, .kbc_p1 = 0xff04, .gpio = 0xffffffff, .device = &xi8088_device, @@ -1565,7 +1565,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1601,7 +1601,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_zenith_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1637,7 +1637,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_zenith_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1673,7 +1673,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_zenith_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &cga_device, @@ -1709,7 +1709,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_pc_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1745,7 +1745,7 @@ const machine_t machines[] = { .step = 64 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -1783,7 +1783,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_1512_device, @@ -1819,7 +1819,7 @@ const machine_t machines[] = { .step = 640 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_1640_device, @@ -1855,7 +1855,7 @@ const machine_t machines[] = { .step = 640 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_pc2086_device, @@ -1891,7 +1891,7 @@ const machine_t machines[] = { .step = 640 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_pc3086_device, @@ -1927,7 +1927,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_200_device, @@ -1963,7 +1963,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_AMSTRAD, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_ppc512_device, @@ -1999,7 +1999,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_compaq_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -2035,7 +2035,7 @@ const machine_t machines[] = { .step = 640 }, .nvrmask = 0x3f, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -2071,7 +2071,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 15, - .kbc = KBC_OLIVETTI_XT, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &ogc_m24_device, @@ -2108,7 +2108,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 15, - .kbc = KBC_OLIVETTI, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff04, .gpio = 0xffffffff, .device = NULL, @@ -2144,7 +2144,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xtclone_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -2180,7 +2180,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 0, - .kbc = KBC_TANDY_SL2, + .kbc_device = NULL /* TODO: No specific kbd_device yet */, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device_sl, @@ -2216,7 +2216,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_t1x00_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &t1200_video_device, @@ -2252,7 +2252,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -2290,7 +2290,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 0, - .kbc = KBC_IBM_PC_XT, + .kbc_device = &keyboard_xt_lxt3_device, .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, @@ -2298,7 +2298,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_LASERXT) */ /* 286 AT machines */ /* Has IBM AT KBC firmware. */ @@ -2330,7 +2330,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2367,7 +2367,7 @@ const machine_t machines[] = { .step = 512 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2404,7 +2404,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2441,7 +2441,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2478,7 +2478,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2516,7 +2516,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2553,7 +2553,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2590,7 +2590,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &compaq_plasma_device, @@ -2627,7 +2627,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2664,7 +2664,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2702,7 +2702,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2710,7 +2710,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_OLIVETTI) */ #if defined(DEV_BRANCH) && defined(USE_OPEN_AT) /* Has IBM AT KBC firmware. */ { @@ -2741,7 +2741,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2749,7 +2749,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_OPEN_AT) */ /* Has IBM AT KBC firmware. */ { .name = "[ISA] Phoenix IBM AT", @@ -2779,7 +2779,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2816,7 +2816,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2853,7 +2853,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2890,7 +2890,7 @@ const machine_t machines[] = { .step = 256 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2927,7 +2927,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -2964,7 +2964,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3001,7 +3001,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3038,7 +3038,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3075,7 +3075,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3112,7 +3112,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3149,7 +3149,7 @@ const machine_t machines[] = { .step = 512 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3186,7 +3186,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3223,7 +3223,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3260,7 +3260,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3297,7 +3297,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3334,7 +3334,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3371,7 +3371,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3410,7 +3410,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3447,7 +3447,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3487,7 +3487,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3524,7 +3524,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3561,7 +3561,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3598,7 +3598,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3635,7 +3635,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3674,7 +3674,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &tvga8900d_device, @@ -3712,7 +3712,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3749,7 +3749,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3786,7 +3786,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3825,7 +3825,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &oti067_ama932j_device, @@ -3864,7 +3864,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3900,7 +3900,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3939,7 +3939,7 @@ const machine_t machines[] = { .step = 512 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -3976,7 +3976,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4013,7 +4013,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4052,7 +4052,7 @@ const machine_t machines[] = { .step = 512 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5402_onboard_device, @@ -4091,7 +4091,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4128,7 +4128,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &ati28800k_spc6033p_device, @@ -4166,7 +4166,7 @@ const machine_t machines[] = { .step = 512 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4203,7 +4203,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4242,7 +4242,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4279,7 +4279,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4319,7 +4319,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4357,7 +4357,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4394,7 +4394,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4431,7 +4431,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4469,7 +4469,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4477,7 +4477,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_DESKPRO386) */ { .name = "[ISA] Compaq Portable III (386)", .internal_name = "portableiii386", @@ -4506,7 +4506,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &compaq_plasma_device, @@ -4543,7 +4543,7 @@ const machine_t machines[] = { .step = 128 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4580,7 +4580,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4619,7 +4619,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4659,7 +4659,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4696,7 +4696,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4733,7 +4733,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4770,7 +4770,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4807,7 +4807,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 63, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4850,7 +4850,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4889,7 +4889,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4927,7 +4927,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -4964,7 +4964,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5001,7 +5001,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5039,7 +5039,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5076,7 +5076,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5116,7 +5116,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5155,7 +5155,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, @@ -5192,7 +5192,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, @@ -5233,7 +5233,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5270,7 +5270,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, @@ -5307,7 +5307,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5344,7 +5344,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_86c805_onboard_vlb_device, @@ -5381,7 +5381,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5419,7 +5419,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5458,7 +5458,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5498,7 +5498,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5535,7 +5535,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5572,7 +5572,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5609,7 +5609,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5646,7 +5646,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5683,7 +5683,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5720,7 +5720,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5757,7 +5757,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5794,7 +5794,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5833,7 +5833,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5870,7 +5870,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5907,7 +5907,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &tgui9440_onboard_pci_device, @@ -5945,7 +5945,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -5986,7 +5986,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6027,7 +6027,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6064,7 +6064,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6101,7 +6101,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6138,7 +6138,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6175,7 +6175,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6212,7 +6212,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6249,7 +6249,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6287,7 +6287,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6324,7 +6324,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6361,7 +6361,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6398,7 +6398,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6435,7 +6435,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6472,7 +6472,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6509,7 +6509,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6547,7 +6547,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6585,7 +6585,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6622,7 +6622,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6659,7 +6659,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6696,7 +6696,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6734,7 +6734,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6771,7 +6771,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6808,7 +6808,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6845,7 +6845,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6882,7 +6882,7 @@ const machine_t machines[] = { .step = 1024 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6923,7 +6923,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6961,7 +6961,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -6999,7 +6999,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7037,7 +7037,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7075,7 +7075,7 @@ const machine_t machines[] = { .step = 32768 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7119,7 +7119,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7156,7 +7156,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7193,7 +7193,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7230,7 +7230,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7269,7 +7269,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7306,7 +7306,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7343,7 +7343,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7380,7 +7380,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7417,7 +7417,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5434_onboard_pci_device, @@ -7458,7 +7458,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7497,7 +7497,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7536,7 +7536,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7573,7 +7573,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7613,7 +7613,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7651,7 +7651,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7688,7 +7688,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7727,7 +7727,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7764,7 +7764,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7803,7 +7803,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7840,7 +7840,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7877,7 +7877,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7918,7 +7918,7 @@ const machine_t machines[] = { .step = 2048 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7956,7 +7956,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -7995,7 +7995,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8032,7 +8032,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8069,7 +8069,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_JETKEY_5_W83C42, + .kbc_device = &keyboard_at_ami_device, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8109,7 +8109,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8146,7 +8146,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8158,7 +8158,7 @@ const machine_t machines[] = { { .name = "[i430FX] DataExpert EXP8551", .internal_name = "exp8551", - .type = MACHINE_TYPE_SOCKET7_3V, + .type = MACHINE_TYPE_SOCKET5, .chipset = MACHINE_CHIPSET_INTEL_430FX, .init = machine_at_exp8551_init, .pad = 0, @@ -8183,7 +8183,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8222,7 +8222,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8260,7 +8260,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 511, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, @@ -8299,7 +8299,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, @@ -8338,7 +8338,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, @@ -8377,7 +8377,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, @@ -8414,7 +8414,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8452,7 +8452,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &gd5440_onboard_pci_device, @@ -8464,7 +8464,7 @@ const machine_t machines[] = { { .name = "[i430FX] PC Partner MB500N", .internal_name = "mb500n", - .type = MACHINE_TYPE_SOCKET7_3V, + .type = MACHINE_TYPE_SOCKET5, .chipset = MACHINE_CHIPSET_INTEL_430FX, .init = machine_at_mb500n_init, .pad = 0, @@ -8489,7 +8489,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8526,7 +8526,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8567,7 +8567,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8604,7 +8604,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8641,7 +8641,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8679,7 +8679,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8718,7 +8718,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8757,7 +8757,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8796,7 +8796,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8833,7 +8833,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8873,7 +8873,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8910,7 +8910,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8947,7 +8947,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 511, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -8986,7 +8986,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9025,7 +9025,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9065,7 +9065,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9102,7 +9102,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9141,7 +9141,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9178,7 +9178,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9216,7 +9216,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9253,7 +9253,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9291,7 +9291,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, @@ -9328,7 +9328,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, @@ -9365,7 +9365,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9402,7 +9402,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9441,7 +9441,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9478,7 +9478,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9516,7 +9516,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9554,7 +9554,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9593,7 +9593,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9630,7 +9630,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9668,7 +9668,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9676,7 +9676,7 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, -#endif +#endif /* defined(DEV_BRANCH) && defined(USE_AN430TX) */ /* This has the AMIKey KBC firmware, which is an updated 'F' type. */ { .name = "[i430TX] Intel YM430TX", @@ -9706,7 +9706,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9743,7 +9743,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9780,7 +9780,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9817,7 +9817,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9857,7 +9857,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9897,7 +9897,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9936,7 +9936,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -9973,7 +9973,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10012,7 +10012,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10049,7 +10049,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10089,7 +10089,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10127,7 +10127,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10164,7 +10164,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10201,7 +10201,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10241,7 +10241,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10279,7 +10279,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10317,7 +10317,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10355,7 +10355,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10395,7 +10395,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10434,7 +10434,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10471,7 +10471,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10509,7 +10509,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10545,7 +10545,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10584,7 +10584,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10623,7 +10623,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10660,7 +10660,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10699,7 +10699,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10739,7 +10739,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10778,7 +10778,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10816,7 +10816,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 127, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10856,7 +10856,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10894,7 +10894,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10934,7 +10934,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -10974,7 +10974,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11012,7 +11012,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11050,7 +11050,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11088,7 +11088,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11126,7 +11126,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11164,7 +11164,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11202,7 +11202,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, @@ -11240,7 +11240,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11280,7 +11280,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, @@ -11318,7 +11318,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, @@ -11358,7 +11358,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11398,7 +11398,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11436,7 +11436,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11474,7 +11474,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11512,7 +11512,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, @@ -11553,7 +11553,7 @@ const machine_t machines[] = { .step = 16384 }, .nvrmask = 511, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11594,7 +11594,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, @@ -11633,7 +11633,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &cmi8738_onboard_device, @@ -11674,7 +11674,7 @@ const machine_t machines[] = { .step = 16384 }, .nvrmask = 511, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11712,7 +11712,7 @@ const machine_t machines[] = { .step = 16384 }, .nvrmask = 511, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11753,7 +11753,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11793,7 +11793,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11831,7 +11831,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11869,7 +11869,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11909,7 +11909,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11949,7 +11949,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -11989,7 +11989,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -12027,7 +12027,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -12065,7 +12065,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -12103,7 +12103,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = &cmi8738_onboard_device, @@ -12143,7 +12143,7 @@ const machine_t machines[] = { .step = 8192 }, .nvrmask = 255, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -12180,7 +12180,7 @@ const machine_t machines[] = { .step = 0 }, .nvrmask = 0, - .kbc = KBC_UNKNOWN, + .kbc_device = NULL, .kbc_p1 = 0, .gpio = 0, .device = NULL, @@ -12244,6 +12244,16 @@ machine_getname_ex(int m) return ((char *) machines[m].name); } +const device_t * +machine_get_kbc_device(int m) +{ + if (machines[m].kbc_device) + return (machines[m].kbc_device); + + return (NULL); +} + + const device_t * machine_get_device(int m) { From 01749a6de65859d9fb85bce173ac260a5aa7d8ce Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 7 Feb 2023 18:08:42 -0500 Subject: [PATCH 3/4] Add fdc_device to machine table --- src/include/86box/machine.h | 3 + src/machine/machine_table.c | 326 ++++++++++++++++++++++++++++++++++++ 2 files changed, 329 insertions(+) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 694552c50..2d9dfbc96 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -301,11 +301,13 @@ typedef struct _machine_ { uint32_t gpio_acpi; #ifdef EMU_DEVICE_H const device_t *device; + const device_t *fdc_device; const device_t *vid_device; const device_t *snd_device; const device_t *net_device; #else void *device; + void *fdc_device; void *vid_device; void *snd_device; void *net_device; @@ -330,6 +332,7 @@ extern void machine_init(void); #ifdef EMU_DEVICE_H extern const device_t *machine_get_kbc_device(int m); extern const device_t *machine_get_device(int m); +extern const device_t *machine_get_fdc_device(int m); extern const device_t *machine_get_vid_device(int m); extern const device_t *machine_get_snd_device(int m); extern const device_t *machine_get_net_device(int m); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index a8f8643c0..eb31fc91c 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -234,6 +234,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -270,6 +271,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -306,6 +308,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &pcjr_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -342,6 +345,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -378,6 +382,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -414,6 +419,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -450,6 +456,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -486,6 +493,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -522,6 +530,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -558,6 +567,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -594,6 +604,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -630,6 +641,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -666,6 +678,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -702,6 +715,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -738,6 +752,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -774,6 +789,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -810,6 +826,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -846,6 +863,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -882,6 +900,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -918,6 +937,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -954,6 +974,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -990,6 +1011,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1026,6 +1048,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &m19_vid_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1062,6 +1085,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1098,6 +1122,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1134,6 +1159,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1170,6 +1196,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1206,6 +1233,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1242,6 +1270,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1278,6 +1307,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1314,6 +1344,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1350,6 +1381,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1386,6 +1418,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device_hx, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1422,6 +1455,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &t1000_video_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1458,6 +1492,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1495,6 +1530,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1533,6 +1569,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff04, .gpio = 0xffffffff, .device = &xi8088_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1569,6 +1606,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1605,6 +1643,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1641,6 +1680,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1677,6 +1717,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &cga_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1713,6 +1754,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1749,6 +1791,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1787,6 +1830,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_1512_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1823,6 +1867,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_1640_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1859,6 +1904,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_pc2086_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1895,6 +1941,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_pc3086_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1931,6 +1978,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_200_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1967,6 +2015,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_ppc512_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2003,6 +2052,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2039,6 +2089,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2075,6 +2126,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &ogc_m24_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2112,6 +2164,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff04, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2148,6 +2201,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2184,6 +2238,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &vid_device_sl, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2220,6 +2275,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = &t1200_video_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2256,6 +2312,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2294,6 +2351,7 @@ const machine_t machines[] = { .kbc_p1 = 0xff00, .gpio = 0xffffffff, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2334,6 +2392,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2371,6 +2430,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2408,6 +2468,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2445,6 +2506,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2482,6 +2544,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2520,6 +2583,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2557,6 +2621,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2594,6 +2659,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &compaq_plasma_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2631,6 +2697,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2668,6 +2735,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2706,6 +2774,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2745,6 +2814,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2783,6 +2853,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2820,6 +2891,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2857,6 +2929,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2894,6 +2967,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2931,6 +3005,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2968,6 +3043,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3005,6 +3081,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3042,6 +3119,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3079,6 +3157,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3116,6 +3195,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3153,6 +3233,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3190,6 +3271,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3227,6 +3309,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3264,6 +3347,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3301,6 +3385,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3338,6 +3423,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3375,6 +3461,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3414,6 +3501,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3451,6 +3539,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3491,6 +3580,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3528,6 +3618,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3565,6 +3656,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3602,6 +3694,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3639,6 +3732,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3678,6 +3772,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &tvga8900d_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3716,6 +3811,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3753,6 +3849,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3790,6 +3887,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3829,6 +3927,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &oti067_ama932j_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3868,6 +3967,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3904,6 +4004,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3943,6 +4044,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3980,6 +4082,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4017,6 +4120,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4056,6 +4160,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5402_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4095,6 +4200,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4132,6 +4238,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &ati28800k_spc6033p_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4170,6 +4277,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4207,6 +4315,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4246,6 +4355,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4283,6 +4393,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4323,6 +4434,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4361,6 +4473,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4398,6 +4511,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4435,6 +4549,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4473,6 +4588,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4510,6 +4626,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &compaq_plasma_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4547,6 +4664,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4584,6 +4702,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4623,6 +4742,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4663,6 +4783,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4700,6 +4821,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4737,6 +4859,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4774,6 +4897,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4811,6 +4935,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4854,6 +4979,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4893,6 +5019,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4931,6 +5058,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4968,6 +5096,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5005,6 +5134,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5043,6 +5173,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5080,6 +5211,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5120,6 +5252,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5159,6 +5292,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5196,6 +5330,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5237,6 +5372,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5274,6 +5410,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5428_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5311,6 +5448,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5349,6 +5487,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_86c805_onboard_vlb_device, .vid_device = NULL, + .fdc_device = NULL, .snd_device = NULL, .net_device = NULL }, @@ -5385,6 +5524,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5423,6 +5563,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5462,6 +5603,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5502,6 +5644,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5539,6 +5682,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5576,6 +5720,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5613,6 +5758,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5650,6 +5796,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5687,6 +5834,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5724,6 +5872,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5761,6 +5910,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5798,6 +5948,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5837,6 +5988,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5874,6 +6026,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5911,6 +6064,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &tgui9440_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5949,6 +6103,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5990,6 +6145,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6031,6 +6187,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6068,6 +6225,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6105,6 +6263,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6142,6 +6301,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6179,6 +6339,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6216,6 +6377,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6253,6 +6415,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6291,6 +6454,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6328,6 +6492,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6365,6 +6530,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6402,6 +6568,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6439,6 +6606,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6476,6 +6644,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6513,6 +6682,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6551,6 +6721,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6589,6 +6760,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6626,6 +6798,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6663,6 +6836,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6700,6 +6874,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6738,6 +6913,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6775,6 +6951,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6812,6 +6989,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6849,6 +7027,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6886,6 +7065,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6927,6 +7107,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6965,6 +7146,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7003,6 +7185,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7041,6 +7224,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7079,6 +7263,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7123,6 +7308,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7160,6 +7346,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7197,6 +7384,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7234,6 +7422,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7273,6 +7462,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7310,6 +7500,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7347,6 +7538,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7384,6 +7576,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7421,6 +7614,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5434_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7462,6 +7656,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7501,6 +7696,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7540,6 +7736,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7577,6 +7774,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7617,6 +7815,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7655,6 +7854,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7692,6 +7892,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7731,6 +7932,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7768,6 +7970,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7807,6 +8010,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7844,6 +8048,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7881,6 +8086,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7922,6 +8128,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7960,6 +8167,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7999,6 +8207,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8036,6 +8245,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8073,6 +8283,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8113,6 +8324,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8150,6 +8362,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8187,6 +8400,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8226,6 +8440,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8264,6 +8479,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8303,6 +8519,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8342,6 +8559,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8381,6 +8599,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8418,6 +8637,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8456,6 +8676,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &gd5440_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8493,6 +8714,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8530,6 +8752,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8571,6 +8794,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8608,6 +8832,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8645,6 +8870,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8683,6 +8909,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8722,6 +8949,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8761,6 +8989,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8800,6 +9029,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8837,6 +9067,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8877,6 +9108,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8914,6 +9146,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8951,6 +9184,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8990,6 +9224,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9029,6 +9264,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9069,6 +9305,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9106,6 +9343,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9145,6 +9383,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9182,6 +9421,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9220,6 +9460,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9257,6 +9498,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9295,6 +9537,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9332,6 +9575,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9369,6 +9613,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9406,6 +9651,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9445,6 +9691,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9482,6 +9729,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9520,6 +9768,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9558,6 +9807,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9597,6 +9847,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9634,6 +9885,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9672,6 +9924,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9710,6 +9963,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9747,6 +10001,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9784,6 +10039,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9821,6 +10077,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9861,6 +10118,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9901,6 +10159,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9940,6 +10199,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9977,6 +10237,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10016,6 +10277,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10053,6 +10315,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10093,6 +10356,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10131,6 +10395,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10168,6 +10433,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10205,6 +10471,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10245,6 +10512,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10283,6 +10551,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10321,6 +10590,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10359,6 +10629,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10399,6 +10670,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10438,6 +10710,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10475,6 +10748,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10513,6 +10787,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10549,6 +10824,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10588,6 +10864,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10627,6 +10904,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10664,6 +10942,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10703,6 +10982,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10743,6 +11023,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10782,6 +11063,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10820,6 +11102,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10860,6 +11143,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10898,6 +11182,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10938,6 +11223,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10978,6 +11264,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11016,6 +11303,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11054,6 +11342,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11092,6 +11381,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11130,6 +11420,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11168,6 +11459,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11206,6 +11498,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11244,6 +11537,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11284,6 +11578,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11322,6 +11617,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11362,6 +11658,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11402,6 +11699,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11440,6 +11738,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11478,6 +11777,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11516,6 +11816,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11557,6 +11858,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11598,6 +11900,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &es1371_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11637,6 +11940,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &cmi8738_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11678,6 +11982,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11716,6 +12021,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11757,6 +12063,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11797,6 +12104,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11835,6 +12143,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11873,6 +12182,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11913,6 +12223,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11953,6 +12264,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11993,6 +12305,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12031,6 +12344,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12069,6 +12383,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12107,6 +12422,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = &cmi8738_onboard_device, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12147,6 +12463,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12184,6 +12501,7 @@ const machine_t machines[] = { .kbc_p1 = 0, .gpio = 0, .device = NULL, + .fdc_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12263,6 +12581,14 @@ machine_get_device(int m) return (NULL); } +const device_t * +machine_get_fdc_device(int m) +{ + if (machines[m].fdc_device) + return (machines[m].fdc_device); + + return (NULL); +} const device_t * machine_get_vid_device(int m) { From 947e511d72bd02723591be6b40965f6ca2473f52 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 7 Feb 2023 18:09:00 -0500 Subject: [PATCH 4/4] Add sio_device to machine table --- src/include/86box/machine.h | 3 + src/machine/machine_table.c | 328 ++++++++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 2d9dfbc96..165e37cb2 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -302,12 +302,14 @@ typedef struct _machine_ { #ifdef EMU_DEVICE_H const device_t *device; const device_t *fdc_device; + const device_t *sio_device; const device_t *vid_device; const device_t *snd_device; const device_t *net_device; #else void *device; void *fdc_device; + void *sio_device; void *vid_device; void *snd_device; void *net_device; @@ -333,6 +335,7 @@ extern void machine_init(void); extern const device_t *machine_get_kbc_device(int m); extern const device_t *machine_get_device(int m); extern const device_t *machine_get_fdc_device(int m); +extern const device_t *machine_get_sio_device(int m); extern const device_t *machine_get_vid_device(int m); extern const device_t *machine_get_snd_device(int m); extern const device_t *machine_get_net_device(int m); diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index eb31fc91c..032975672 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -235,6 +235,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -272,6 +273,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -309,6 +311,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &pcjr_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -346,6 +349,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -383,6 +387,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -420,6 +425,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -457,6 +463,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -494,6 +501,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -531,6 +539,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -568,6 +577,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -605,6 +615,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -642,6 +653,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -679,6 +691,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -716,6 +729,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -753,6 +767,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -790,6 +805,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -827,6 +843,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -864,6 +881,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -901,6 +919,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -938,6 +957,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -975,6 +995,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1012,6 +1033,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1049,6 +1071,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &m19_vid_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1086,6 +1109,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1123,6 +1147,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1160,6 +1185,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1197,6 +1223,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1234,6 +1261,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1271,6 +1299,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1308,6 +1337,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1345,6 +1375,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1382,6 +1413,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1419,6 +1451,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_device_hx, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1456,6 +1489,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &t1000_video_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1493,6 +1527,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1531,6 +1566,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1570,6 +1606,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &xi8088_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1607,6 +1644,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1644,6 +1682,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1681,6 +1720,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1718,6 +1758,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &cga_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1755,6 +1796,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1792,6 +1834,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1831,6 +1874,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_1512_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1868,6 +1912,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_1640_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1905,6 +1950,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_pc2086_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1942,6 +1988,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_pc3086_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -1979,6 +2026,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_200_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2016,6 +2064,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_ppc512_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2053,6 +2102,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2090,6 +2140,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2127,6 +2178,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &ogc_m24_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2165,6 +2217,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2202,6 +2255,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2239,6 +2293,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &vid_device_sl, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2276,6 +2331,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = &t1200_video_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2313,6 +2369,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2352,6 +2409,7 @@ const machine_t machines[] = { .gpio = 0xffffffff, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2393,6 +2451,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2431,6 +2490,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2469,6 +2529,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2507,6 +2568,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2545,6 +2607,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2584,6 +2647,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2622,6 +2686,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2660,6 +2725,7 @@ const machine_t machines[] = { .gpio = 0, .device = &compaq_plasma_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2698,6 +2764,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2736,6 +2803,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2775,6 +2843,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2815,6 +2884,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2854,6 +2924,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2892,6 +2963,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2930,6 +3002,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -2968,6 +3041,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3006,6 +3080,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3044,6 +3119,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3082,6 +3158,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3120,6 +3197,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3158,6 +3236,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3196,6 +3275,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3234,6 +3314,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3272,6 +3353,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3310,6 +3392,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3348,6 +3431,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3386,6 +3470,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3424,6 +3509,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3462,6 +3548,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3502,6 +3589,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3540,6 +3628,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3581,6 +3670,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3619,6 +3709,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3657,6 +3748,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3695,6 +3787,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3733,6 +3826,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3773,6 +3867,7 @@ const machine_t machines[] = { .gpio = 0, .device = &tvga8900d_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3812,6 +3907,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3850,6 +3946,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3888,6 +3985,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3928,6 +4026,7 @@ const machine_t machines[] = { .gpio = 0, .device = &oti067_ama932j_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -3968,6 +4067,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4005,6 +4105,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4045,6 +4146,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4083,6 +4185,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4121,6 +4224,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4161,6 +4265,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5402_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4201,6 +4306,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4239,6 +4345,7 @@ const machine_t machines[] = { .gpio = 0, .device = &ati28800k_spc6033p_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4278,6 +4385,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4316,6 +4424,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4356,6 +4465,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4394,6 +4504,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4435,6 +4546,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4474,6 +4586,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4512,6 +4625,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4550,6 +4664,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4589,6 +4704,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4627,6 +4743,7 @@ const machine_t machines[] = { .gpio = 0, .device = &compaq_plasma_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4665,6 +4782,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4703,6 +4821,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4743,6 +4862,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4784,6 +4904,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4822,6 +4943,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4860,6 +4982,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4898,6 +5021,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4936,6 +5060,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -4980,6 +5105,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5020,6 +5146,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5059,6 +5186,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5097,6 +5225,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5135,6 +5264,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5174,6 +5304,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5212,6 +5343,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5253,6 +5385,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5293,6 +5426,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5428_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5331,6 +5465,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5428_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5373,6 +5508,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5411,6 +5547,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5428_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5449,6 +5586,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5488,6 +5626,7 @@ const machine_t machines[] = { .device = &s3_86c805_onboard_vlb_device, .vid_device = NULL, .fdc_device = NULL, + .sio_device = NULL, .snd_device = NULL, .net_device = NULL }, @@ -5525,6 +5664,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5564,6 +5704,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5604,6 +5745,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5645,6 +5787,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5683,6 +5826,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5721,6 +5865,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5759,6 +5904,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5797,6 +5943,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5835,6 +5982,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5873,6 +6021,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5911,6 +6060,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5949,6 +6099,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -5989,6 +6140,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6027,6 +6179,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6065,6 +6218,7 @@ const machine_t machines[] = { .gpio = 0, .device = &tgui9440_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6104,6 +6258,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6146,6 +6301,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6188,6 +6344,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6226,6 +6383,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6264,6 +6422,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6302,6 +6461,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6340,6 +6500,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6378,6 +6539,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6416,6 +6578,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6455,6 +6618,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6493,6 +6657,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6531,6 +6696,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6569,6 +6735,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6607,6 +6774,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6645,6 +6813,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6683,6 +6852,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6722,6 +6892,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6761,6 +6932,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6799,6 +6971,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6837,6 +7010,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6875,6 +7049,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6914,6 +7089,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6952,6 +7128,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -6990,6 +7167,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7028,6 +7206,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7066,6 +7245,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7108,6 +7288,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7147,6 +7328,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7186,6 +7368,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7225,6 +7408,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7264,6 +7448,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7309,6 +7494,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7347,6 +7533,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7385,6 +7572,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7423,6 +7611,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7463,6 +7652,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7501,6 +7691,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7539,6 +7730,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7577,6 +7769,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7615,6 +7808,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5434_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7657,6 +7851,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7697,6 +7892,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7737,6 +7933,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7775,6 +7972,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7816,6 +8014,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7855,6 +8054,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7893,6 +8093,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7933,6 +8134,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -7971,6 +8173,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8011,6 +8214,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8049,6 +8253,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8087,6 +8292,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8129,6 +8335,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8168,6 +8375,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8208,6 +8416,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8246,6 +8455,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8284,6 +8494,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8325,6 +8536,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8363,6 +8575,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8401,6 +8614,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8441,6 +8655,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8480,6 +8695,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8520,6 +8736,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8560,6 +8777,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_phoenix_trio64vplus_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8600,6 +8818,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_phoenix_trio64_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8638,6 +8857,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8677,6 +8897,7 @@ const machine_t machines[] = { .gpio = 0, .device = &gd5440_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8715,6 +8936,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8753,6 +8975,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8795,6 +9018,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8833,6 +9057,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8871,6 +9096,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8910,6 +9136,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8950,6 +9177,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -8990,6 +9218,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9030,6 +9259,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9068,6 +9298,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9109,6 +9340,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9147,6 +9379,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9185,6 +9418,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9225,6 +9459,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9265,6 +9500,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9306,6 +9542,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9344,6 +9581,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9384,6 +9622,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9422,6 +9661,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9461,6 +9701,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9499,6 +9740,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9538,6 +9780,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9576,6 +9819,7 @@ const machine_t machines[] = { .gpio = 0, .device = &s3_trio64v2_dx_onboard_pci_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9614,6 +9858,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9652,6 +9897,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9692,6 +9938,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9730,6 +9977,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9769,6 +10017,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9808,6 +10057,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9848,6 +10098,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9886,6 +10137,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9925,6 +10177,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -9964,6 +10217,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10002,6 +10256,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10040,6 +10295,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10078,6 +10334,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10119,6 +10376,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10160,6 +10418,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10200,6 +10459,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10238,6 +10498,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10278,6 +10539,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10316,6 +10578,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10357,6 +10620,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10396,6 +10660,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10434,6 +10699,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10472,6 +10738,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10513,6 +10780,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10552,6 +10820,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10591,6 +10860,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10630,6 +10900,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10671,6 +10942,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10711,6 +10983,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10749,6 +11022,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10788,6 +11062,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10825,6 +11100,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10865,6 +11141,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10905,6 +11182,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10943,6 +11221,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -10983,6 +11262,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11024,6 +11304,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11064,6 +11345,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11103,6 +11385,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11144,6 +11427,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11183,6 +11467,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11224,6 +11509,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11265,6 +11551,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11304,6 +11591,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11343,6 +11631,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11382,6 +11671,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11421,6 +11711,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11460,6 +11751,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11499,6 +11791,7 @@ const machine_t machines[] = { .gpio = 0, .device = &es1371_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11538,6 +11831,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11579,6 +11873,7 @@ const machine_t machines[] = { .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11618,6 +11913,7 @@ const machine_t machines[] = { .gpio = 0, .device = &voodoo_3_2000_agp_onboard_8m_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11659,6 +11955,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11700,6 +11997,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11739,6 +12037,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11778,6 +12077,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11817,6 +12117,7 @@ const machine_t machines[] = { .gpio = 0, .device = &es1371_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11859,6 +12160,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11901,6 +12203,7 @@ const machine_t machines[] = { .gpio = 0, .device = &es1371_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11941,6 +12244,7 @@ const machine_t machines[] = { .gpio = 0, .device = &cmi8738_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -11983,6 +12287,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12022,6 +12327,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12064,6 +12370,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12105,6 +12412,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12144,6 +12452,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12183,6 +12492,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12224,6 +12534,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12265,6 +12576,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12306,6 +12618,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12345,6 +12658,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12384,6 +12698,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12423,6 +12738,7 @@ const machine_t machines[] = { .gpio = 0, .device = &cmi8738_onboard_device, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12464,6 +12780,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12502,6 +12819,7 @@ const machine_t machines[] = { .gpio = 0, .device = NULL, .fdc_device = NULL, + .sio_device = NULL, .vid_device = NULL, .snd_device = NULL, .net_device = NULL @@ -12589,6 +12907,16 @@ machine_get_fdc_device(int m) return (NULL); } + +const device_t * +machine_get_sio_device(int m) +{ + if (machines[m].sio_device) + return (machines[m].sio_device); + + return (NULL); +} + const device_t * machine_get_vid_device(int m) {