refactored device_t and all declarations

src/sio/sio_82091aa.c

@@ -278,6 +278,7 @@ i82091aa_init(const device_t *info)
 
 const device_t i82091aa_device = {
     "Intel 82091AA Super I/O",
+    "i82091aa",
     0,
     0x40,
     i82091aa_init, i82091aa_close, NULL,
@@ -288,6 +289,7 @@ const device_t i82091aa_device = {
 
 const device_t i82091aa_398_device = {
     "Intel 82091AA Super I/O (Port 398h)",
+    "i82091aa_398",
     0,
     0x148,
     i82091aa_init, i82091aa_close, NULL,
@@ -298,6 +300,7 @@ const device_t i82091aa_398_device = {
 
 const device_t i82091aa_ide_device = {
     "Intel 82091AA Super I/O (With IDE)",
+    "i82091aa_ide",
     0,
     0x240,
     i82091aa_init, i82091aa_close, NULL,

src/sio/sio_acc3221.c

@@ -477,6 +477,7 @@ 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,

src/sio/sio_detect.c

@@ -109,6 +109,7 @@ 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,

src/sio/sio_f82c710.c

@@ -343,6 +343,7 @@ f82c710_init(const device_t *info)
 
 const device_t f82c606_device = {
     "82C606 CHIPSpak Multifunction Controller",
+    "f82c606",
     0,
     606,
     f82c710_init, f82c710_close, f82c710_reset,
@@ -352,6 +353,7 @@ const device_t f82c606_device = {
 
 const device_t f82c710_device = {
     "F82C710 UPC Super I/O",
+    "f82c710",
     0,
     710,
     f82c710_init, f82c710_close, f82c710_reset,

src/sio/sio_fdc37c669.c

@@ -329,6 +329,7 @@ fdc37c669_init(const device_t *info)
 
 const device_t fdc37c669_device = {
     "SMC FDC37C669 Super I/O",
+    "fdc37c669",
     0,
     0,
     fdc37c669_init, fdc37c669_close, NULL,
@@ -339,6 +340,7 @@ const device_t fdc37c669_device = {
 
 const device_t fdc37c669_370_device = {
     "SMC FDC37C669 Super I/O (Port 370h)",
+    "fdc37c669_370",
     0,
     1,
     fdc37c669_init, fdc37c669_close, NULL,

src/sio/sio_fdc37c67x.c

@@ -605,6 +605,7 @@ fdc37c67x_init(const device_t *info)
 
 const device_t fdc37c67x_device = {
     "SMC FDC37C67X Super I/O",
+    "fdc37c67x",
     0,
     0x40,
     fdc37c67x_init, fdc37c67x_close, NULL,

src/sio/sio_fdc37c6xx.c

@@ -347,6 +347,7 @@ const device_t fdc37c651_device = {
 
 const device_t fdc37c651_ide_device = {
     "SMC FDC37C651 Super I/O (With IDE)",
+    "fdc37c651_ide",
     0,
     0x151,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -356,6 +357,7 @@ const device_t fdc37c651_ide_device = {
 
 const device_t fdc37c661_device = {
     "SMC FDC37C661 Super I/O",
+    "fdc37c661",
     0,
     0x61,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -365,6 +367,7 @@ const device_t fdc37c661_device = {
 
 const device_t fdc37c661_ide_device = {
     "SMC FDC37C661 Super I/O (With IDE)",
+    "fdc37c661_ide",
     0,
     0x161,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -374,6 +377,7 @@ const device_t fdc37c661_ide_device = {
 
 const device_t fdc37c663_device = {
     "SMC FDC37C663 Super I/O",
+    "fdc37c663",
     0,
     0x63,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -383,6 +387,7 @@ const device_t fdc37c663_device = {
 
 const device_t fdc37c663_ide_device = {
     "SMC FDC37C663 Super I/O (With IDE)",
+    "fdc37c663_ide",
     0,
     0x163,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -392,6 +397,7 @@ const device_t fdc37c663_ide_device = {
 
 const device_t fdc37c665_device = {
     "SMC FDC37C665 Super I/O",
+    "fdc37c665",
     0,
     0x65,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -401,6 +407,7 @@ const device_t fdc37c665_device = {
 
 const device_t fdc37c665_ide_device = {
     "SMC FDC37C665 Super I/O (With IDE)",
+    "fdc37c665_ide",
     0,
     0x265,
     fdc37c6xx_init, fdc37c6xx_close, NULL,
@@ -410,6 +417,7 @@ const device_t fdc37c665_ide_device = {
 
 const device_t fdc37c666_device = {
     "SMC FDC37C666 Super I/O",
+    "fdc37c666",
     0,
     0x66,
     fdc37c6xx_init, fdc37c6xx_close, NULL,

src/sio/sio_fdc37c93x.c

@@ -814,6 +814,7 @@ access_bus_init(const device_t *info)
 
 static const device_t access_bus_device = {
     "SMC FDC37C932FR ACCESS.bus",
+    "access_bus",
     0,
     0x03,
     access_bus_init, access_bus_close, NULL,
@@ -886,6 +887,7 @@ fdc37c93x_init(const device_t *info)
 
 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,
@@ -895,6 +897,7 @@ const device_t fdc37c931apm_device = {
 
 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,
@@ -904,6 +907,7 @@ const device_t fdc37c931apm_compaq_device = {
 
 const device_t fdc37c932fr_device = {
     "SMC FDC37C932FR Super I/O",
+    "fdc37c932fr",
     0,
     0x03,
     fdc37c93x_init, fdc37c93x_close, NULL,
@@ -913,6 +917,7 @@ const device_t fdc37c932fr_device = {
 
 const device_t fdc37c932qf_device = {
     "SMC FDC37C932QF Super I/O",
+    "fdc37c932qf",
     0,
     0x30,
     fdc37c93x_init, fdc37c93x_close, NULL,
@@ -922,6 +927,7 @@ const device_t fdc37c932qf_device = {
 
 const device_t fdc37c935_device = {
     "SMC FDC37C935 Super I/O",
+    "fdc37c935",
     0,
     0x02,
     fdc37c93x_init, fdc37c93x_close, NULL,

src/sio/sio_fdc37m60x.c

@@ -317,6 +317,7 @@ fdc37m60x_init(const device_t *info)
 
 const device_t fdc37m60x_device = {
     "SMSC FDC37M60X",
+    "fdc37m60x",
     0,
     0x03f0,
     fdc37m60x_init,
@@ -330,6 +331,7 @@ const device_t fdc37m60x_device = {
 
 const device_t fdc37m60x_370_device = {
     "SMSC FDC37M60X with 10K Pull Up Resistor",
+    "fdc37m60x_370",
     0,
     0x0370,
     fdc37m60x_init,

src/sio/sio_it8661f.c

@@ -338,6 +338,7 @@ it8661f_init(const device_t *info)
 
 const device_t it8661f_device = {
     "ITE IT8661F",
+    "it8661f",
     0,
     0,
     it8661f_init,

src/sio/sio_pc87306.c

@@ -421,6 +421,7 @@ pc87306_init(const device_t *info)
 
 const device_t pc87306_device = {
     "National Semiconductor PC87306 Super I/O",
+    "pc87306",
     0,
     0,
     pc87306_init, pc87306_close, NULL,

src/sio/sio_pc87307.c

@@ -593,6 +593,7 @@ pc87307_init(const device_t *info)
 
 const device_t pc87307_device = {
     "National Semiconductor PC87307 Super I/O",
+    "pc87307",
     0,
     0x1c0,
     pc87307_init, pc87307_close, NULL,
@@ -603,6 +604,7 @@ const device_t pc87307_device = {
 
 const device_t pc87307_15c_device = {
     "National Semiconductor PC87307 Super I/O (Port 15Ch)",
+    "pc87307_15c",
     0,
     0x2c0,
     pc87307_init, pc87307_close, NULL,
@@ -613,6 +615,7 @@ const device_t pc87307_15c_device = {
 
 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,
@@ -623,6 +626,7 @@ const device_t pc87307_both_device = {
 
 const device_t pc97307_device = {
     "National Semiconductor PC97307 Super I/O",
+    "pc97307",
     0,
     0x1cf,
     pc87307_init, pc87307_close, NULL,

src/sio/sio_pc87309.c

@@ -474,6 +474,7 @@ pc87309_init(const device_t *info)
 
 const device_t pc87309_device = {
     "National Semiconductor PC87309 Super I/O",
+    "pc87309",
     0,
     0xe0,
     pc87309_init, pc87309_close, NULL,
@@ -484,6 +485,7 @@ const device_t pc87309_device = {
 
 const device_t pc87309_15c_device = {
     "National Semiconductor PC87309 Super I/O (Port 15Ch)",
+    "pc87309_15c",
     0,
     0x1e0,
     pc87309_init, pc87309_close, NULL,

src/sio/sio_pc87310.c

@@ -266,6 +266,7 @@ pc87310_init(const device_t *info)
 
 const device_t pc87310_device = {
     "National Semiconductor PC87310 Super I/O",
+    "pc87310",
     0,
     0,
     pc87310_init, pc87310_close, NULL,
@@ -275,6 +276,7 @@ const device_t pc87310_device = {
 
 const device_t pc87310_ide_device = {
     "National Semiconductor PC87310 Super I/O with IDE functionality",
+    "pc87310_ide",
     0,
     1,
     pc87310_init, pc87310_close, NULL,

src/sio/sio_pc87311.c

@@ -274,6 +274,7 @@ pc87311_init(const device_t *info)
 
 const device_t pc87311_device = {
     "National Semiconductor PC87311",
+    "pc87311",
     0,
     0,
     pc87311_init,
@@ -286,6 +287,7 @@ const device_t pc87311_device = {
 
 const device_t pc87311_ide_device = {
     "National Semiconductor PC87311 with IDE functionality",
+    "pc87311_ide",
     0,
     1,
     pc87311_init,

src/sio/sio_pc87332.c

@@ -338,6 +338,7 @@ pc87332_init(const device_t *info)
 
 const device_t pc87332_device = {
     "National Semiconductor PC87332 Super I/O",
+    "pc87332",
     0,
     0x00,
     pc87332_init, pc87332_close, NULL,
@@ -348,16 +349,19 @@ const device_t pc87332_device = {
 
 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,
+    "pc87332",
     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,
@@ -368,6 +372,7 @@ const device_t pc87332_398_ide_device = {
 
 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,
@@ -378,6 +383,7 @@ const device_t pc87332_398_ide_sec_device = {
 
 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,

src/sio/sio_prime3b.c

@@ -269,6 +269,7 @@ prime3b_init(const device_t *info)
 
 const device_t prime3b_device = {
     "Goldstar Prime3B",
+    "prime3b",
     0,
     0,
     prime3b_init,
@@ -281,6 +282,7 @@ const device_t prime3b_device = {
 
 const device_t prime3b_ide_device = {
     "Goldstar Prime3B with IDE functionality",
+    "prime3b_ide",
     0,
     1,
     prime3b_init,

src/sio/sio_prime3c.c

@@ -319,6 +319,7 @@ prime3c_init(const device_t *info)
 
 const device_t prime3c_device = {
     "Goldstar Prime3C",
+    "prime3c",
     0,
     0,
     prime3c_init,
@@ -331,6 +332,7 @@ const device_t prime3c_device = {
 
 const device_t prime3c_ide_device = {
     "Goldstar Prime3C with IDE functionality",
+    "prime3c_ide",
     0,
     1,
     prime3c_init,

src/sio/sio_um8669f.c

@@ -303,6 +303,7 @@ um8669f_init(const device_t *info)
 
 const device_t um8669f_device = {
     "UMC UM8669F Super I/O",
+    "um8669f",
     0,
     0,
     um8669f_init, um8669f_close, NULL,

src/sio/sio_vt82c686.c

@@ -304,6 +304,7 @@ 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,

src/sio/sio_w83787f.c

@@ -447,6 +447,7 @@ w83787f_init(const device_t *info)
 
 const device_t w83787f_device = {
     "Winbond W83787F/IF Super I/O",
+    "w83787f",
     0,
     0x09,
     w83787f_init, w83787f_close, NULL,
@@ -456,6 +457,7 @@ const device_t w83787f_device = {
 
 const device_t w83787f_ide_device = {
     "Winbond W83787F/IF Super I/O (With IDE)",
+    "w83787f_ide",
     0,
     0x19,
     w83787f_init, w83787f_close, NULL,
@@ -465,6 +467,7 @@ const device_t w83787f_ide_device = {
 
 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,
@@ -474,6 +477,7 @@ const device_t w83787f_ide_en_device = {
 
 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,

src/sio/sio_w83877f.c

@@ -462,6 +462,7 @@ w83877f_init(const device_t *info)
 
 const device_t w83877f_device = {
     "Winbond W83877F Super I/O",
+    "w83877f",
     0,
     0x0a05,
     w83877f_init, w83877f_close, NULL,
@@ -472,6 +473,7 @@ const device_t w83877f_device = {
 
 const device_t w83877f_president_device = {
     "Winbond W83877F Super I/O (President)",
+    "w83877f_president",
     0,
     0x0a04,
     w83877f_init, w83877f_close, NULL,
@@ -482,6 +484,7 @@ const device_t w83877f_president_device = {
 
 const device_t w83877tf_device = {
     "Winbond W83877TF Super I/O",
+    "w83877tf",
     0,
     0x0c04,
     w83877f_init, w83877f_close, NULL,
@@ -492,6 +495,7 @@ const device_t w83877tf_device = {
 
 const device_t w83877tf_acorp_device = {
     "Winbond W83877TF Super I/O",
+    "w83877tf_acorp",
     0,
     0x0c05,
     w83877f_init, w83877f_close, NULL,

src/sio/sio_w83977f.c

@@ -569,6 +569,7 @@ w83977f_init(const device_t *info)
 
 const device_t w83977f_device = {
     "Winbond W83977F Super I/O",
+    "w83977f",
     0,
     0,
     w83977f_init, w83977f_close, NULL,
@@ -579,6 +580,7 @@ const device_t w83977f_device = {
 
 const device_t w83977f_370_device = {
     "Winbond W83977F Super I/O (Port 370h)",
+    "w83977f_370",
     0,
     0x40,
     w83977f_init, w83977f_close, NULL,
@@ -589,6 +591,7 @@ const device_t w83977f_370_device = {
 
 const device_t w83977tf_device = {
     "Winbond W83977TF Super I/O",
+    "w83977tf",
     0,
     1,
     w83977f_init, w83977f_close, NULL,
@@ -599,6 +602,7 @@ const device_t w83977tf_device = {
 
 const device_t w83977ef_device = {
     "Winbond W83977TF Super I/O",
+    "w83977ef",
     0,
     2,
     w83977f_init, w83977f_close, NULL,
@@ -609,6 +613,7 @@ const device_t w83977ef_device = {
 
 const device_t w83977ef_370_device = {
     "Winbond W83977TF Super I/O (Port 370h)",
+    "w83977ef_370",
     0,
     0x42,
     w83977f_init, w83977f_close, NULL,