diff --git a/src/chipset/82c100.c b/src/chipset/82c100.c
index 76a6590bf..8b2259374 100644
--- a/src/chipset/82c100.c
+++ b/src/chipset/82c100.c
@@ -397,11 +397,15 @@ ct_82c100_init(const device_t *info)
 
 
 const device_t ct_82c100_device = {
-    "C&T 82C100",
-    "ct_82c100",
-    0,
-    0,
-    ct_82c100_init, ct_82c100_close, ct_82c100_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T 82C100",
+    .internal_name = "ct_82c100",
+    .flags = 0,
+    .local = 0,
+    .init = ct_82c100_init,
+    .close = ct_82c100_close,
+    .reset = ct_82c100_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/acc2168.c b/src/chipset/acc2168.c
index ba8331447..9b8865784 100644
--- a/src/chipset/acc2168.c
+++ b/src/chipset/acc2168.c
@@ -193,14 +193,15 @@ acc2168_init(const device_t *info)
 }
 
 const device_t acc2168_device = {
-    "ACC 2046/2168",
-    "acc2168",
-    0,
-    0,
-    acc2168_init,
-    acc2168_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "ACC 2046/2168",
+    .internal_name = "acc2168",
+    .flags = 0,
+    .local = 0,
+    .init = acc2168_init,
+    .close = acc2168_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/ali1429.c b/src/chipset/ali1429.c
index ccd7e5007..468ed4f00 100644
--- a/src/chipset/ali1429.c
+++ b/src/chipset/ali1429.c
@@ -339,21 +339,29 @@ ali1429_init(const device_t *info)
 }
 
 const device_t ali1429_device = {
-    "ALi M1429",
-    "ali1429",
-    0,
-    0,
-    ali1429_init, ali1429_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "ALi M1429",
+    .internal_name = "ali1429",
+    .flags = 0,
+    .local = 0,
+    .init = ali1429_init,
+    .close = ali1429_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ali1429g_device = {
-    "ALi M1429G",
-    "ali1429g",
-    0,
-    1,
-    ali1429_init, ali1429_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "ALi M1429G",
+    .internal_name = "ali1429g",
+    .flags = 0,
+    .local = 1,
+    .init = ali1429_init,
+    .close = ali1429_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ali1489.c b/src/chipset/ali1489.c
index 1ab245b40..5ba53f34c 100644
--- a/src/chipset/ali1489.c
+++ b/src/chipset/ali1489.c
@@ -626,16 +626,16 @@ ali1489_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ali1489_device = {
-    "ALi M1489",
-    "ali1489",
-    0,
-    0,
-    ali1489_init,
-    ali1489_close,
-    ali1489_reset,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "ALi M1489",
+    .internal_name = "ali1489",
+    .flags = 0,
+    .local = 0,
+    .init = ali1489_init,
+    .close = ali1489_close,
+    .reset = ali1489_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/ali1531.c b/src/chipset/ali1531.c
index 12f425c36..350ec146f 100644
--- a/src/chipset/ali1531.c
+++ b/src/chipset/ali1531.c
@@ -376,17 +376,16 @@ ali1531_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ali1531_device = {
-    "ALi M1531 CPU-to-PCI Bridge",
-    "ali1531",
-    DEVICE_PCI,
-    0,
-    ali1531_init,
-    ali1531_close,
-    ali1531_reset,
-    {NULL},
-    NULL,
-    NULL,
-    NULL
+    .name = "ALi M1531 CPU-to-PCI Bridge",
+    .internal_name = "ali1531",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = ali1531_init,
+    .close = ali1531_close,
+    .reset = ali1531_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ali1541.c b/src/chipset/ali1541.c
index 3f94ec694..097726106 100644
--- a/src/chipset/ali1541.c
+++ b/src/chipset/ali1541.c
@@ -641,17 +641,16 @@ ali1541_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ali1541_device = {
-    "ALi M1541 CPU-to-PCI Bridge",
-    "ali1541",
-    DEVICE_PCI,
-    0,
-    ali1541_init,
-    ali1541_close,
-    ali1541_reset,
-    {NULL},
-    NULL,
-    NULL,
-    NULL
+    .name = "ALi M1541 CPU-to-PCI Bridge",
+    .internal_name = "ali1541",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = ali1541_init,
+    .close = ali1541_close,
+    .reset = ali1541_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c
index d555fb88e..9811b198c 100644
--- a/src/chipset/ali1543.c
+++ b/src/chipset/ali1543.c
@@ -1741,31 +1741,30 @@ ali1543_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ali1543_device = {
-    "ALi M1543 Desktop South Bridge",
-    "ali1543",
-    DEVICE_PCI,
-    0,
-    ali1543_init,
-    ali1543_close,
-    ali1543_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "ALi M1543 Desktop South Bridge",
+    .internal_name = "ali1543",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = ali1543_init,
+    .close = ali1543_close,
+    .reset = ali1543_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ali1543c_device = {
-    "ALi M1543C Desktop South Bridge",
-    "ali1543c",
-    DEVICE_PCI,
-    1,
-    ali1543_init,
-    ali1543_close,
-    ali1543_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "ALi M1543C Desktop South Bridge",
+    .internal_name = "ali1543c",
+    .flags = DEVICE_PCI,
+    .local = 1,
+    .init = ali1543_init,
+    .close = ali1543_close,
+    .reset = ali1543_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ali1621.c b/src/chipset/ali1621.c
index 65cee2fd6..c234e65ce 100644
--- a/src/chipset/ali1621.c
+++ b/src/chipset/ali1621.c
@@ -670,17 +670,16 @@ ali1621_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ali1621_device = {
-    "ALi M1621 CPU-to-PCI Bridge",
-    "ali1621",
-    DEVICE_PCI,
-    0,
-    ali1621_init,
-    ali1621_close,
-    ali1621_reset,
-    {NULL},
-    NULL,
-    NULL,
-    NULL
+    .name = "ALi M1621 CPU-to-PCI Bridge",
+    .internal_name = "ali1621",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = ali1621_init,
+    .close = ali1621_close,
+    .reset = ali1621_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ali6117.c b/src/chipset/ali6117.c
index 04869fe50..815085ee8 100644
--- a/src/chipset/ali6117.c
+++ b/src/chipset/ali6117.c
@@ -375,34 +375,30 @@ ali6117_init(const device_t *info)
     return dev;
 }
 
-
-const device_t ali1217_device =
-{
-    "ALi M1217",
-    "ali1217",
-    DEVICE_AT,
-    0x8,
-    ali6117_init,
-    ali6117_close,
-    ali6117_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t ali1217_device = {
+    .name = "ALi M1217",
+    .internal_name = "ali1217",
+    .flags = DEVICE_AT,
+    .local = 0x8,
+    .init = ali6117_init,
+    .close = ali6117_close,
+    .reset = ali6117_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t ali6117d_device =
-{
-    "ALi M6117D",
-    "ali6117d",
-    DEVICE_AT,
-    0x2,
-    ali6117_init,
-    ali6117_close,
-    ali6117_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t ali6117d_device = {
+    .name = "ALi M6117D",
+    .internal_name = "ali6117d",
+    .flags = DEVICE_AT,
+    .local = 0x2,
+    .init = ali6117_init,
+    .close = ali6117_close,
+    .reset = ali6117_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/contaq_82c59x.c b/src/chipset/contaq_82c59x.c
index 0abab7f02..6763202d0 100644
--- a/src/chipset/contaq_82c59x.c
+++ b/src/chipset/contaq_82c59x.c
@@ -346,32 +346,30 @@ contaq_82c59x_init(const device_t *info)
     return dev;
 }
 
-
 const device_t contaq_82c596a_device = {
-    "Contaq 82C596A",
-    "contaq_82c596a",
-    0,
-    0,
-    contaq_82c59x_init,
-    contaq_82c59x_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "Contaq 82C596A",
+    .internal_name = "contaq_82c596a",
+    .flags = 0,
+    .local = 0,
+    .init = contaq_82c59x_init,
+    .close = contaq_82c59x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t contaq_82c597_device = {
-    "Contaq 82C597",
-    "contaq_82c597",
-    0,
-    1,
-    contaq_82c59x_init,
-    contaq_82c59x_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "Contaq 82C597",
+    .internal_name = "contaq_82c597",
+    .flags = 0,
+    .local = 1,
+    .init = contaq_82c59x_init,
+    .close = contaq_82c59x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/cs4031.c b/src/chipset/cs4031.c
index 01e3edc18..d5970b048 100644
--- a/src/chipset/cs4031.c
+++ b/src/chipset/cs4031.c
@@ -176,14 +176,15 @@ cs4031_init(const device_t *info)
 }
 
 const device_t cs4031_device = {
-    "Chips & Technogies CS4031",
-    "cs4031",
-    0,
-    0,
-    cs4031_init,
-    cs4031_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "Chips & Technogies CS4031",
+    .internal_name = "cs4031",
+    .flags = 0,
+    .local = 0,
+    .init = cs4031_init,
+    .close = cs4031_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/cs8230.c b/src/chipset/cs8230.c
index 3718a93ca..f6a77cabc 100644
--- a/src/chipset/cs8230.c
+++ b/src/chipset/cs8230.c
@@ -156,13 +156,16 @@ static void
     return cs8230;
 }
 
-
 const device_t cs8230_device = {
-    "C&T CS8230 (386/AT)",
-    "cs8230",
-    0,
-    0,
-    cs8230_init, cs8230_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T CS8230 (386/AT)",
+    .internal_name = "cs8230",
+    .flags = 0,
+    .local = 0,
+    .init = cs8230_init,
+    .close = cs8230_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/et6000.c b/src/chipset/et6000.c
index 4dd00bdf3..1d7541c7e 100644
--- a/src/chipset/et6000.c
+++ b/src/chipset/et6000.c
@@ -149,14 +149,15 @@ et6000_init(const device_t *info)
 }
 
 const device_t et6000_device = {
-    "ETEQ Cheetah ET6000",
-    "et6000",
-    0,
-    0,
-    et6000_init,
-    et6000_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "ETEQ Cheetah ET6000",
+    .internal_name = "et6000",
+    .flags = 0,
+    .local = 0,
+    .init = et6000_init,
+    .close = et6000_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/gc100.c b/src/chipset/gc100.c
index 6618534af..09df87856 100644
--- a/src/chipset/gc100.c
+++ b/src/chipset/gc100.c
@@ -230,23 +230,30 @@ gc100_init(const device_t *info)
     return dev;
 }
 
-
 const device_t gc100_device = {
-    "G2 GC100",
-    "gc100",
-    0,
-    0,
-    gc100_init, gc100_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "G2 GC100",
+    .internal_name = "gc100",
+    .flags = 0,
+    .local = 0,
+    .init = gc100_init,
+    .close = gc100_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t gc100a_device = {
-    "G2 GC100A",
-    "gc100a",
-    0,
-    1,
-    gc100_init, gc100_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "G2 GC100A",
+    .internal_name = "gc100a",
+    .flags = 0,
+    .local = 1,
+    .init = gc100_init,
+    .close = gc100_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/headland.c b/src/chipset/headland.c
index 8a67df9b1..ed2e318fc 100644
--- a/src/chipset/headland.c
+++ b/src/chipset/headland.c
@@ -684,43 +684,58 @@ headland_init(const device_t *info)
     return(dev);
 }
 
-
 const device_t headland_gc10x_device = {
-    "Headland GC101/102/103",
-    "headland_gc10x",
-    0,
-    0,
-    headland_init, headland_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Headland GC101/102/103",
+    .internal_name = "headland_gc10x",
+    .flags = 0,
+    .local = 0,
+    .init = headland_init,
+    .close = headland_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t headland_ht18a_device = {
-    "Headland HT18 Rev. A",
-    "headland_ht18a",
-    0,
-    1,
-    headland_init, headland_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Headland HT18 Rev. A",
+    .internal_name = "headland_ht18a",
+    .flags = 0,
+    .local = 1,
+    .init = headland_init,
+    .close = headland_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t headland_ht18b_device = {
-    "Headland HT18 Rev. B",
-    "headland_ht18b",
-    0,
-    2,
-    headland_init, headland_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Headland HT18 Rev. B",
+    .internal_name = "headland_ht18b",
+    .flags = 0,
+    .local = 2,
+    .init = headland_init,
+    .close = headland_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t headland_ht18c_device = {
-    "Headland HT18 Rev. C",
-    "headland_ht18c",
-    0,
-    8,
-    headland_init, headland_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Headland HT18 Rev. C",
+    .internal_name = "headland_ht18c",
+    .flags = 0,
+    .local = 8,
+    .init = headland_init,
+    .close = headland_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/ims8848.c b/src/chipset/ims8848.c
index d96c53508..10e87b530 100644
--- a/src/chipset/ims8848.c
+++ b/src/chipset/ims8848.c
@@ -400,13 +400,16 @@ ims8848_init(const device_t *info)
     return dev;
 }
 
-
 const device_t ims8848_device = {
-    "IMS 8848/8849",
-    "ims8848",
-    0,
-    0,
-    ims8848_init, ims8848_close, ims8848_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "IMS 8848/8849",
+    .internal_name = "ims8848",
+    .flags = 0,
+    .local = 0,
+    .init = ims8848_init,
+    .close = ims8848_close,
+    .reset = ims8848_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/intel_420ex.c b/src/chipset/intel_420ex.c
index aed5a6e6d..187e6f636 100644
--- a/src/chipset/intel_420ex.c
+++ b/src/chipset/intel_420ex.c
@@ -528,34 +528,30 @@ i420ex_init(const device_t *info)
     return dev;
 }
 
-
-const device_t i420ex_device =
-{
-    "Intel 82420EX",
-    "i420ex",
-    DEVICE_PCI,
-    0x00,
-    i420ex_init,
-    i420ex_close,
-    i420ex_reset,
-    { NULL },
-    i420ex_speed_changed,
-    NULL,
-    NULL
+const device_t i420ex_device = {
+    .name = "Intel 82420EX",
+    .internal_name = "i420ex",
+    .flags = DEVICE_PCI,
+    .local = 0x00,
+    .init = i420ex_init,
+    .close = i420ex_close,
+    .reset = i420ex_reset,
+    { .available = NULL },
+    .speed_changed = i420ex_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i420ex_ide_device =
-{
-    "Intel 82420EX (With IDE)",
-    "i420ex_ide",
-    DEVICE_PCI,
-    0x01,
-    i420ex_init,
-    i420ex_close,
-    i420ex_reset,
-    { NULL },
-    i420ex_speed_changed,
-    NULL,
-    NULL
+const device_t i420ex_ide_device = {
+    .name = "Intel 82420EX (With IDE)",
+    .internal_name = "i420ex_ide",
+    .flags = DEVICE_PCI,
+    .local = 0x01,
+    .init = i420ex_init,
+    .close = i420ex_close,
+    .reset = i420ex_reset,
+    { .available = NULL },
+    .speed_changed = i420ex_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c
index b0e043613..7e8ff9405 100644
--- a/src/chipset/intel_4x0.c
+++ b/src/chipset/intel_4x0.c
@@ -1633,252 +1633,226 @@ static void
     return dev;
 }
 
-
-const device_t i420tx_device =
-{
-    "Intel 82424TX",
-    "i420tx",
-    DEVICE_PCI,
-    INTEL_420TX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i420tx_device = {
+    .name = "Intel 82424TX",
+    .internal_name = "i420tx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_420TX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i420zx_device =
-{
-    "Intel 82424ZX",
-    "i420zx",
-    DEVICE_PCI,
-    INTEL_420ZX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i420zx_device = {
+    .name = "Intel 82424ZX",
+    .internal_name = "i420zx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_420ZX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430lx_device =
-{
-    "Intel 82434LX",
-    "i430lx",
-    DEVICE_PCI,
-    INTEL_430LX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430lx_device = {
+    .name = "Intel 82434LX",
+    .internal_name = "i430lx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430LX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430nx_device =
-{
-    "Intel 82434NX",
-    "i430nx",
-    DEVICE_PCI,
-    INTEL_430NX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430nx_device = {
+    .name = "Intel 82434NX",
+    .internal_name = "i430nx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430NX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430fx_device =
-{
-    "Intel SB82437FX-66",
-    "i430fx",
-    DEVICE_PCI,
-    INTEL_430FX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430fx_device = {
+    .name = "Intel SB82437FX-66",
+    .internal_name = "i430fx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430FX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430fx_rev02_device =
-{
-    "Intel SB82437FX-66 (Rev. 02)",
-    "i430fx_rev02",
-    DEVICE_PCI,
-    0x0200 | INTEL_430FX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430fx_rev02_device = {
+    .name = "Intel SB82437FX-66 (Rev. 02)",
+    .internal_name = "i430fx_rev02",
+    .flags = DEVICE_PCI,
+    .local = 0x0200 | INTEL_430FX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430hx_device =
-{
-    "Intel 82439HX",
-    "i430hx",
-    DEVICE_PCI,
-    INTEL_430HX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430hx_device = {
+    .name = "Intel 82439HX",
+    .internal_name = "i430hx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430HX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430vx_device =
-{
-    "Intel 82437VX",
-    "i430vx",
-    DEVICE_PCI,
-    INTEL_430VX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430vx_device = {
+    .name = "Intel 82437VX",
+    .internal_name = "i430vx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430VX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i430tx_device =
-{
-    "Intel 82439TX",
-    "i430tx",
-    DEVICE_PCI,
-    INTEL_430TX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i430tx_device = {
+    .name = "Intel 82439TX",
+    .internal_name = "i430tx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_430TX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i440fx_device =
-{
-    "Intel 82441FX",
-    "i440fx",
-    DEVICE_PCI,
-    INTEL_440FX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440fx_device = {
+    .name = "Intel 82441FX",
+    .internal_name = "i440fx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_440FX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440lx_device =
-{
-    "Intel 82443LX",
-    "i440lx",
-    DEVICE_PCI,
-    INTEL_440LX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440lx_device = {
+    .name = "Intel 82443LX",
+    .internal_name = "i440lx",
+    .flags = DEVICE_PCI,
+    .local = INTEL_440LX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440ex_device =
-{
-    "Intel 82443EX",
-    "i440ex",
-    DEVICE_PCI,
-    INTEL_440EX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440ex_device = {
+    .name = "Intel 82443EX",
+    .internal_name = "i440ex",
+    .flags = DEVICE_PCI,
+    .local = INTEL_440EX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440bx_device =
-{
-    "Intel 82443BX",
-    "i440bx",
-    DEVICE_PCI,
-    0x8000 | INTEL_440BX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440bx_device = {
+    .name = "Intel 82443BX",
+    .internal_name = "i440bx",
+    .flags = DEVICE_PCI,
+    .local = 0x8000 | INTEL_440BX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440bx_no_agp_device =
-{
-    "Intel 82443BX",
-    "i440bx_no_agp",
-    DEVICE_PCI,
-    0x8200 | INTEL_440BX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440bx_no_agp_device = {
+    .name = "Intel 82443BX",
+    .internal_name = "i440bx_no_agp",
+    .flags = DEVICE_PCI,
+    .local = 0x8200 | INTEL_440BX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440gx_device =
-{
-    "Intel 82443GX",
-    "i440gx",
-    DEVICE_PCI,
-    0x8000 | INTEL_440GX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440gx_device = {
+    .name = "Intel 82443GX",
+    .internal_name = "i440gx",
+    .flags = DEVICE_PCI,
+    .local = 0x8000 | INTEL_440GX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t i440zx_device =
-{
-    "Intel 82443ZX",
-    "i440zx",
-    DEVICE_PCI,
-    0x8000 | INTEL_440ZX,
-    i4x0_init,
-    i4x0_close,
-    i4x0_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t i440zx_device = {
+    .name = "Intel 82443ZX",
+    .internal_name = "i440zx",
+    .flags = DEVICE_PCI,
+    .local = 0x8000 | INTEL_440ZX,
+    .init = i4x0_init,
+    .close = i4x0_close,
+    .reset = i4x0_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c
index 6dbe0ea4f..2c018d3ef 100644
--- a/src/chipset/intel_82335.c
+++ b/src/chipset/intel_82335.c
@@ -197,14 +197,15 @@ intel_82335_init(const device_t *info)
 }
 
 const device_t intel_82335_device = {
-    "Intel 82335",
-    "intel_82335",
-    0,
-    0,
-    intel_82335_init,
-    intel_82335_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "Intel 82335",
+    .internal_name = "intel_82335",
+    .flags = 0,
+    .local = 0,
+    .init = intel_82335_init,
+    .close = intel_82335_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/intel_i450kx.c b/src/chipset/intel_i450kx.c
index 315947108..ad92218f8 100644
--- a/src/chipset/intel_i450kx.c
+++ b/src/chipset/intel_i450kx.c
@@ -806,17 +806,16 @@ i450kx_init(const device_t *info)
     return dev;
 }
 
-
 const device_t i450kx_device = {
-    "Intel 450KX (Mars)",
-    "i450kx",
-    DEVICE_PCI,
-    0,
-    i450kx_init,
-    i450kx_close,
-    i450kx_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "Intel 450KX (Mars)",
+    .internal_name = "i450kx",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = i450kx_init,
+    .close = i450kx_close,
+    .reset = i450kx_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
index 0a6204b19..025862c44 100644
--- a/src/chipset/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -1599,108 +1599,100 @@ static void
     return dev;
 }
 
-
-const device_t piix_device =
-{
-    "Intel 82371FB (PIIX)",
-    "piix",
-    DEVICE_PCI,
-    0x122e0101,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix_device = {
+    .name = "Intel 82371FB (PIIX)",
+    .internal_name = "piix",
+    .flags = DEVICE_PCI,
+    .local = 0x122e0101,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t piix_rev02_device =
-{
-    "Intel 82371FB (PIIX) (Faulty BusMastering!!)",
-    "piix_rev02",
-    DEVICE_PCI,
-    0x122e0121,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix_rev02_device = {
+    .name = "Intel 82371FB (PIIX) (Faulty BusMastering!!)",
+    .internal_name = "piix_rev02",
+    .flags = DEVICE_PCI,
+    .local = 0x122e0121,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t piix3_device =
-{
-    "Intel 82371SB (PIIX3)",
-    "piix3",
-    DEVICE_PCI,
-    0x70000403,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix3_device = {
+    .name = "Intel 82371SB (PIIX3)",
+    .internal_name = "piix3",
+    .flags = DEVICE_PCI,
+    .local = 0x70000403,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t piix3_ioapic_device =
-{
-    "Intel 82371SB (PIIX3) (Boards with I/O APIC)",
-    "piix3_ioapic",
-    DEVICE_PCI,
-    0x70001403,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix3_ioapic_device = {
+    .name = "Intel 82371SB (PIIX3) (Boards with I/O APIC)",
+    .internal_name = "piix3_ioapic",
+    .flags = DEVICE_PCI,
+    .local = 0x70001403,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t piix4_device =
-{
-    "Intel 82371AB/EB (PIIX4/PIIX4E)",
-    "piix4",
-    DEVICE_PCI,
-    0x71100004,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix4_device = {
+    .name = "Intel 82371AB/EB (PIIX4/PIIX4E)",
+    .internal_name = "piix4",
+    .flags = DEVICE_PCI,
+    .local = 0x71100004,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t piix4e_device =
-{
-    "Intel 82371EB (PIIX4E)",
-    "piix4e",
-    DEVICE_PCI,
-    0x71100094,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t piix4e_device = {
+    .name = "Intel 82371EB (PIIX4E)",
+    .internal_name = "piix4e",
+    .flags = DEVICE_PCI,
+    .local = 0x71100094,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t slc90e66_device =
-{
-    "SMSC SLC90E66 (Victory66)",
-    "slc90e66",
-    DEVICE_PCI,
-    0x94600005,
-    piix_init,
-    piix_close,
-    piix_reset,
-    { NULL },
-    piix_speed_changed,
-    NULL,
-    NULL
+const device_t slc90e66_device = {
+    .name = "SMSC SLC90E66 (Victory66)",
+    .internal_name = "slc90e66",
+    .flags = DEVICE_PCI,
+    .local = 0x94600005,
+    .init = piix_init,
+    .close = piix_close,
+    .reset = piix_reset,
+    { .available = NULL },
+    .speed_changed = piix_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/intel_sio.c b/src/chipset/intel_sio.c
index df8bb8e61..ab535cb65 100644
--- a/src/chipset/intel_sio.c
+++ b/src/chipset/intel_sio.c
@@ -545,33 +545,31 @@ sio_init(const device_t *info)
 }
 
 
-const device_t sio_device =
-{
-    "Intel 82378IB (SIO)",
-    "sio",
-    DEVICE_PCI,
-    0x00,
-    sio_init,
-    sio_close,
-    sio_reset,
-    { NULL },
-    sio_speed_changed,
-    NULL,
-    NULL
+const device_t sio_device = {
+    .name = "Intel 82378IB (SIO)",
+    .internal_name = "sio",
+    .flags = DEVICE_PCI,
+    .local = 0x00,
+    .init = sio_init,
+    .close = sio_close,
+    .reset = sio_reset,
+    { .available = NULL },
+    .speed_changed = sio_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 
-const device_t sio_zb_device =
-{
-    "Intel 82378ZB (SIO)",
-    "sio_zb",
-    DEVICE_PCI,
-    0x03,
-    sio_init,
-    sio_close,
-    sio_reset,
-    { NULL },
-    sio_speed_changed,
-    NULL,
-    NULL
+const device_t sio_zb_device = {
+    .name = "Intel 82378ZB (SIO)",
+    .internal_name = "sio_zb",
+    .flags = DEVICE_PCI,
+    .local = 0x03,
+    .init = sio_init,
+    .close = sio_close,
+    .reset = sio_reset,
+    { .available = NULL },
+    .speed_changed = sio_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/neat.c b/src/chipset/neat.c
index 258982ea7..8e7bc1937 100644
--- a/src/chipset/neat.c
+++ b/src/chipset/neat.c
@@ -824,13 +824,16 @@ neat_init(const device_t *info)
     return dev;
 }
 
-
 const device_t neat_device = {
-    "C&T CS8121 (NEAT)",
-    "neat",
-    0,
-    0,
-    neat_init, neat_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T CS8121 (NEAT)",
+    .internal_name = "neat",
+    .flags = 0,
+    .local = 0,
+    .init = neat_init,
+    .close = neat_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/olivetti_eva.c b/src/chipset/olivetti_eva.c
index 2f31458be..0728d44e5 100644
--- a/src/chipset/olivetti_eva.c
+++ b/src/chipset/olivetti_eva.c
@@ -157,11 +157,15 @@ olivetti_eva_init(const device_t *info)
 }
 
 const device_t olivetti_eva_device = {
-    "Olivetti EVA Gate Array",
-    "olivetta_eva",
-    0,
-    0,
-    olivetti_eva_init, olivetti_eva_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Olivetti EVA Gate Array",
+    .internal_name = "olivetta_eva",
+    .flags = 0,
+    .local = 0,
+    .init = olivetti_eva_init,
+    .close = olivetti_eva_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/opti283.c b/src/chipset/opti283.c
index d02ea4add..8e9403c29 100644
--- a/src/chipset/opti283.c
+++ b/src/chipset/opti283.c
@@ -302,17 +302,16 @@ opti283_init(const device_t *info)
     return dev;
 }
 
-
 const device_t opti283_device = {
-    "OPTi 82C283",
-    "opti283",
-    0,
-    0,
-    opti283_init,
-    opti283_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "OPTi 82C283",
+    .internal_name = "opti283",
+    .flags = 0,
+    .local = 0,
+    .init = opti283_init,
+    .close = opti283_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/opti291.c b/src/chipset/opti291.c
index c981f6b36..6bf8851e7 100644
--- a/src/chipset/opti291.c
+++ b/src/chipset/opti291.c
@@ -147,14 +147,15 @@ opti291_init(const device_t *info)
 }
 
 const device_t opti291_device = {
-	"OPTi 82C291",
-	"opti291",
-	0,
-	0,
-	opti291_init,
-	opti291_close,
-	NULL,
-	{NULL},
-	NULL,
-	NULL,
-	NULL};
+    .name = "OPTi 82C291",
+    .internal_name = "opti291",
+    .flags = 0,
+    .local = 0,
+    .init = opti291_init,
+    .close = opti291_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/opti391.c b/src/chipset/opti391.c
index fde71fe3e..51c8d9daa 100644
--- a/src/chipset/opti391.c
+++ b/src/chipset/opti391.c
@@ -211,17 +211,16 @@ opti391_init(const device_t *info)
     return dev;
 }
 
-
 const device_t opti391_device = {
-    "OPTi 82C391",
-    "opti391",
-    0,
-    0,
-    opti391_init,
-    opti391_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "OPTi 82C391",
+    .internal_name = "opti391",
+    .flags = 0,
+    .local = 0,
+    .init = opti391_init,
+    .close = opti391_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/opti495.c b/src/chipset/opti495.c
index 605d0fb8d..c02f9cc1f 100644
--- a/src/chipset/opti495.c
+++ b/src/chipset/opti495.c
@@ -236,24 +236,30 @@ opti495_init(const device_t *info)
     return dev;
 }
 
-
 const device_t opti493_device = {
-    "OPTi 82C493",
-    "opti493",
-    0,
-    0,
-    opti495_init, opti495_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "OPTi 82C493",
+    .internal_name = "opti493",
+    .flags = 0,
+    .local = 0,
+    .init = opti495_init,
+    .close = opti495_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t opti495_device = {
-    "OPTi 82C495",
-    "opti495",
-    0,
-    1,
-    opti495_init, opti495_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "OPTi 82C495",
+    .internal_name = "opti495",
+    .flags = 0,
+    .local = 1,
+    .init = opti495_init,
+    .close = opti495_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/opti499.c b/src/chipset/opti499.c
index ca9692964..08c06d58c 100644
--- a/src/chipset/opti499.c
+++ b/src/chipset/opti499.c
@@ -253,13 +253,16 @@ opti499_init(const device_t *info)
     return dev;
 }
 
-
 const device_t opti499_device = {
-    "OPTi 82C499",
-    "opti499",
-    0,
-    1,
-    opti499_init, opti499_close, opti499_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "OPTi 82C499",
+    .internal_name = "opti499",
+    .flags = 0,
+    .local = 1,
+    .init = opti499_init,
+    .close = opti499_close,
+    .reset = opti499_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/opti5x7.c b/src/chipset/opti5x7.c
index 54ecd6c76..f0459a97f 100644
--- a/src/chipset/opti5x7.c
+++ b/src/chipset/opti5x7.c
@@ -176,14 +176,15 @@ opti5x7_init(const device_t *info)
 }
 
 const device_t opti5x7_device = {
-    "OPTi 82C5x6/82C5x7",
-    "opti5x7",
-    0,
-    0,
-    opti5x7_init,
-    opti5x7_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "OPTi 82C5x6/82C5x7",
+    .internal_name = "opti5x7",
+    .flags = 0,
+    .local = 0,
+    .init = opti5x7_init,
+    .close = opti5x7_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/opti822.c b/src/chipset/opti822.c
index 42a7c89cd..0235e3ee9 100644
--- a/src/chipset/opti822.c
+++ b/src/chipset/opti822.c
@@ -310,14 +310,15 @@ opti822_init(const device_t *info)
 }
 
 const device_t opti822_device = {
-    "OPTi 82C822 PCIB",
-    "opti822",
-    DEVICE_PCI,
-    0,
-    opti822_init,
-    opti822_close,
-    opti822_reset,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "OPTi 82C822 PCIB",
+    .internal_name = "opti822",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = opti822_init,
+    .close = opti822_close,
+    .reset = opti822_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c
index 14b0080fd..00f632f59 100644
--- a/src/chipset/opti895.c
+++ b/src/chipset/opti895.c
@@ -273,24 +273,30 @@ opti895_init(const device_t *info)
     return dev;
 }
 
-
 const device_t opti802g_device = {
-    "OPTi 82C802G",
-    "opti802g",
-    0,
-    0,
-    opti895_init, opti895_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "OPTi 82C802G",
+    .internal_name = "opti802g",
+    .flags = 0,
+    .local = 0,
+    .init = opti895_init,
+    .close = opti895_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t opti895_device = {
-    "OPTi 82C895",
-    "opti895",
-    0,
-    0,
-    opti895_init, opti895_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "OPTi 82C895",
+    .internal_name = "opti895",
+    .flags = 0,
+    .local = 0,
+    .init = opti895_init,
+    .close = opti895_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/scamp.c b/src/chipset/scamp.c
index 42f579dca..621f7d9c5 100644
--- a/src/chipset/scamp.c
+++ b/src/chipset/scamp.c
@@ -955,13 +955,16 @@ scamp_init(const device_t *info)
     return dev;
 }
 
-
 const device_t vlsi_scamp_device = {
-    "VLSI SCAMP",
-    "vlsi_scamp",
-    0,
-    0,
-    scamp_init, scamp_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VLSI SCAMP",
+    .internal_name = "vlsi_scamp",
+    .flags = 0,
+    .local = 0,
+    .init = scamp_init,
+    .close = scamp_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/scat.c b/src/chipset/scat.c
index 0780ec507..1e7ba9263 100644
--- a/src/chipset/scat.c
+++ b/src/chipset/scat.c
@@ -1542,33 +1542,44 @@ scat_init(const device_t *info)
     return(dev);
 }
 
-
 const device_t scat_device = {
-    "C&T SCAT (v1)",
-    "scat",
-    0,
-    0,
-    scat_init, scat_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T SCAT (v1)",
+    .internal_name = "scat",
+    .flags = 0,
+    .local = 0,
+    .init = scat_init,
+    .close = scat_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t scat_4_device = {
-    "C&T SCAT (v4)",
-    "scat_4",
-    0,
-    4,
-    scat_init, scat_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T SCAT (v4)",
+    .internal_name = "scat_4",
+    .flags = 0,
+    .local = 4,
+    .init = scat_init,
+    .close = scat_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t scat_sx_device = {
-    "C&T SCATsx",
-    "scat_sx",
-    0,
-    32,
-    scat_init, scat_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "C&T SCATsx",
+    .internal_name = "scat_sx",
+    .flags = 0,
+    .local = 32,
+    .init = scat_init,
+    .close = scat_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/sis_5511.c b/src/chipset/sis_5511.c
index 44e8f98de..63950d47a 100644
--- a/src/chipset/sis_5511.c
+++ b/src/chipset/sis_5511.c
@@ -740,14 +740,15 @@ sis_5511_init(const device_t *info)
 }
 
 const device_t sis_5511_device = {
-	"SiS 5511",
-	"sis_5511",
-	DEVICE_PCI,
-	0,
-	sis_5511_init,
-	sis_5511_close,
-	sis_5511_reset,
-	{NULL},
-	NULL,
-	NULL,
-	NULL};
+    .name = "SiS 5511",
+    .internal_name = "sis_5511",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = sis_5511_init,
+    .close = sis_5511_close,
+    .reset = sis_5511_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/sis_5571.c b/src/chipset/sis_5571.c
index 4cc99319f..3f678d87b 100644
--- a/src/chipset/sis_5571.c
+++ b/src/chipset/sis_5571.c
@@ -742,14 +742,15 @@ sis_5571_init(const device_t *info)
 }
 
 const device_t sis_5571_device = {
-	"SiS 5571",
-	"sis_5571",
-	DEVICE_PCI,
-	0,
-	sis_5571_init,
-	sis_5571_close,
-	sis_5571_reset,
-	{NULL},
-	NULL,
-	NULL,
-	NULL};
+    .name = "SiS 5571",
+    .internal_name = "sis_5571",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = sis_5571_init,
+    .close = sis_5571_close,
+    .reset = sis_5571_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};
diff --git a/src/chipset/sis_85c310.c b/src/chipset/sis_85c310.c
index e1130b733..2e83e3367 100644
--- a/src/chipset/sis_85c310.c
+++ b/src/chipset/sis_85c310.c
@@ -135,13 +135,16 @@ rabbit_init(const device_t *info)
     return dev;
 }
 
-
 const device_t rabbit_device = {
-    "SiS Rabbit",
-    "rabbit",
-    0,
-    0,
-    rabbit_init, rabbit_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "SiS Rabbit",
+    .internal_name = "rabbit",
+    .flags = 0,
+    .local = 0,
+    .init = rabbit_init,
+    .close = rabbit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c
index a649f5053..b900d4443 100644
--- a/src/chipset/sis_85c496.c
+++ b/src/chipset/sis_85c496.c
@@ -618,34 +618,30 @@ static void
     return dev;
 }
 
-
-const device_t sis_85c496_device =
-{
-    "SiS 85c496/85c497",
-    "sis_85c496",
-    DEVICE_PCI,
-    0,
-    sis_85c496_init,
-    sis_85c496_close,
-    sis_85c496_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t sis_85c496_device = {
+    .name = "SiS 85c496/85c497",
+    .internal_name = "sis_85c496",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = sis_85c496_init,
+    .close = sis_85c496_close,
+    .reset = sis_85c496_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t sis_85c496_ls486e_device =
-{
-    "SiS 85c496/85c497 (Lucky Star LS-486E)",
-    "sis_85c496_ls486e",
-    DEVICE_PCI,
-    1,
-    sis_85c496_init,
-    sis_85c496_close,
-    sis_85c496_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t sis_85c496_ls486e_device = {
+    .name = "SiS 85c496/85c497 (Lucky Star LS-486E)",
+    .internal_name = "sis_85c496_ls486e",
+    .flags = DEVICE_PCI,
+    .local = 1,
+    .init = sis_85c496_init,
+    .close = sis_85c496_close,
+    .reset = sis_85c496_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/sis_85c4xx.c b/src/chipset/sis_85c4xx.c
index c679c1dad..b705eb32e 100644
--- a/src/chipset/sis_85c4xx.c
+++ b/src/chipset/sis_85c4xx.c
@@ -358,44 +358,59 @@ sis_85c4xx_init(const device_t *info)
     return dev;
 }
 
-
 const device_t sis_85c401_device = {
-    "SiS 85c401/85c402",
-    "sis_85c401",
-    0,
-    0x060,
-    sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "SiS 85c401/85c402",
+    .internal_name = "sis_85c401",
+    .flags = 0,
+    .local = 0x060,
+    .init = sis_85c4xx_init,
+    .close = sis_85c4xx_close,
+    .reset = sis_85c4xx_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t sis_85c460_device = {
-    "SiS 85c460",
-    "sis_85c460",
-    0,
-    0x050,
-    sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "SiS 85c460",
+    .internal_name = "sis_85c460",
+    .flags = 0,
+    .local = 0x050,
+    .init = sis_85c4xx_init,
+    .close = sis_85c4xx_close,
+    .reset = sis_85c4xx_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 /* TODO: Log to make sure the registers are correct. */
 const device_t sis_85c461_device = {
-    "SiS 85c461",
-    "sis_85c461",
-    0,
-    0x050,
-    sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "SiS 85c461",
+    .internal_name = "sis_85c461",
+    .flags = 0,
+    .local = 0x050,
+    .init = sis_85c4xx_init,
+    .close = sis_85c4xx_close,
+    .reset = sis_85c4xx_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t sis_85c471_device = {
-    "SiS 85c407/85c471",
-    "sis_85c471",
-    0,
-    0x150,
-    sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "SiS 85c407/85c471",
+    .internal_name = "sis_85c471",
+    .flags = 0,
+    .local = 0x150,
+    .init = sis_85c4xx_init,
+    .close = sis_85c4xx_close,
+    .reset = sis_85c4xx_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/sis_85c50x.c b/src/chipset/sis_85c50x.c
index 93bbcb745..9d5dddebd 100644
--- a/src/chipset/sis_85c50x.c
+++ b/src/chipset/sis_85c50x.c
@@ -390,14 +390,16 @@ sis_85c50x_init(const device_t *info)
     return dev;
 }
 
-
 const device_t sis_85c50x_device = {
-    "SiS 85C50x",
-    "sis_85c50x",
-    DEVICE_PCI,
-    0,
-    sis_85c50x_init, sis_85c50x_close,
-    sis_85c50x_reset, { NULL },
-    NULL, NULL,
-    NULL
+    .name = "SiS 85C50x",
+    .internal_name = "sis_85c50x",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = sis_85c50x_init,
+    .close = sis_85c50x_close,
+    .reset = sis_85c50x_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c
index 8dcfc2862..f9bd8faff 100644
--- a/src/chipset/stpc.c
+++ b/src/chipset/stpc.c
@@ -1055,95 +1055,88 @@ stpc_lpt_init(const device_t *info)
     return dev;
 }
 
-
 /* STPC SoCs */
-const device_t stpc_client_device =
-{
-    "STPC Client",
-    "stpc_client",
-    DEVICE_PCI,
-    STPC_CLIENT,
-    stpc_init,
-    stpc_close,
-    stpc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_client_device = {
+    .name = "STPC Client",
+    .internal_name = "stpc_client",
+    .flags = DEVICE_PCI,
+    .local = STPC_CLIENT,
+    .init = stpc_init,
+    .close = stpc_close,
+    .reset = stpc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t stpc_consumer2_device =
-{
-    "STPC Consumer-II",
-    "stpc_consumer2",
-    DEVICE_PCI,
-    STPC_CONSUMER2,
-    stpc_init,
-    stpc_close,
-    stpc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_consumer2_device = {
+    .name = "STPC Consumer-II",
+    .internal_name = "stpc_consumer2",
+    .flags = DEVICE_PCI,
+    .local = STPC_CONSUMER2,
+    .init = stpc_init,
+    .close = stpc_close,
+    .reset = stpc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t stpc_elite_device =
-{
-    "STPC Elite",
-    "stpc_elite",
-    DEVICE_PCI,
-    STPC_ELITE,
-    stpc_init,
-    stpc_close,
-    stpc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_elite_device = {
+    .name = "STPC Elite",
+    .internal_name = "stpc_elite",
+    .flags = DEVICE_PCI,
+    .local = STPC_ELITE,
+    .init = stpc_init,
+    .close = stpc_close,
+    .reset = stpc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t stpc_atlas_device =
-{
-    "STPC Atlas",
-    "stpc_atlas",
-    DEVICE_PCI,
-    STPC_ATLAS,
-    stpc_init,
-    stpc_close,
-    stpc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_atlas_device = {
+    .name = "STPC Atlas",
+    .internal_name = "stpc_atlas",
+    .flags = DEVICE_PCI,
+    .local = STPC_ATLAS,
+    .init = stpc_init,
+    .close = stpc_close,
+    .reset = stpc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 /* Auxiliary devices */
-const device_t stpc_serial_device =
-{
-    "STPC Serial UARTs",
-    "stpc_serial",
-    0,
-    0,
-    stpc_serial_init,
-    stpc_serial_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_serial_device = {
+    .name = "STPC Serial UARTs",
+    .internal_name = "stpc_serial",
+    .flags = 0,
+    .local = 0,
+    .init = stpc_serial_init,
+    .close = stpc_serial_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t stpc_lpt_device =
-{
-    "STPC Parallel Port",
-    "stpc_lpt",
-    0,
-    0,
-    stpc_lpt_init,
-    stpc_lpt_close,
-    stpc_lpt_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t stpc_lpt_device = {
+    .name = "STPC Parallel Port",
+    .internal_name = "stpc_lpt",
+    .flags = 0,
+    .local = 0,
+    .init = stpc_lpt_init,
+    .close = stpc_lpt_close,
+    .reset = stpc_lpt_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/umc_8886.c b/src/chipset/umc_8886.c
index ea99460d7..72dc8778b 100644
--- a/src/chipset/umc_8886.c
+++ b/src/chipset/umc_8886.c
@@ -377,23 +377,30 @@ umc_8886_init(const device_t *info)
     return dev;
 }
 
-
 const device_t umc_8886f_device = {
-    "UMC 8886F",
-    "umc_8886f",
-    DEVICE_PCI,
-    0x8886,
-    umc_8886_init, umc_8886_close, umc_8886_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "UMC 8886F",
+    .internal_name = "umc_8886f",
+    .flags = DEVICE_PCI,
+    .local = 0x8886,
+    .init = umc_8886_init,
+    .close = umc_8886_close,
+    .reset = umc_8886_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t umc_8886af_device = {
-    "UMC 8886AF/8886BF",
-    "umc_8886af",
-    DEVICE_PCI,
-    0x886a,
-    umc_8886_init, umc_8886_close, umc_8886_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "UMC 8886AF/8886BF",
+    .internal_name = "umc_8886af",
+    .flags = DEVICE_PCI,
+    .local = 0x886a,
+    .init = umc_8886_init,
+    .close = umc_8886_close,
+    .reset = umc_8886_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/umc_hb4.c b/src/chipset/umc_hb4.c
index 6bb7b13d3..4440b7eef 100644
--- a/src/chipset/umc_hb4.c
+++ b/src/chipset/umc_hb4.c
@@ -416,13 +416,16 @@ hb4_init(const device_t *info)
     return dev;
 }
 
-
 const device_t umc_hb4_device = {
-    "UMC HB4(8881F)",
-    "umc_hb4",
-    DEVICE_PCI,
-    0x886a,
-    hb4_init, hb4_close, hb4_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "UMC HB4(8881F)",
+    .internal_name = "umc_hb4",
+    .flags = DEVICE_PCI,
+    .local = 0x886a,
+    .init = hb4_init,
+    .close = hb4_close,
+    .reset = hb4_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c
index 60aa83a47..9a491478f 100644
--- a/src/chipset/via_apollo.c
+++ b/src/chipset/via_apollo.c
@@ -760,118 +760,114 @@ via_apollo_close(void *priv)
     free(dev);
 }
 
-const device_t via_vpx_device =
-{
-    "VIA Apollo VPX",
-    "via_vpx",
-    DEVICE_PCI,
-    VIA_585,	/*VT82C585*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vpx_device = {
+    .name = "VIA Apollo VPX",
+    .internal_name = "via_vpx",
+    .flags = DEVICE_PCI,
+    .local = VIA_585, /*VT82C585*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t amd640_device =
-{
-    "AMD 640 System Controller",
-    "amd640",
-    DEVICE_PCI,
-    VIA_595,	/*VT82C595*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t amd640_device = {
+    .name = "AMD 640 System Controller",
+    .internal_name = "amd640",
+    .flags = DEVICE_PCI,
+    .local = VIA_595, /*VT82C595*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t via_vp3_device =
-{
-    "VIA Apollo VP3",
-    "via_vp3",
-    DEVICE_PCI,
-    VIA_597,	/*VT82C597*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vp3_device = {
+    .name = "VIA Apollo VP3",
+    .internal_name = "via_vp3",
+    .flags = DEVICE_PCI,
+    .local = VIA_597, /*VT82C597*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t via_mvp3_device =
-{
-    "VIA Apollo MVP3",
-    "via_mvp3",
-    DEVICE_PCI,
-    VIA_598,	/*VT82C598MVP*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_mvp3_device = {
+    .name = "VIA Apollo MVP3",
+    .internal_name = "via_mvp3",
+    .flags = DEVICE_PCI,
+    .local = VIA_598, /*VT82C598MVP*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t via_apro_device = {
-    "VIA Apollo Pro",
-    "via_apro",
-    DEVICE_PCI,
-    VIA_691,	/*VT82C691*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "VIA Apollo Pro",
+    .internal_name = "via_apro",
+    .flags = DEVICE_PCI,
+    .local = VIA_691, /*VT82C691*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t via_apro133_device = {
-    "VIA Apollo Pro133",
-    "via_apro133",
-    DEVICE_PCI,
-    VIA_693A,	/*VT82C693A*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "VIA Apollo Pro133",
+    .internal_name = "via_apro133",
+    .flags = DEVICE_PCI,
+    .local = VIA_693A, /*VT82C693A*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t via_apro133a_device = {
-    "VIA Apollo Pro133A",
-    "via_apro_133a",
-    DEVICE_PCI,
-    VIA_694,	/*VT82C694X*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "VIA Apollo Pro133A",
+    .internal_name = "via_apro_133a",
+    .flags = DEVICE_PCI,
+    .local = VIA_694, /*VT82C694X*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t via_vt8601_device = {
-    "VIA Apollo ProMedia",
-    "via_vt8601",
-    DEVICE_PCI,
-    VIA_8601,	/*VT8601*/
-    via_apollo_init,
-    via_apollo_close,
-    via_apollo_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "VIA Apollo ProMedia",
+    .internal_name = "via_vt8601",
+    .flags = DEVICE_PCI,
+    .local = VIA_8601, /*VT8601*/
+    .init = via_apollo_init,
+    .close = via_apollo_close,
+    .reset = via_apollo_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index b985b2ba8..076328a00 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -1631,97 +1631,86 @@ pipc_close(void *p)
     free(dev);
 }
 
-
-const device_t via_vt82c586b_device =
-{
-    "VIA VT82C586B",
-    "via_vt82c586b",
-    DEVICE_PCI,
-    VIA_PIPC_586B,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt82c586b_device = {
+    .name = "VIA VT82C586B",
+    .internal_name = "via_vt82c586b",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_586B,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t via_vt82c596a_device =
-{
-    "VIA VT82C596A",
-    "via_vt82c596a",
-    DEVICE_PCI,
-    VIA_PIPC_596A,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt82c596a_device = {
+    .name = "VIA VT82C596A",
+    .internal_name = "via_vt82c596a",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_596A,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t via_vt82c596b_device =
-{
-    "VIA VT82C596B",
-    "via_vt82c596b",
-    DEVICE_PCI,
-    VIA_PIPC_596B,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt82c596b_device = {
+    .name = "VIA VT82C596B",
+    .internal_name = "via_vt82c596b",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_596B,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t via_vt82c686a_device =
-{
-    "VIA VT82C686A",
-    "via_vt82c686a",
-    DEVICE_PCI,
-    VIA_PIPC_686A,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt82c686a_device = {
+    .name = "VIA VT82C686A",
+    .internal_name = "via_vt82c686a",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_686A,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t via_vt82c686b_device =
-{
-    "VIA VT82C686B",
-    "via_vt82c686b",
-    DEVICE_PCI,
-    VIA_PIPC_686B,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt82c686b_device = {
+    .name = "VIA VT82C686B",
+    .internal_name = "via_vt82c686b",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_686B,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t via_vt8231_device =
-{
-    "VIA VT8231",
-    "via_vt8231",
-    DEVICE_PCI,
-    VIA_PIPC_8231,
-    pipc_init,
-    pipc_close,
-    pipc_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t via_vt8231_device = {
+    .name = "VIA VT8231",
+    .internal_name = "via_vt8231",
+    .flags = DEVICE_PCI,
+    .local = VIA_PIPC_8231,
+    .init = pipc_init,
+    .close = pipc_close,
+    .reset = pipc_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/via_vt82c49x.c b/src/chipset/via_vt82c49x.c
index 80a00e606..7efa76d01 100644
--- a/src/chipset/via_vt82c49x.c
+++ b/src/chipset/via_vt82c49x.c
@@ -358,46 +358,58 @@ vt82c49x_init(const device_t *info)
     return dev;
 }
 
-
 const device_t via_vt82c49x_device = {
-    "VIA VT82C49X",
-    "via_vt82c49x",
-    0,
-    0,
-    vt82c49x_init, vt82c49x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VIA VT82C49X",
+    .internal_name = "via_vt82c49x",
+    .flags = 0,
+    .local = 0,
+    .init = vt82c49x_init,
+    .close = vt82c49x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t via_vt82c49x_pci_device = {
-    "VIA VT82C49X PCI",
-    "via_vt82c49x_pci",
-    DEVICE_PCI,
-    0,
-    vt82c49x_init, vt82c49x_close, vt82c49x_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VIA VT82C49X PCI",
+    .internal_name = "via_vt82c49x_pci",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = vt82c49x_init,
+    .close = vt82c49x_close,
+    .reset = vt82c49x_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t via_vt82c49x_ide_device = {
-    "VIA VT82C49X (With IDE)",
-    "via_vt82c49x_ide",
-    0,
-    1,
-    vt82c49x_init, vt82c49x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VIA VT82C49X (With IDE)",
+    .internal_name = "via_vt82c49x_ide",
+    .flags = 0,
+    .local = 1,
+    .init = vt82c49x_init,
+    .close = vt82c49x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t via_vt82c49x_pci_ide_device = {
-    "VIA VT82C49X PCI (With IDE)",
-    "via_vt82c49x_pci_ide",
-    DEVICE_PCI,
-    1,
-    vt82c49x_init, vt82c49x_close, vt82c49x_reset,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VIA VT82C49X PCI (With IDE)",
+    .internal_name = "via_vt82c49x_pci_ide",
+    .flags = DEVICE_PCI,
+    .local = 1,
+    .init = vt82c49x_init,
+    .close = vt82c49x_close,
+    .reset = vt82c49x_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/via_vt82c505.c b/src/chipset/via_vt82c505.c
index 6dea85d80..5ce799ab6 100644
--- a/src/chipset/via_vt82c505.c
+++ b/src/chipset/via_vt82c505.c
@@ -216,17 +216,16 @@ vt82c505_init(const device_t *info)
     return dev;
 }
 
-
 const device_t via_vt82c505_device = {
-    "VIA VT82C505",
-    "via_vt82c505",
-    DEVICE_PCI,
-    0,
-    vt82c505_init,
-    vt82c505_close,
-    vt82c505_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+    .name = "VIA VT82C505",
+    .internal_name = "via_vt82c505",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = vt82c505_init,
+    .close = vt82c505_close,
+    .reset = vt82c505_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/vl82c480.c b/src/chipset/vl82c480.c
index 455e8bf16..ec4703399 100644
--- a/src/chipset/vl82c480.c
+++ b/src/chipset/vl82c480.c
@@ -188,24 +188,30 @@ vl82c480_init(const device_t *info)
     return dev;
 }
 
-
 const device_t vl82c480_device = {
-    "VLSI VL82c480",
-    "vl82c480",
-    0,
-    0x90,
-    vl82c480_init, vl82c480_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VLSI VL82c480",
+    .internal_name = "vl82c480",
+    .flags = 0,
+    .local = 0x90,
+    .init = vl82c480_init,
+    .close = vl82c480_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t vl82c486_device = {
-    "VLSI VL82c486",
-    "vl82c486",
-    0,
-    0x98,
-    vl82c480_init, vl82c480_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "VLSI VL82c486",
+    .internal_name = "vl82c486",
+    .flags = 0,
+    .local = 0x98,
+    .init = vl82c480_init,
+    .close = vl82c480_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/chipset/wd76c10.c b/src/chipset/wd76c10.c
index f737c371b..138349955 100644
--- a/src/chipset/wd76c10.c
+++ b/src/chipset/wd76c10.c
@@ -538,14 +538,15 @@ wd76c10_init(const device_t *info)
 }
 
 const device_t wd76c10_device = {
-    "Western Digital WD76C10",
-    "wd76c10",
-    0,
-    0,
-    wd76c10_init,
-    wd76c10_close,
-    NULL,
-    {NULL},
-    NULL,
-    NULL,
-    NULL};
+    .name = "Western Digital WD76C10",
+    .internal_name = "wd76c10",
+    .flags = 0,
+    .local = 0,
+    .init = wd76c10_init,
+    .close = wd76c10_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
+};