From a61379eaee2cdaa1a17f278aa3d9cd9e8e02e9df Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 13 Mar 2022 09:57:57 -0400 Subject: [PATCH] src/sio --- src/sio/sio_82091aa.c | 57 ++++++++------ src/sio/sio_acc3221.c | 18 +++-- src/sio/sio_detect.c | 18 +++-- src/sio/sio_f82c710.c | 37 +++++---- src/sio/sio_fdc37c669.c | 37 +++++---- src/sio/sio_fdc37c67x.c | 18 +++-- src/sio/sio_fdc37c6xx.c | 163 ++++++++++++++++++++++++---------------- src/sio/sio_fdc37c93x.c | 91 +++++++++++++--------- src/sio/sio_fdc37m60x.c | 45 ++++++----- src/sio/sio_it8661f.c | 23 +++--- src/sio/sio_pc87306.c | 19 +++-- src/sio/sio_pc87307.c | 76 +++++++++++-------- src/sio/sio_pc87309.c | 38 ++++++---- src/sio/sio_pc87310.c | 37 +++++---- src/sio/sio_pc87311.c | 46 ++++++------ src/sio/sio_pc87332.c | 95 +++++++++++++---------- src/sio/sio_prime3b.c | 46 ++++++------ src/sio/sio_prime3c.c | 46 ++++++------ src/sio/sio_um8669f.c | 18 +++-- src/sio/sio_vt82c686.c | 18 +++-- src/sio/sio_w83787f.c | 73 +++++++++++------- src/sio/sio_w83877f.c | 76 +++++++++++-------- src/sio/sio_w83977f.c | 95 +++++++++++++---------- 23 files changed, 688 insertions(+), 502 deletions(-) diff --git a/src/sio/sio_82091aa.c b/src/sio/sio_82091aa.c index f08f686ed..e385bcd2d 100644 --- a/src/sio/sio_82091aa.c +++ b/src/sio/sio_82091aa.c @@ -275,35 +275,44 @@ i82091aa_init(const device_t *info) return dev; } - const device_t i82091aa_device = { - "Intel 82091AA Super I/O", - "i82091aa", - 0, - 0x40, - i82091aa_init, i82091aa_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Intel 82091AA Super I/O", + .internal_name = "i82091aa", + .flags = 0, + .local = 0x40, + .init = i82091aa_init, + .close = i82091aa_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t i82091aa_398_device = { - "Intel 82091AA Super I/O (Port 398h)", - "i82091aa_398", - 0, - 0x148, - i82091aa_init, i82091aa_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Intel 82091AA Super I/O (Port 398h)", + .internal_name = "i82091aa_398", + .flags = 0, + .local = 0x148, + .init = i82091aa_init, + .close = i82091aa_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t i82091aa_ide_device = { - "Intel 82091AA Super I/O (With IDE)", - "i82091aa_ide", - 0, - 0x240, - i82091aa_init, i82091aa_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Intel 82091AA Super I/O (With IDE)", + .internal_name = "i82091aa_ide", + .flags = 0, + .local = 0x240, + .init = i82091aa_init, + .close = i82091aa_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_acc3221.c b/src/sio/sio_acc3221.c index 31a62896f..313bbbd1a 100644 --- a/src/sio/sio_acc3221.c +++ b/src/sio/sio_acc3221.c @@ -476,11 +476,15 @@ acc3221_init(const device_t *info) const device_t acc3221_device = { - "ACC 3221-SP Super I/O", - "acc3221", - 0, - 0, - acc3221_init, acc3221_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "ACC 3221-SP Super I/O", + .internal_name = "acc3221", + .flags = 0, + .local = 0, + .init = acc3221_init, + .close = acc3221_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_detect.c b/src/sio/sio_detect.c index 9ac0240d1..2e3302179 100644 --- a/src/sio/sio_detect.c +++ b/src/sio/sio_detect.c @@ -108,11 +108,15 @@ sio_detect_init(const device_t *info) const device_t sio_detect_device = { - "Super I/O Detection Helper", - "sio_detect", - 0, - 0, - sio_detect_init, sio_detect_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Super I/O Detection Helper", + .internal_name = "sio_detect", + .flags = 0, + .local = 0, + .init = sio_detect_init, + .close = sio_detect_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_f82c710.c b/src/sio/sio_f82c710.c index aaa00c004..fadbc76e2 100644 --- a/src/sio/sio_f82c710.c +++ b/src/sio/sio_f82c710.c @@ -340,23 +340,30 @@ f82c710_init(const device_t *info) return dev; } - const device_t f82c606_device = { - "82C606 CHIPSpak Multifunction Controller", - "f82c606", - 0, - 606, - f82c710_init, f82c710_close, f82c710_reset, - { NULL }, NULL, NULL, - NULL + .name = "82C606 CHIPSpak Multifunction Controller", + .internal_name = "f82c606", + .flags = 0, + .local = 606, + .init = f82c710_init, + .close = f82c710_close, + .reset = f82c710_reset, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t f82c710_device = { - "F82C710 UPC Super I/O", - "f82c710", - 0, - 710, - f82c710_init, f82c710_close, f82c710_reset, - { NULL }, NULL, NULL, - NULL + .name = "F82C710 UPC Super I/O", + .internal_name = "f82c710", + .flags = 0, + .local = 710, + .init = f82c710_init, + .close = f82c710_close, + .reset = f82c710_reset, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_fdc37c669.c b/src/sio/sio_fdc37c669.c index e0d46d7f0..caa92fad5 100644 --- a/src/sio/sio_fdc37c669.c +++ b/src/sio/sio_fdc37c669.c @@ -326,24 +326,31 @@ fdc37c669_init(const device_t *info) return dev; } - const device_t fdc37c669_device = { - "SMC FDC37C669 Super I/O", - "fdc37c669", - 0, - 0, - fdc37c669_init, fdc37c669_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C669 Super I/O", + .internal_name = "fdc37c669", + .flags = 0, + .local = 0, + .init = fdc37c669_init, + .close = fdc37c669_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c669_370_device = { - "SMC FDC37C669 Super I/O (Port 370h)", - "fdc37c669_370", - 0, - 1, - fdc37c669_init, fdc37c669_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C669 Super I/O (Port 370h)", + .internal_name = "fdc37c669_370", + .flags = 0, + .local = 1, + fdc37c669_init, + fdc37c669_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_fdc37c67x.c b/src/sio/sio_fdc37c67x.c index 36b03d12f..098ffbb44 100644 --- a/src/sio/sio_fdc37c67x.c +++ b/src/sio/sio_fdc37c67x.c @@ -604,11 +604,15 @@ fdc37c67x_init(const device_t *info) const device_t fdc37c67x_device = { - "SMC FDC37C67X Super I/O", - "fdc37c67x", - 0, - 0x40, - fdc37c67x_init, fdc37c67x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C67X Super I/O", + .internal_name = "fdc37c67x", + .flags = 0, + .local = 0x40, + .init = fdc37c67x_init, + .close = fdc37c67x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_fdc37c6xx.c b/src/sio/sio_fdc37c6xx.c index 2757bb97d..15949c81c 100644 --- a/src/sio/sio_fdc37c6xx.c +++ b/src/sio/sio_fdc37c6xx.c @@ -333,95 +333,130 @@ fdc37c6xx_init(const device_t *info) return dev; } - /* The three appear to differ only in the chip ID, if I understood their datasheets correctly. */ const device_t fdc37c651_device = { - "SMC FDC37C651 Super I/O", - "fdc37c651", - 0, - 0x51, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C651 Super I/O", + .internal_name = "fdc37c651", + .flags = 0, + .local = 0x51, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c651_ide_device = { - "SMC FDC37C651 Super I/O (With IDE)", - "fdc37c651_ide", - 0, - 0x151, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C651 Super I/O (With IDE)", + .internal_name = "fdc37c651_ide", + .flags = 0, + .local = 0x151, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c661_device = { - "SMC FDC37C661 Super I/O", - "fdc37c661", - 0, - 0x61, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C661 Super I/O", + .internal_name = "fdc37c661", + .flags = 0, + .local = 0x61, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c661_ide_device = { - "SMC FDC37C661 Super I/O (With IDE)", - "fdc37c661_ide", - 0, - 0x161, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C661 Super I/O (With IDE)", + .internal_name = "fdc37c661_ide", + .flags = 0, + .local = 0x161, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c663_device = { - "SMC FDC37C663 Super I/O", - "fdc37c663", - 0, - 0x63, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C663 Super I/O", + .internal_name = "fdc37c663", + .flags = 0, + .local = 0x63, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c663_ide_device = { - "SMC FDC37C663 Super I/O (With IDE)", - "fdc37c663_ide", - 0, - 0x163, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C663 Super I/O (With IDE)", + .internal_name = "fdc37c663_ide", + .flags = 0, + .local = 0x163, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c665_device = { - "SMC FDC37C665 Super I/O", - "fdc37c665", - 0, - 0x65, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C665 Super I/O", + .internal_name = "fdc37c665", + .flags = 0, + .local = 0x65, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c665_ide_device = { - "SMC FDC37C665 Super I/O (With IDE)", - "fdc37c665_ide", - 0, - 0x265, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C665 Super I/O (With IDE)", + .internal_name = "fdc37c665_ide", + .flags = 0, + .local = 0x265, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c666_device = { - "SMC FDC37C666 Super I/O", - "fdc37c666", - 0, - 0x66, - fdc37c6xx_init, fdc37c6xx_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C666 Super I/O", + .internal_name = "fdc37c666", + .flags = 0, + .local = 0x66, + .init = fdc37c6xx_init, + .close = fdc37c6xx_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c index 0530c1dd0..b9e9ef767 100644 --- a/src/sio/sio_fdc37c93x.c +++ b/src/sio/sio_fdc37c93x.c @@ -884,53 +884,72 @@ fdc37c93x_init(const device_t *info) return dev; } - const device_t fdc37c931apm_device = { - "SMC FDC37C932QF Super I/O", - "fdc37c931apm", - 0, - 0x130, /* Share the same ID with the 932QF. */ - fdc37c93x_init, fdc37c93x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C932QF Super I/O", + .internal_name = "fdc37c931apm", + .flags = 0, + .local = 0x130, /* Share the same ID with the 932QF. */ + .init = fdc37c93x_init, + .close = fdc37c93x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c931apm_compaq_device = { - "SMC FDC37C932QF Super I/O (Compaq Presario 4500)", - "fdc37c931apm_compaq", - 0, - 0x330, /* Share the same ID with the 932QF. */ - fdc37c93x_init, fdc37c93x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C932QF Super I/O (Compaq Presario 4500)", + .internal_name = "fdc37c931apm_compaq", + .flags = 0, + .local = 0x330, /* Share the same ID with the 932QF. */ + .init = fdc37c93x_init, + .close = fdc37c93x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c932fr_device = { - "SMC FDC37C932FR Super I/O", - "fdc37c932fr", - 0, - 0x03, - fdc37c93x_init, fdc37c93x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C932FR Super I/O", + .internal_name = "fdc37c932fr", + .flags = 0, + .local = 0x03, + .init = fdc37c93x_init, + .close = fdc37c93x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c932qf_device = { - "SMC FDC37C932QF Super I/O", - "fdc37c932qf", - 0, - 0x30, - fdc37c93x_init, fdc37c93x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C932QF Super I/O", + .internal_name = "fdc37c932qf", + .flags = 0, + .local = 0x30, + .init = fdc37c93x_init, + .close = fdc37c93x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37c935_device = { - "SMC FDC37C935 Super I/O", - "fdc37c935", - 0, - 0x02, - fdc37c93x_init, fdc37c93x_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "SMC FDC37C935 Super I/O", + .internal_name = "fdc37c935", + .flags = 0, + .local = 0x02, + .init = fdc37c93x_init, + .close = fdc37c93x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_fdc37m60x.c b/src/sio/sio_fdc37m60x.c index fc54ec157..a4433e582 100644 --- a/src/sio/sio_fdc37m60x.c +++ b/src/sio/sio_fdc37m60x.c @@ -314,31 +314,30 @@ fdc37m60x_init(const device_t *info) return dev; } - const device_t fdc37m60x_device = { - "SMSC FDC37M60X", - "fdc37m60x", - 0, - FDC_PRIMARY_ADDR, - fdc37m60x_init, - fdc37m60x_close, - NULL, - { NULL }, - NULL, - NULL, - NULL + .name = "SMSC FDC37M60X", + .internal_name = "fdc37m60x", + .flags = 0, + .local = FDC_PRIMARY_ADDR, + .init = fdc37m60x_init, + .close = fdc37m60x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t fdc37m60x_370_device = { - "SMSC FDC37M60X with 10K Pull Up Resistor", - "fdc37m60x_370", - 0, - FDC_SECONDARY_ADDR, - fdc37m60x_init, - fdc37m60x_close, - NULL, - { NULL }, - NULL, - NULL, - NULL + .name = "SMSC FDC37M60X with 10K Pull Up Resistor", + .internal_name = "fdc37m60x_370", + .flags = 0, + .local = FDC_SECONDARY_ADDR, + .init = fdc37m60x_init, + .close = fdc37m60x_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_it8661f.c b/src/sio/sio_it8661f.c index 529e6f0a9..31109df91 100644 --- a/src/sio/sio_it8661f.c +++ b/src/sio/sio_it8661f.c @@ -335,17 +335,16 @@ it8661f_init(const device_t *info) return dev; } - const device_t it8661f_device = { - "ITE IT8661F", - "it8661f", - 0, - 0, - it8661f_init, - it8661f_close, - NULL, - { NULL }, - NULL, - NULL, - NULL + .name = "ITE IT8661F", + .internal_name = "it8661f", + .flags = 0, + .local = 0, + .init = it8661f_init, + .close = it8661f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_pc87306.c b/src/sio/sio_pc87306.c index ce768112a..5037768fd 100644 --- a/src/sio/sio_pc87306.c +++ b/src/sio/sio_pc87306.c @@ -418,13 +418,16 @@ pc87306_init(const device_t *info) return dev; } - const device_t pc87306_device = { - "National Semiconductor PC87306 Super I/O", - "pc87306", - 0, - 0, - pc87306_init, pc87306_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87306 Super I/O", + .internal_name = "pc87306", + .flags = 0, + .local = 0, + .init = pc87306_init, + .close = pc87306_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_pc87307.c b/src/sio/sio_pc87307.c index 24432c670..91dd1f59d 100644 --- a/src/sio/sio_pc87307.c +++ b/src/sio/sio_pc87307.c @@ -590,46 +590,58 @@ pc87307_init(const device_t *info) return dev; } - const device_t pc87307_device = { - "National Semiconductor PC87307 Super I/O", - "pc87307", - 0, - 0x1c0, - pc87307_init, pc87307_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87307 Super I/O", + .internal_name = "pc87307", + .flags = 0, + .local = 0x1c0, + .init = pc87307_init, + .close = pc87307_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87307_15c_device = { - "National Semiconductor PC87307 Super I/O (Port 15Ch)", - "pc87307_15c", - 0, - 0x2c0, - pc87307_init, pc87307_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87307 Super I/O (Port 15Ch)", + .internal_name = "pc87307_15c", + .flags = 0, + .local = 0x2c0, + .init = pc87307_init, + .close = pc87307_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87307_both_device = { - "National Semiconductor PC87307 Super I/O (Ports 2Eh and 15Ch)", - "pc87307_both", - 0, - 0x3c0, - pc87307_init, pc87307_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87307 Super I/O (Ports 2Eh and 15Ch)", + .internal_name = "pc87307_both", + .flags = 0, + .local = 0x3c0, + .init = pc87307_init, + .close = pc87307_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc97307_device = { - "National Semiconductor PC97307 Super I/O", - "pc97307", - 0, - 0x1cf, - pc87307_init, pc87307_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC97307 Super I/O", + .internal_name = "pc97307", + .flags = 0, + .local = 0x1cf, + .init = pc87307_init, + .close = pc87307_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_pc87309.c b/src/sio/sio_pc87309.c index ad214ff6a..bf261a26f 100644 --- a/src/sio/sio_pc87309.c +++ b/src/sio/sio_pc87309.c @@ -471,24 +471,30 @@ pc87309_init(const device_t *info) return dev; } - const device_t pc87309_device = { - "National Semiconductor PC87309 Super I/O", - "pc87309", - 0, - 0xe0, - pc87309_init, pc87309_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87309 Super I/O", + .internal_name = "pc87309", + .flags = 0, + .local = 0xe0, + .init = pc87309_init, + .close = pc87309_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87309_15c_device = { - "National Semiconductor PC87309 Super I/O (Port 15Ch)", - "pc87309_15c", - 0, - 0x1e0, - pc87309_init, pc87309_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87309 Super I/O (Port 15Ch)", + .internal_name = "pc87309_15c", + .flags = 0, + .local = 0x1e0, + .init = pc87309_init, + .close = pc87309_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_pc87310.c b/src/sio/sio_pc87310.c index d753e4c57..7817fee9d 100644 --- a/src/sio/sio_pc87310.c +++ b/src/sio/sio_pc87310.c @@ -263,23 +263,30 @@ pc87310_init(const device_t *info) return dev; } - const device_t pc87310_device = { - "National Semiconductor PC87310 Super I/O", - "pc87310", - 0, - 0, - pc87310_init, pc87310_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87310 Super I/O", + .internal_name = "pc87310", + .flags = 0, + .local = 0, + .init = pc87310_init, + .close = pc87310_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t pc87310_ide_device = { - "National Semiconductor PC87310 Super I/O with IDE functionality", - "pc87310_ide", - 0, - 1, - pc87310_init, pc87310_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87310 Super I/O with IDE functionality", + .internal_name = "pc87310_ide", + .flags = 0, + .local = 1, + .init = pc87310_init, + .close = pc87310_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_pc87311.c b/src/sio/sio_pc87311.c index be845b316..f52b065df 100644 --- a/src/sio/sio_pc87311.c +++ b/src/sio/sio_pc87311.c @@ -273,27 +273,29 @@ pc87311_init(const device_t *info) } const device_t pc87311_device = { - "National Semiconductor PC87311", - "pc87311", - 0, - 0, - pc87311_init, - pc87311_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "National Semiconductor PC87311", + .internal_name = "pc87311", + .flags = 0, + .local = 0, + .init = pc87311_init, + .close = pc87311_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; const device_t pc87311_ide_device = { - "National Semiconductor PC87311 with IDE functionality", - "pc87311_ide", - 0, - 1, - pc87311_init, - pc87311_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "National Semiconductor PC87311 with IDE functionality", + .internal_name = "pc87311_ide", + .flags = 0, + .local = 1, + .init = pc87311_init, + .close = pc87311_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; diff --git a/src/sio/sio_pc87332.c b/src/sio/sio_pc87332.c index 06df40669..a2fd7f0d3 100644 --- a/src/sio/sio_pc87332.c +++ b/src/sio/sio_pc87332.c @@ -335,57 +335,72 @@ pc87332_init(const device_t *info) return dev; } - const device_t pc87332_device = { - "National Semiconductor PC87332 Super I/O", - "pc87332", - 0, - 0x00, - pc87332_init, pc87332_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87332 Super I/O", + .internal_name = "pc87332", + .flags = 0, + .local = 0x00, + .init = pc87332_init, + .close = pc87332_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87332_398_device = { - "National Semiconductor PC87332 Super I/O (Port 398h)", - "pc87332_398", - 0, - 0x01, - pc87332_init, pc87332_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87332 Super I/O (Port 398h)", + .internal_name = "pc87332_398", + .flags = 0, + .local = 0x01, + .init = pc87332_init, + .close = pc87332_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87332_398_ide_device = { - "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE)", - "pc87332_398_ide", - 0, - 0x101, - pc87332_init, pc87332_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE)", + .internal_name = "pc87332_398_ide", + .flags = 0, + .local = 0x101, + .init = pc87332_init, + .close = pc87332_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87332_398_ide_sec_device = { - "National Semiconductor PC87332 Super I/O (Port 398h) (With Secondary IDE)", - "pc87332_398_ide_sec", - 0, - 0x201, - pc87332_init, pc87332_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87332 Super I/O (Port 398h) (With Secondary IDE)", + .internal_name = "pc87332_398_ide_sec", + .flags = 0, + .local = 0x201, + .init = pc87332_init, + .close = pc87332_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t pc87332_398_ide_fdcon_device = { - "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE and FDC on)", - "pc87332_398_ide_fdcon", - 0, - 0x10101, - pc87332_init, pc87332_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE and FDC on)", + .internal_name = "pc87332_398_ide_fdcon", + .flags = 0, + .local = 0x10101, + .init = pc87332_init, + .close = pc87332_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_prime3b.c b/src/sio/sio_prime3b.c index ec3b74a5c..ac00106d3 100644 --- a/src/sio/sio_prime3b.c +++ b/src/sio/sio_prime3b.c @@ -269,27 +269,29 @@ prime3b_init(const device_t *info) } const device_t prime3b_device = { - "Goldstar Prime3B", - "prime3b", - 0, - 0, - prime3b_init, - prime3b_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "Goldstar Prime3B", + .internal_name = "prime3b", + .flags = 0, + .local = 0, + .init = prime3b_init, + .close = prime3b_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; const device_t prime3b_ide_device = { - "Goldstar Prime3B with IDE functionality", - "prime3b_ide", - 0, - 1, - prime3b_init, - prime3b_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "Goldstar Prime3B with IDE functionality", + .internal_name = "prime3b_ide", + .flags = 0, + .local = 1, + .init = prime3b_init, + .close = prime3b_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; diff --git a/src/sio/sio_prime3c.c b/src/sio/sio_prime3c.c index 1b4bde5d4..ec350ece2 100644 --- a/src/sio/sio_prime3c.c +++ b/src/sio/sio_prime3c.c @@ -318,27 +318,29 @@ prime3c_init(const device_t *info) } const device_t prime3c_device = { - "Goldstar Prime3C", - "prime3c", - 0, - 0, - prime3c_init, - prime3c_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "Goldstar Prime3C", + .internal_name = "prime3c", + .flags = 0, + .local = 0, + .init = prime3c_init, + .close = prime3c_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; const device_t prime3c_ide_device = { - "Goldstar Prime3C with IDE functionality", - "prime3c_ide", - 0, - 1, - prime3c_init, - prime3c_close, - NULL, - {NULL}, - NULL, - NULL, - NULL}; + .name = "Goldstar Prime3C with IDE functionality", + .internal_name = "prime3c_ide", + .flags = 0, + .local = 1, + .init = prime3c_init, + .close = prime3c_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL +}; diff --git a/src/sio/sio_um8669f.c b/src/sio/sio_um8669f.c index dc9fa5209..aece09fe6 100644 --- a/src/sio/sio_um8669f.c +++ b/src/sio/sio_um8669f.c @@ -302,11 +302,15 @@ um8669f_init(const device_t *info) const device_t um8669f_device = { - "UMC UM8669F Super I/O", - "um8669f", - 0, - 0, - um8669f_init, um8669f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "UMC UM8669F Super I/O", + .internal_name = "um8669f", + .flags = 0, + .local = 0, + .init = um8669f_init, + .close = um8669f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_vt82c686.c b/src/sio/sio_vt82c686.c index 40ba7c356..8d242165e 100644 --- a/src/sio/sio_vt82c686.c +++ b/src/sio/sio_vt82c686.c @@ -303,11 +303,15 @@ vt82c686_init(const device_t *info) const device_t via_vt82c686_sio_device = { - "VIA VT82C686 Integrated Super I/O", - "via_vt82c686_sio", - 0, - 0, - vt82c686_init, vt82c686_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "VIA VT82C686 Integrated Super I/O", + .internal_name = "via_vt82c686_sio", + .flags = 0, + .local = 0, + .init = vt82c686_init, + .close = vt82c686_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_w83787f.c b/src/sio/sio_w83787f.c index 9bd6c86c0..fe48f5d79 100644 --- a/src/sio/sio_w83787f.c +++ b/src/sio/sio_w83787f.c @@ -444,43 +444,58 @@ w83787f_init(const device_t *info) return dev; } - const device_t w83787f_device = { - "Winbond W83787F/IF Super I/O", - "w83787f", - 0, - 0x09, - w83787f_init, w83787f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83787F/IF Super I/O", + .internal_name = "w83787f", + .flags = 0, + .local = 0x09, + .init = w83787f_init, + .close = w83787f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t w83787f_ide_device = { - "Winbond W83787F/IF Super I/O (With IDE)", - "w83787f_ide", - 0, - 0x19, - w83787f_init, w83787f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83787F/IF Super I/O (With IDE)", + .internal_name = "w83787f_ide", + .flags = 0, + .local = 0x19, + .init = w83787f_init, + .close = w83787f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t w83787f_ide_en_device = { - "Winbond W83787F/IF Super I/O (With IDE Enabled)", - "w83787f_ide_en", - 0, - 0x59, - w83787f_init, w83787f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83787F/IF Super I/O (With IDE Enabled)", + .internal_name = "w83787f_ide_en", + .flags = 0, + .local = 0x59, + .init = w83787f_init, + .close = w83787f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; const device_t w83787f_ide_sec_device = { - "Winbond W83787F/IF Super I/O (With Secondary IDE)", - "w83787f_ide_sec", - 0, - 0x39, - w83787f_init, w83787f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83787F/IF Super I/O (With Secondary IDE)", + .internal_name = "w83787f_ide_sec", + .flags = 0, + .local = 0x39, + .init = w83787f_init, + .close = w83787f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_w83877f.c b/src/sio/sio_w83877f.c index fc0c64c3c..424414e01 100644 --- a/src/sio/sio_w83877f.c +++ b/src/sio/sio_w83877f.c @@ -459,46 +459,58 @@ w83877f_init(const device_t *info) return dev; } - const device_t w83877f_device = { - "Winbond W83877F Super I/O", - "w83877f", - 0, - 0x0a05, - w83877f_init, w83877f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83877F Super I/O", + .internal_name = "w83877f", + .flags = 0, + .local = 0x0a05, + .init = w83877f_init, + .close = w83877f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83877f_president_device = { - "Winbond W83877F Super I/O (President)", - "w83877f_president", - 0, - 0x0a04, - w83877f_init, w83877f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83877F Super I/O (President)", + .internal_name = "w83877f_president", + .flags = 0, + .local = 0x0a04, + .init = w83877f_init, + .close = w83877f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83877tf_device = { - "Winbond W83877TF Super I/O", - "w83877tf", - 0, - 0x0c04, - w83877f_init, w83877f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83877TF Super I/O", + .internal_name = "w83877tf", + .flags = 0, + .local = 0x0c04, + .init = w83877f_init, + .close = w83877f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83877tf_acorp_device = { - "Winbond W83877TF Super I/O", - "w83877tf_acorp", - 0, - 0x0c05, - w83877f_init, w83877f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83877TF Super I/O", + .internal_name = "w83877tf_acorp", + .flags = 0, + .local = 0x0c05, + .init = w83877f_init, + .close = w83877f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; diff --git a/src/sio/sio_w83977f.c b/src/sio/sio_w83977f.c index 6320d64c3..370bb8c68 100644 --- a/src/sio/sio_w83977f.c +++ b/src/sio/sio_w83977f.c @@ -566,57 +566,72 @@ w83977f_init(const device_t *info) return dev; } - const device_t w83977f_device = { - "Winbond W83977F Super I/O", - "w83977f", - 0, - 0, - w83977f_init, w83977f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83977F Super I/O", + .internal_name = "w83977f", + .flags = 0, + .local = 0, + .init = w83977f_init, + .close = w83977f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83977f_370_device = { - "Winbond W83977F Super I/O (Port 370h)", - "w83977f_370", - 0, - 0x40, - w83977f_init, w83977f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83977F Super I/O (Port 370h)", + .internal_name = "w83977f_370", + .flags = 0, + .local = 0x40, + .init = w83977f_init, + .close = w83977f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83977tf_device = { - "Winbond W83977TF Super I/O", - "w83977tf", - 0, - 1, - w83977f_init, w83977f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83977TF Super I/O", + .internal_name = "w83977tf", + .flags = 0, + .local = 1, + .init = w83977f_init, + .close = w83977f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83977ef_device = { - "Winbond W83977TF Super I/O", - "w83977ef", - 0, - 2, - w83977f_init, w83977f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83977TF Super I/O", + .internal_name = "w83977ef", + .flags = 0, + .local = 2, + .init = w83977f_init, + .close = w83977f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL }; - const device_t w83977ef_370_device = { - "Winbond W83977TF Super I/O (Port 370h)", - "w83977ef_370", - 0, - 0x42, - w83977f_init, w83977f_close, NULL, - { NULL }, NULL, NULL, - NULL + .name = "Winbond W83977TF Super I/O (Port 370h)", + .internal_name = "w83977ef_370", + .flags = 0, + .local = 0x42, + .init = w83977f_init, + .close = w83977f_close, + .reset = NULL, + { .available = NULL }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = NULL };