Merge pull request #2011 from jmlovelace/master

device_t refactor

src/acpi.c

@@ -1691,7 +1691,7 @@ acpi_reset(void *priv)
 	   - Bit  3: 80-conductor cable on secondary IDE channel (active low)
 	   - Bit  1: 80-conductor cable on primary IDE channel (active low) */
 	dev->regs.gpi_val = 0xfff57fc1;
-	if (!strcmp(machines[machine].internal_name, "ficva503a") || !strcmp(machines[machine].internal_name, "6via90ap"))
+	if (!strcmp(machine_get_internal_name(), "ficva503a") || !strcmp(machine_get_internal_name(), "6via90ap"))
 		dev->regs.gpi_val |= 0x00000004;
     }
 
@@ -1803,6 +1803,7 @@ acpi_init(const device_t *info)
 const device_t acpi_ali_device =
 {
     "ALi M7101 ACPI",
+    "acpi_ali",
     DEVICE_PCI,
     VEN_ALI,
     acpi_init, 
@@ -1817,6 +1818,7 @@ const device_t acpi_ali_device =
 const device_t acpi_intel_device =
 {
     "Intel ACPI",
+    "acpi_intel",
     DEVICE_PCI,
     VEN_INTEL,
     acpi_init, 
@@ -1831,6 +1833,7 @@ const device_t acpi_intel_device =
 const device_t acpi_sis_device =
 {
     "SiS ACPI",
+    "acpi_sis",
     DEVICE_PCI,
     VEN_SIS,
     acpi_init, 
@@ -1845,6 +1848,7 @@ const device_t acpi_sis_device =
 const device_t acpi_via_device =
 {
     "VIA ACPI",
+    "acpi_via",
     DEVICE_PCI,
     VEN_VIA,
     acpi_init, 
@@ -1860,6 +1864,7 @@ const device_t acpi_via_device =
 const device_t acpi_via_596b_device =
 {
     "VIA VT82C596 ACPI",
+    "acpi_via_596b",
     DEVICE_PCI,
     VEN_VIA_596B,
     acpi_init, 
@@ -1875,6 +1880,7 @@ const device_t acpi_via_596b_device =
 const device_t acpi_smc_device =
 {
     "SMC FDC73C931APM ACPI",
+    "acpi_smc",
     DEVICE_PCI,
     VEN_SMC,
     acpi_init, 

src/apm.c

@@ -126,6 +126,7 @@ static void
 const device_t apm_device =
 {
     "Advanced Power Management",
+    "apm",
     0,
     0,
     apm_init,
@@ -141,6 +142,7 @@ const device_t apm_device =
 const device_t apm_pci_device =
 {
     "Advanced Power Management (PCI)",
+    "apm_pci",
     DEVICE_PCI,
     0,
     apm_init,
@@ -156,6 +158,7 @@ const device_t apm_pci_device =
 const device_t apm_pci_acpi_device =
 {
     "Advanced Power Management (PCI)",
+    "apm_pci_acpi",
     DEVICE_PCI,
     1,
     apm_init,

src/chipset/82c100.c

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

src/chipset/acc2168.c

@@ -194,6 +194,7 @@ acc2168_init(const device_t *info)
 
 const device_t acc2168_device = {
     "ACC 2046/2168",
+    "acc2168",
     0,
     0,
     acc2168_init,

src/chipset/ali1429.c

@@ -340,6 +340,7 @@ ali1429_init(const device_t *info)
 
 const device_t ali1429_device = {
     "ALi M1429",
+    "ali1429",
     0,
     0,
     ali1429_init, ali1429_close, NULL,
@@ -349,6 +350,7 @@ const device_t ali1429_device = {
 
 const device_t ali1429g_device = {
     "ALi M1429G",
+    "ali1429g",
     0,
     1,
     ali1429_init, ali1429_close, NULL,

src/chipset/ali1489.c

@@ -629,6 +629,7 @@ ali1489_init(const device_t *info)
 
 const device_t ali1489_device = {
     "ALi M1489",
+    "ali1489",
     0,
     0,
     ali1489_init,

src/chipset/ali1531.c

@@ -379,6 +379,7 @@ ali1531_init(const device_t *info)
 
 const device_t ali1531_device = {
     "ALi M1531 CPU-to-PCI Bridge",
+    "ali1531",
     DEVICE_PCI,
     0,
     ali1531_init,

src/chipset/ali1541.c

@@ -644,6 +644,7 @@ ali1541_init(const device_t *info)
 
 const device_t ali1541_device = {
     "ALi M1541 CPU-to-PCI Bridge",
+    "ali1541",
     DEVICE_PCI,
     0,
     ali1541_init,

src/chipset/ali1543.c

@@ -1739,6 +1739,7 @@ ali1543_init(const device_t *info)
 
 const device_t ali1543_device = {
     "ALi M1543 Desktop South Bridge",
+    "ali1543",
     DEVICE_PCI,
     0,
     ali1543_init,
@@ -1752,6 +1753,7 @@ const device_t ali1543_device = {
 
 const device_t ali1543c_device = {
     "ALi M1543C Desktop South Bridge",
+    "ali1543c",
     DEVICE_PCI,
     1,
     ali1543_init,

src/chipset/ali1621.c

@@ -673,6 +673,7 @@ ali1621_init(const device_t *info)
 
 const device_t ali1621_device = {
     "ALi M1621 CPU-to-PCI Bridge",
+    "ali1621",
     DEVICE_PCI,
     0,
     ali1621_init,

src/chipset/ali6117.c

@@ -379,6 +379,7 @@ ali6117_init(const device_t *info)
 const device_t ali1217_device =
 {
     "ALi M1217",
+    "ali1217",
     DEVICE_AT,
     0x8,
     ali6117_init, 
@@ -394,6 +395,7 @@ const device_t ali1217_device =
 const device_t ali6117d_device =
 {
     "ALi M6117D",
+    "ali6117d",
     DEVICE_AT,
     0x2,
     ali6117_init, 

src/chipset/contaq_82c59x.c

@@ -349,6 +349,7 @@ contaq_82c59x_init(const device_t *info)
 
 const device_t contaq_82c596a_device = {
     "Contaq 82C596A",
+    "contaq_82c596a",
     0,
     0,
     contaq_82c59x_init,
@@ -363,6 +364,7 @@ const device_t contaq_82c596a_device = {
 
 const device_t contaq_82c597_device = {
     "Contaq 82C597",
+    "contaq_82c597",
     0,
     1,
     contaq_82c59x_init,

src/chipset/cs4031.c

@@ -177,6 +177,7 @@ cs4031_init(const device_t *info)
 
 const device_t cs4031_device = {
     "Chips & Technogies CS4031",
+    "cs4031",
     0,
     0,
     cs4031_init,

src/chipset/cs8230.c

@@ -159,6 +159,7 @@ static void
 
 const device_t cs8230_device = {
     "C&T CS8230 (386/AT)",
+    "cs8230",
     0,
     0,
     cs8230_init, cs8230_close, NULL,

src/chipset/et6000.c

@@ -150,6 +150,7 @@ et6000_init(const device_t *info)
 
 const device_t et6000_device = {
     "ETEQ Cheetah ET6000",
+    "et6000",
     0,
     0,
     et6000_init,

src/chipset/gc100.c

@@ -233,6 +233,7 @@ gc100_init(const device_t *info)
 
 const device_t gc100_device = {
     "G2 GC100",
+    "gc100",
     0,
     0,
     gc100_init, gc100_close, NULL,
@@ -242,6 +243,7 @@ const device_t gc100_device = {
 
 const device_t gc100a_device = {
     "G2 GC100A",
+    "gc100a",
     0,
     1,
     gc100_init, gc100_close, NULL,

src/chipset/headland.c

@@ -687,6 +687,7 @@ headland_init(const device_t *info)
 
 const device_t headland_gc10x_device = {
     "Headland GC101/102/103",
+    "headland_gc10x",
     0,
     0,
     headland_init, headland_close, NULL,
@@ -696,6 +697,7 @@ const device_t headland_gc10x_device = {
 
 const device_t headland_ht18a_device = {
     "Headland HT18 Rev. A",
+    "headland_ht18a",
     0,
     1,
     headland_init, headland_close, NULL,
@@ -705,6 +707,7 @@ const device_t headland_ht18a_device = {
 
 const device_t headland_ht18b_device = {
     "Headland HT18 Rev. B",
+    "headland_ht18b",
     0,
     2,
     headland_init, headland_close, NULL,
@@ -714,6 +717,7 @@ const device_t headland_ht18b_device = {
 
 const device_t headland_ht18c_device = {
     "Headland HT18 Rev. C",
+    "headland_ht18c",
     0,
     8,
     headland_init, headland_close, NULL,

src/chipset/ims8848.c

@@ -403,6 +403,7 @@ ims8848_init(const device_t *info)
 
 const device_t ims8848_device = {
     "IMS 8848/8849",
+    "ims8848",
     0,
     0,
     ims8848_init, ims8848_close, ims8848_reset,

src/chipset/intel_420ex.c

@@ -532,6 +532,7 @@ i420ex_init(const device_t *info)
 const device_t i420ex_device =
 {
     "Intel 82420EX",
+    "i420ex",
     DEVICE_PCI,
     0x00,
     i420ex_init,
@@ -547,6 +548,7 @@ const device_t i420ex_device =
 const device_t i420ex_ide_device =
 {
     "Intel 82420EX (With IDE)",
+    "i420ex_ide",
     DEVICE_PCI,
     0x01,
     i420ex_init,

src/chipset/intel_4x0.c

@@ -1623,6 +1623,7 @@ static void
 const device_t i420tx_device =
 {
     "Intel 82424TX",
+    "i420tx",
     DEVICE_PCI,
     INTEL_420TX,
     i4x0_init, 
@@ -1638,6 +1639,7 @@ const device_t i420tx_device =
 const device_t i420zx_device =
 {
     "Intel 82424ZX",
+    "i420zx",
     DEVICE_PCI,
     INTEL_420ZX,
     i4x0_init, 
@@ -1653,6 +1655,7 @@ const device_t i420zx_device =
 const device_t i430lx_device =
 {
     "Intel 82434LX",
+    "i430lx",
     DEVICE_PCI,
     INTEL_430LX,
     i4x0_init, 
@@ -1668,6 +1671,7 @@ const device_t i430lx_device =
 const device_t i430nx_device =
 {
     "Intel 82434NX",
+    "i430nx",
     DEVICE_PCI,
     INTEL_430NX,
     i4x0_init, 
@@ -1683,6 +1687,7 @@ const device_t i430nx_device =
 const device_t i430fx_device =
 {
     "Intel SB82437FX-66",
+    "i430fx",
     DEVICE_PCI,
     INTEL_430FX,
     i4x0_init, 
@@ -1698,6 +1703,7 @@ const device_t i430fx_device =
 const device_t i430fx_rev02_device =
 {
     "Intel SB82437FX-66 (Rev. 02)",
+    "i430fx_rev02",
     DEVICE_PCI,
     0x0200 | INTEL_430FX,
     i4x0_init, 
@@ -1713,6 +1719,7 @@ const device_t i430fx_rev02_device =
 const device_t i430hx_device =
 {
     "Intel 82439HX",
+    "i430hx",
     DEVICE_PCI,
     INTEL_430HX,
     i4x0_init, 
@@ -1728,6 +1735,7 @@ const device_t i430hx_device =
 const device_t i430vx_device =
 {
     "Intel 82437VX",
+    "i430vx",
     DEVICE_PCI,
     INTEL_430VX,
     i4x0_init, 
@@ -1743,6 +1751,7 @@ const device_t i430vx_device =
 const device_t i430tx_device =
 {
     "Intel 82439TX",
+    "i430tx",
     DEVICE_PCI,
     INTEL_430TX,
     i4x0_init, 
@@ -1758,6 +1767,7 @@ const device_t i430tx_device =
 const device_t i440fx_device =
 {
     "Intel 82441FX",
+    "i440fx",
     DEVICE_PCI,
     INTEL_440FX,
     i4x0_init, 
@@ -1772,6 +1782,7 @@ const device_t i440fx_device =
 const device_t i440lx_device =
 {
     "Intel 82443LX",
+    "i440lx",
     DEVICE_PCI,
     INTEL_440LX,
     i4x0_init, 
@@ -1786,6 +1797,7 @@ const device_t i440lx_device =
 const device_t i440ex_device =
 {
     "Intel 82443EX",
+    "i440ex",
     DEVICE_PCI,
     INTEL_440EX,
     i4x0_init, 
@@ -1800,6 +1812,7 @@ const device_t i440ex_device =
 const device_t i440bx_device =
 {
     "Intel 82443BX",
+    "i440bx",
     DEVICE_PCI,
     0x8000 | INTEL_440BX,
     i4x0_init, 
@@ -1814,6 +1827,7 @@ const device_t i440bx_device =
 const device_t i440bx_no_agp_device =
 {
     "Intel 82443BX",
+    "i440bx_no_agp",
     DEVICE_PCI,
     0x8200 | INTEL_440BX,
     i4x0_init, 
@@ -1828,6 +1842,7 @@ const device_t i440bx_no_agp_device =
 const device_t i440gx_device =
 {
     "Intel 82443GX",
+    "i440gx",
     DEVICE_PCI,
     0x8000 | INTEL_440GX,
     i4x0_init, 
@@ -1842,6 +1857,7 @@ const device_t i440gx_device =
 const device_t i440zx_device =
 {
     "Intel 82443ZX",
+    "i440zx",
     DEVICE_PCI,
     0x8000 | INTEL_440ZX,
     i4x0_init, 

src/chipset/intel_82335.c

@@ -198,6 +198,7 @@ intel_82335_init(const device_t *info)
 
 const device_t intel_82335_device = {
     "Intel 82335",
+    "intel_82335",
     0,
     0,
     intel_82335_init,

src/chipset/intel_i450kx.c

@@ -809,6 +809,7 @@ i450kx_init(const device_t *info)
 
 const device_t i450kx_device = {
     "Intel 450KX (Mars)",
+    "i450kx",
     DEVICE_PCI,
     0,
     i450kx_init,

src/chipset/intel_piix.c

@@ -1601,6 +1601,7 @@ static void
 const device_t piix_device =
 {
     "Intel 82371FB (PIIX)",
+    "piix",
     DEVICE_PCI,
     0x122e0101,
     piix_init, 
@@ -1615,6 +1616,7 @@ const device_t piix_device =
 const device_t piix_rev02_device =
 {
     "Intel 82371FB (PIIX) (Faulty BusMastering!!)",
+    "piix_rev02",
     DEVICE_PCI,
     0x122e0121,
     piix_init, 
@@ -1629,6 +1631,7 @@ const device_t piix_rev02_device =
 const device_t piix3_device =
 {
     "Intel 82371SB (PIIX3)",
+    "piix3",
     DEVICE_PCI,
     0x70000403,
     piix_init, 
@@ -1643,6 +1646,7 @@ const device_t piix3_device =
 const device_t piix4_device =
 {
     "Intel 82371AB/EB (PIIX4/PIIX4E)",
+    "piix4",
     DEVICE_PCI,
     0x71100004,
     piix_init, 
@@ -1657,6 +1661,7 @@ const device_t piix4_device =
 const device_t piix4e_device =
 {
     "Intel 82371EB (PIIX4E)",
+    "piix4e",
     DEVICE_PCI,
     0x71100094,
     piix_init, 
@@ -1671,6 +1676,7 @@ const device_t piix4e_device =
 const device_t slc90e66_device =
 {
     "SMSC SLC90E66 (Victory66)",
+    "slc90e66",
     DEVICE_PCI,
     0x94600005,
     piix_init, 

src/chipset/intel_sio.c

@@ -548,6 +548,7 @@ sio_init(const device_t *info)
 const device_t sio_device =
 {
     "Intel 82378IB (SIO)",
+    "sio",
     DEVICE_PCI,
     0x00,
     sio_init,
@@ -563,6 +564,7 @@ const device_t sio_device =
 const device_t sio_zb_device =
 {
     "Intel 82378ZB (SIO)",
+    "sio_zb",
     DEVICE_PCI,
     0x03,
     sio_init,

src/chipset/neat.c

@@ -827,6 +827,7 @@ neat_init(const device_t *info)
 
 const device_t neat_device = {
     "C&T CS8121 (NEAT)",
+    "neat",
     0,
     0,
     neat_init, neat_close, NULL,

src/chipset/olivetti_eva.c

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

src/chipset/opti283.c

@@ -305,6 +305,7 @@ opti283_init(const device_t *info)
 
 const device_t opti283_device = {
     "OPTi 82C283",
+    "opti283",
     0,
     0,
     opti283_init,

src/chipset/opti291.c

@@ -148,6 +148,7 @@ opti291_init(const device_t *info)
 
 const device_t opti291_device = {
 	"OPTi 82C291",
+	"opti291",
 	0,
 	0,
 	opti291_init,

src/chipset/opti391.c

@@ -214,6 +214,7 @@ opti391_init(const device_t *info)
 
 const device_t opti391_device = {
     "OPTi 82C391",
+    "opti391",
     0,
     0,
     opti391_init,

src/chipset/opti495.c

@@ -239,6 +239,7 @@ opti495_init(const device_t *info)
 
 const device_t opti493_device = {
     "OPTi 82C493",
+    "opti493",
     0,
     0,
     opti495_init, opti495_close, NULL,
@@ -249,6 +250,7 @@ const device_t opti493_device = {
 
 const device_t opti495_device = {
     "OPTi 82C495",
+    "opti495",
     0,
     1,
     opti495_init, opti495_close, NULL,

src/chipset/opti499.c

@@ -256,6 +256,7 @@ opti499_init(const device_t *info)
 
 const device_t opti499_device = {
     "OPTi 82C499",
+    "opti499",
     0,
     1,
     opti499_init, opti499_close, opti499_reset,

src/chipset/opti5x7.c

@@ -177,6 +177,7 @@ opti5x7_init(const device_t *info)
 
 const device_t opti5x7_device = {
     "OPTi 82C5x6/82C5x7",
+    "opti5x7",
     0,
     0,
     opti5x7_init,

src/chipset/opti822.c

@@ -311,6 +311,7 @@ opti822_init(const device_t *info)
 
 const device_t opti822_device = {
     "OPTi 82C822 PCIB",
+    "opti822",
     DEVICE_PCI,
     0,
     opti822_init,

src/chipset/opti895.c

@@ -276,6 +276,7 @@ opti895_init(const device_t *info)
 
 const device_t opti802g_device = {
     "OPTi 82C802G",
+    "opti802g",
     0,
     0,
     opti895_init, opti895_close, NULL,
@@ -286,6 +287,7 @@ const device_t opti802g_device = {
 
 const device_t opti895_device = {
     "OPTi 82C895",
+    "opti895",
     0,
     0,
     opti895_init, opti895_close, NULL,

src/chipset/scamp.c

@@ -793,6 +793,7 @@ scamp_init(const device_t *info)
 
 const device_t vlsi_scamp_device = {
     "VLSI SCAMP",
+    "vlsi_scamp",
     0,
     0,
     scamp_init, scamp_close, NULL,

src/chipset/scat.c

@@ -1545,6 +1545,7 @@ scat_init(const device_t *info)
 
 const device_t scat_device = {
     "C&T SCAT (v1)",
+    "scat",
     0,
     0,
     scat_init, scat_close, NULL,
@@ -1554,6 +1555,7 @@ const device_t scat_device = {
 
 const device_t scat_4_device = {
     "C&T SCAT (v4)",
+    "scat_4",
     0,
     4,
     scat_init, scat_close, NULL,
@@ -1563,6 +1565,7 @@ const device_t scat_4_device = {
 
 const device_t scat_sx_device = {
     "C&T SCATsx",
+    "scat_sx",
     0,
     32,
     scat_init, scat_close, NULL,

src/chipset/sis_5511.c

@@ -741,6 +741,7 @@ sis_5511_init(const device_t *info)
 
 const device_t sis_5511_device = {
 	"SiS 5511",
+	"sis_5511",
 	DEVICE_PCI,
 	0,
 	sis_5511_init,

src/chipset/sis_5571.c

@@ -743,6 +743,7 @@ sis_5571_init(const device_t *info)
 
 const device_t sis_5571_device = {
 	"SiS 5571",
+	"sis_5571",
 	DEVICE_PCI,
 	0,
 	sis_5571_init,

src/chipset/sis_85c310.c

@@ -138,6 +138,7 @@ rabbit_init(const device_t *info)
 
 const device_t rabbit_device = {
     "SiS Rabbit",
+    "rabbit",
     0,
     0,
     rabbit_init, rabbit_close, NULL,

src/chipset/sis_85c496.c

@@ -622,6 +622,7 @@ static void
 const device_t sis_85c496_device =
 {
     "SiS 85c496/85c497",
+    "sis_85c496",
     DEVICE_PCI,
     0,
     sis_85c496_init, 
@@ -637,6 +638,7 @@ const device_t sis_85c496_device =
 const device_t sis_85c496_ls486e_device =
 {
     "SiS 85c496/85c497 (Lucky Star LS-486E)",
+    "sis_85c496_ls486e",
     DEVICE_PCI,
     1,
     sis_85c496_init, 

src/chipset/sis_85c4xx.c

@@ -361,6 +361,7 @@ sis_85c4xx_init(const device_t *info)
 
 const device_t sis_85c401_device = {
     "SiS 85c401/85c402",
+    "sis_85c401",
     0,
     0x060,
     sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
@@ -370,6 +371,7 @@ const device_t sis_85c401_device = {
 
 const device_t sis_85c460_device = {
     "SiS 85c460",
+    "sis_85c460",
     0,
     0x050,
     sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,
@@ -380,6 +382,7 @@ const device_t sis_85c460_device = {
 /* 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,
@@ -389,6 +392,7 @@ const device_t sis_85c461_device = {
 
 const device_t sis_85c471_device = {
     "SiS 85c407/85c471",
+    "sis_85c471",
     0,
     0x150,
     sis_85c4xx_init, sis_85c4xx_close, sis_85c4xx_reset,

src/chipset/sis_85c50x.c

@@ -393,6 +393,7 @@ sis_85c50x_init(const device_t *info)
 
 const device_t sis_85c50x_device = {
     "SiS 85C50x",
+    "sis_85c50x",
     DEVICE_PCI,
     0,
     sis_85c50x_init, sis_85c50x_close,

src/chipset/stpc.c

@@ -1060,6 +1060,7 @@ stpc_lpt_init(const device_t *info)
 const device_t stpc_client_device =
 {
     "STPC Client",
+    "stpc_client",
     DEVICE_PCI,
     STPC_CLIENT,
     stpc_init, 
@@ -1074,6 +1075,7 @@ const device_t stpc_client_device =
 const device_t stpc_consumer2_device =
 {
     "STPC Consumer-II",
+    "stpc_consumer2",
     DEVICE_PCI,
     STPC_CONSUMER2,
     stpc_init, 
@@ -1088,6 +1090,7 @@ const device_t stpc_consumer2_device =
 const device_t stpc_elite_device =
 {
     "STPC Elite",
+    "stpc_elite",
     DEVICE_PCI,
     STPC_ELITE,
     stpc_init, 
@@ -1102,6 +1105,7 @@ const device_t stpc_elite_device =
 const device_t stpc_atlas_device =
 {
     "STPC Atlas",
+    "stpc_atlas",
     DEVICE_PCI,
     STPC_ATLAS,
     stpc_init, 
@@ -1117,6 +1121,7 @@ const device_t stpc_atlas_device =
 const device_t stpc_serial_device =
 {
     "STPC Serial UARTs",
+    "stpc_serial",
     0,
     0,
     stpc_serial_init,
@@ -1131,6 +1136,7 @@ const device_t stpc_serial_device =
 const device_t stpc_lpt_device =
 {
     "STPC Parallel Port",
+    "stpc_lpt",
     0,
     0,
     stpc_lpt_init,

src/chipset/umc_8886.c

@@ -380,6 +380,7 @@ umc_8886_init(const device_t *info)
 
 const device_t umc_8886f_device = {
     "UMC 8886F",
+    "umc_8886f",
     DEVICE_PCI,
     0x8886,
     umc_8886_init, umc_8886_close, umc_8886_reset,
@@ -389,6 +390,7 @@ const device_t umc_8886f_device = {
 
 const device_t umc_8886af_device = {
     "UMC 8886AF/8886BF",
+    "umc_8886af",
     DEVICE_PCI,
     0x886a,
     umc_8886_init, umc_8886_close, umc_8886_reset,

src/chipset/umc_hb4.c

@@ -419,6 +419,7 @@ hb4_init(const device_t *info)
 
 const device_t umc_hb4_device = {
     "UMC HB4(8881F)",
+    "umc_hb4",
     DEVICE_PCI,
     0x886a,
     hb4_init, hb4_close, hb4_reset,

src/chipset/via_apollo.c

@@ -763,6 +763,7 @@ via_apollo_close(void *priv)
 const device_t via_vpx_device =
 {
     "VIA Apollo VPX",
+    "via_vpx",
     DEVICE_PCI,
     VIA_585,	/*VT82C585*/
     via_apollo_init, 
@@ -777,6 +778,7 @@ const device_t via_vpx_device =
 const device_t amd640_device =
 {
     "AMD 640 System Controller",
+    "amd640",
     DEVICE_PCI,
     VIA_595,	/*VT82C595*/
     via_apollo_init, 
@@ -791,6 +793,7 @@ const device_t amd640_device =
 const device_t via_vp3_device =
 {
     "VIA Apollo VP3",
+    "via_vp3",
     DEVICE_PCI,
     VIA_597,	/*VT82C597*/
     via_apollo_init, 
@@ -805,6 +808,7 @@ const device_t via_vp3_device =
 const device_t via_mvp3_device =
 {
     "VIA Apollo MVP3",
+    "via_mvp3",
     DEVICE_PCI,
     VIA_598,	/*VT82C598MVP*/
     via_apollo_init, 
@@ -818,6 +822,7 @@ const device_t via_mvp3_device =
 
 const device_t via_apro_device = {
     "VIA Apollo Pro",
+    "via_apro",
     DEVICE_PCI,
     VIA_691,	/*VT82C691*/
     via_apollo_init,
@@ -831,6 +836,7 @@ const device_t via_apro_device = {
 
 const device_t via_apro133_device = {
     "VIA Apollo Pro133",
+    "via_apro133",
     DEVICE_PCI,
     VIA_693A,	/*VT82C693A*/
     via_apollo_init,
@@ -844,6 +850,7 @@ const device_t via_apro133_device = {
 
 const device_t via_apro133a_device = {
     "VIA Apollo Pro133A",
+    "via_apro_133a",
     DEVICE_PCI,
     VIA_694,	/*VT82C694X*/
     via_apollo_init,
@@ -857,6 +864,7 @@ const device_t via_apro133a_device = {
 
 const device_t via_vt8601_device = {
     "VIA Apollo ProMedia",
+    "via_vt8601",
     DEVICE_PCI,
     VIA_8601,	/*VT8601*/
     via_apollo_init,

src/chipset/via_pipc.c

@@ -1635,6 +1635,7 @@ pipc_close(void *p)
 const device_t via_vt82c586b_device =
 {
     "VIA VT82C586B",
+    "via_vt82c586b",
     DEVICE_PCI,
     VIA_PIPC_586B,
     pipc_init,
@@ -1649,6 +1650,7 @@ const device_t via_vt82c586b_device =
 const device_t via_vt82c596a_device =
 {
     "VIA VT82C596A",
+    "via_vt82c596a",
     DEVICE_PCI,
     VIA_PIPC_596A,
     pipc_init,
@@ -1664,6 +1666,7 @@ const device_t via_vt82c596a_device =
 const device_t via_vt82c596b_device =
 {
     "VIA VT82C596B",
+    "via_vt82c596b",
     DEVICE_PCI,
     VIA_PIPC_596B,
     pipc_init,
@@ -1679,6 +1682,7 @@ const device_t via_vt82c596b_device =
 const device_t via_vt82c686a_device =
 {
     "VIA VT82C686A",
+    "via_vt82c686a",
     DEVICE_PCI,
     VIA_PIPC_686A,
     pipc_init,
@@ -1694,6 +1698,7 @@ const device_t via_vt82c686a_device =
 const device_t via_vt82c686b_device =
 {
     "VIA VT82C686B",
+    "via_vt82c686b",
     DEVICE_PCI,
     VIA_PIPC_686B,
     pipc_init,
@@ -1709,6 +1714,7 @@ const device_t via_vt82c686b_device =
 const device_t via_vt8231_device =
 {
     "VIA VT8231",
+    "via_vt8231",
     DEVICE_PCI,
     VIA_PIPC_8231,
     pipc_init,

src/chipset/via_vt82c49x.c

@@ -361,6 +361,7 @@ vt82c49x_init(const device_t *info)
 
 const device_t via_vt82c49x_device = {
     "VIA VT82C49X",
+    "via_vt82c49x",
     0,
     0,
     vt82c49x_init, vt82c49x_close, NULL,
@@ -371,6 +372,7 @@ const device_t via_vt82c49x_device = {
 
 const device_t via_vt82c49x_pci_device = {
     "VIA VT82C49X PCI",
+    "via_vt82c49x_pci",
     DEVICE_PCI,
     0,
     vt82c49x_init, vt82c49x_close, vt82c49x_reset,
@@ -381,6 +383,7 @@ const device_t via_vt82c49x_pci_device = {
 
 const device_t via_vt82c49x_ide_device = {
     "VIA VT82C49X (With IDE)",
+    "via_vt82c49x_ide",
     0,
     1,
     vt82c49x_init, vt82c49x_close, NULL,
@@ -391,6 +394,7 @@ const device_t via_vt82c49x_ide_device = {
 
 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,

src/chipset/via_vt82c505.c

@@ -219,6 +219,7 @@ vt82c505_init(const device_t *info)
 
 const device_t via_vt82c505_device = {
     "VIA VT82C505",
+    "via_vt82c505",
     DEVICE_PCI,
     0,
     vt82c505_init,

src/chipset/vl82c480.c

@@ -191,6 +191,7 @@ vl82c480_init(const device_t *info)
 
 const device_t vl82c480_device = {
     "VLSI VL82c480",
+    "vl82c480",
     0,
     0x90,
     vl82c480_init, vl82c480_close, NULL,
@@ -201,6 +202,7 @@ const device_t vl82c480_device = {
 
 const device_t vl82c486_device = {
     "VLSI VL82c486",
+    "vl82c486",
     0,
     0x98,
     vl82c480_init, vl82c480_close, NULL,

src/chipset/wd76c10.c

@@ -539,6 +539,7 @@ wd76c10_init(const device_t *info)
 
 const device_t wd76c10_device = {
     "Western Digital WD76C10",
+    "wd76c10",
     0,
     0,
     wd76c10_init,

src/ddma.c

@@ -188,6 +188,7 @@ ddma_init(const device_t *info)
 const device_t ddma_device =
 {
     "Distributed DMA",
+    "ddma",
     DEVICE_PCI,
     0,
     ddma_init, 

src/device.c

@@ -192,6 +192,16 @@ device_add_common(const device_t *d, const device_t *cd, void *p, int inst)
 }
 
 
+char *
+device_get_internal_name(const device_t *d)
+{
+    if (d == NULL)
+	return "";
+
+    return (char *) d->internal_name;
+}
+
+
 void *
 device_add(const device_t *d)
 {

src/device/bugger.c

@@ -357,6 +357,7 @@ bug_close(UNUSED(void *priv))
 
 const device_t bugger_device = {
     "ISA/PCI Bus Bugger",
+    "bugger",
     DEVICE_ISA | DEVICE_AT,
     0,
     bug_init, bug_close, NULL,

src/device/cassette.c

@@ -715,6 +715,7 @@ cassette_init(const device_t *info)
 
 const device_t cassette_device = {
     "IBM PC/PCjr Cassette Device",
+    "cassette",
     0,
     0,
     cassette_init, cassette_close, NULL,

src/device/hwm_gl518sm.c

@@ -300,6 +300,7 @@ gl518sm_init(const device_t *info)
 /* GL518SM on SMBus address 2Ch */
 const device_t gl518sm_2c_device = {
     "Genesys Logic GL518SM Hardware Monitor",
+    "gl518sm_2c",
     DEVICE_ISA,
     0x2c,
     gl518sm_init, gl518sm_close, NULL,
@@ -310,6 +311,7 @@ const device_t gl518sm_2c_device = {
 /* GL518SM on SMBus address 2Dh */
 const device_t gl518sm_2d_device = {
     "Genesys Logic GL518SM Hardware Monitor",
+    "gl518sm_2d",
     DEVICE_ISA,
     0x2d,
     gl518sm_init, gl518sm_close, NULL,

src/device/hwm_lm75.c

@@ -244,6 +244,7 @@ lm75_init(const device_t *info)
 /* LM75 on SMBus address 4Ah, reporting temperatures[1]. */
 const device_t lm75_1_4a_device = {
     "National Semiconductor LM75 Temperature Sensor",
+    "lm75_1_4a",
     DEVICE_ISA,
     0x14a,
     lm75_init, lm75_close, NULL,
@@ -256,6 +257,7 @@ const device_t lm75_1_4a_device = {
    the Winbond W83781D family. Not to be used stand-alone. */
 const device_t lm75_w83781d_device = {
     "Winbond W83781D Secondary Temperature Sensor",
+    "lm75_w83781d",
     DEVICE_ISA,
     0,
     lm75_init, lm75_close, NULL,

src/device/hwm_lm78.c

@@ -787,6 +787,7 @@ lm78_init(const device_t *info)
 /* National Semiconductor LM78 on ISA and SMBus. */
 const device_t lm78_device = {
     "National Semiconductor LM78 Hardware Monitor",
+    "lm78",
     DEVICE_ISA,
     0x290 | LM78_I2C,
     lm78_init, lm78_close, lm78_reset,
@@ -798,6 +799,7 @@ const device_t lm78_device = {
 /* Winbond W83781D on ISA and SMBus. */
 const device_t w83781d_device = {
     "Winbond W83781D Hardware Monitor",
+    "w83781d",
     DEVICE_ISA,
     0x290 | LM78_I2C | LM78_W83781D,
     lm78_init, lm78_close, lm78_reset,
@@ -809,6 +811,7 @@ const device_t w83781d_device = {
 /* Winbond W83781D on ISA and SMBus. */
 const device_t w83781d_p5a_device = {
     "Winbond W83781D Hardware Monitor (ASUS P5A)",
+    "w83781d_p5a",
     DEVICE_ISA,
     0x290 | LM78_I2C | LM78_W83781D | LM78_P5A,
     lm78_init, lm78_close, lm78_reset,
@@ -821,6 +824,7 @@ const device_t w83781d_p5a_device = {
    I2C-only W83781D clone with additional voltages, GPIOs and fan control. */
 const device_t as99127f_device = {
     "ASUS AS99127F Rev. 1 Hardware Monitor",
+    "as99137f",
     DEVICE_ISA,
     LM78_I2C | LM78_AS99127F_REV1,
     lm78_init, lm78_close, lm78_reset,
@@ -832,6 +836,7 @@ const device_t as99127f_device = {
 /* Rev. 2 is manufactured by Winbond and differs only in GPI registers. */
 const device_t as99127f_rev2_device = {
     "ASUS AS99127F Rev. 2 Hardware Monitor",
+    "as99127f_rev2",
     DEVICE_ISA,
     LM78_I2C | LM78_AS99127F_REV2,
     lm78_init, lm78_close, lm78_reset,
@@ -843,6 +848,7 @@ const device_t as99127f_rev2_device = {
 /* Winbond W83782D on ISA and SMBus. */
 const device_t w83782d_device = {
     "Winbond W83782D Hardware Monitor",
+    "w83783d",
     DEVICE_ISA,
     0x290 | LM78_I2C | LM78_W83782D,
     lm78_init, lm78_close, lm78_reset,

src/device/hwm_vt82c686.c

@@ -207,6 +207,7 @@ vt82c686_init(const device_t *info)
 
 const device_t via_vt82c686_hwm_device = {
     "VIA VT82C686 Integrated Hardware Monitor",
+    "via_vt82c686_hwm",
     DEVICE_ISA,
     0,
     vt82c686_init, vt82c686_close, NULL,

src/device/ibm_5161.c

@@ -115,6 +115,7 @@ ibm_5161_init(const device_t *info)
 const device_t ibm_5161_device =
 {
     "IBM Expansion Unit (5161)",
+    "ibm_5161",
     0,
     0,
     ibm_5161_init,

src/device/isamem.c

@@ -694,6 +694,7 @@ static const device_config_t ibmxt_config[] =
 
 static const device_t ibmxt_device = {
     "IBM PC/XT Memory Expansion",
+    "ibmxt",
     DEVICE_ISA,
     ISAMEM_IBMXT_CARD,
     isamem_init, isamem_close, NULL,
@@ -721,6 +722,7 @@ static const device_config_t genericxt_config[] =
 
 static const device_t genericxt_device = {
     "Generic PC/XT Memory Expansion",
+    "genericxt",
     DEVICE_ISA,
     ISAMEM_GENXT_CARD,
     isamem_init, isamem_close, NULL,
@@ -748,6 +750,7 @@ static const device_config_t ibmat_config[] =
 
 static const device_t ibmat_device = {
     "IBM PC/AT Memory Expansion",
+    "ibmat",
     DEVICE_ISA,
     ISAMEM_IBMAT_CARD,
     isamem_init, isamem_close, NULL,
@@ -775,6 +778,7 @@ static const device_config_t genericat_config[] =
 
 static const device_t genericat_device = {
     "Generic PC/AT Memory Expansion",
+    "genericat",
     DEVICE_ISA,
     ISAMEM_GENAT_CARD,
     isamem_init, isamem_close, NULL,
@@ -802,6 +806,7 @@ static const device_config_t p5pak_config[] =
 
 static const device_t p5pak_device = {
     "Paradise Systems 5-PAK",
+    "p5pak",
     DEVICE_ISA,
     ISAMEM_P5PAK_CARD,
     isamem_init, isamem_close, NULL,
@@ -829,6 +834,7 @@ static const device_config_t a6pak_config[] =
 
 static const device_t a6pak_device = {
     "AST SixPakPlus",
+    "a6pak",
     DEVICE_ISA,
     ISAMEM_A6PAK_CARD,
     isamem_init, isamem_close, NULL,
@@ -875,6 +881,7 @@ static const device_config_t ems5150_config[] =
 
 static const device_t ems5150_device = {
     "Micro Mainframe EMS-5150(T)",
+    "ems5150",
     DEVICE_ISA,
     ISAMEM_EMS5150_CARD,
     isamem_init, isamem_close, NULL,
@@ -978,6 +985,7 @@ static const device_config_t ev159_config[] =
 
 static const device_t ev159_device = {
     "Everex EV-159 RAM 3000 Deluxe",
+    "ev159",
     DEVICE_ISA,
     ISAMEM_EV159_CARD,
     isamem_init, isamem_close, NULL,
@@ -1067,6 +1075,7 @@ static const device_config_t brat_config[] =
 
 static const device_t brat_device = {
     "BocaRAM/AT",
+    "brat",
     DEVICE_ISA,
     ISAMEM_BRAT_CARD,
     isamem_init, isamem_close, NULL,
@@ -1169,6 +1178,7 @@ static const device_config_t rampage_config[] =
 
 static const device_t rampage_device = {
     "AST RAMpage/XT",
+    "rampage",
     DEVICE_ISA,
     ISAMEM_RAMPAGEXT_CARD,
     isamem_init, isamem_close, NULL,
@@ -1271,6 +1281,7 @@ static const device_config_t iab_config[] =
 
 static const device_t iab_device = {
     "Intel AboveBoard",
+    "iab",
     DEVICE_ISA,
     ISAMEM_ABOVEBOARD_CARD,
     isamem_init, isamem_close, NULL,
@@ -1280,29 +1291,38 @@ static const device_t iab_device = {
 #endif
 
 
+static const device_t isa_none_device = {
+    "None",
+    "none",
+    0, 0,
+    NULL, NULL, NULL,
+    { NULL }, NULL, NULL,
+    NULL
+};
+
+
 static const struct {
-    const char		*internal_name;
     const device_t	*dev;
 } boards[] = {
-    { "none",		NULL				},
+    { &isa_none_device		},
-    { "ibmxt",		&ibmxt_device		},
+    { &ibmxt_device		},
-    { "genericxt",	&genericxt_device	},
+    { &genericxt_device		},
-    { "ibmat",		&ibmat_device		},
+    { &ibmat_device		},
-    { "genericat",	&genericat_device	},
+    { &genericat_device		},
-    { "p5pak",		&p5pak_device		},
+    { &p5pak_device		},
-    { "a6pak",		&a6pak_device		},
+    { &a6pak_device		},
-    { "ems5150",	&ems5150_device		},
+    { &ems5150_device		},
-    { "ev159",		&ev159_device		},
+    { &ev159_device		},
 #ifdef USE_ISAMEM_BRAT
-    { "brat",		&brat_device		},
+    { &brat_device		},
 #endif
 #ifdef USE_ISAMEM_RAMPAGE
-    { "rampage",	&rampage_device		},
+    { &rampage_device		},
 #endif
 #ifdef USE_ISAMEM_IAB
-    { "iab",		&iab_device			},
+    { &iab_device		},
 #endif
-    { "",			NULL				}
+    { NULL			}
 };
 
 
@@ -1336,7 +1356,7 @@ isamem_get_name(int board)
 const char *
 isamem_get_internal_name(int board)
 {
-    return(boards[board].internal_name);
+    return device_get_internal_name(boards[board].dev);
 }
 
 
@@ -1346,8 +1366,8 @@ isamem_get_from_internal_name(const char *s)
 {
     int c = 0;
 
-    while (boards[c].internal_name != NULL) {
+    while (boards[c].dev != NULL) {
-	if (! strcmp(boards[c].internal_name, s))
+	if (! strcmp(boards[c].dev->internal_name, s))
 		return(c);
 	c++;
     }

src/device/isapnp.c

@@ -1067,6 +1067,7 @@ isapnp_reset_device(void *priv, uint8_t ldn)
 
 static const device_t isapnp_device = {
     "ISA Plug and Play",
+    "isapnp",
     0,
     0,
     isapnp_init, isapnp_close, NULL,

src/device/isartc.c

@@ -632,6 +632,7 @@ static const device_config_t ev170_config[] = {
 
 static const device_t ev170_device = {
     "Everex EV-170 Magic I/O",
+    "ev170",
     DEVICE_ISA,
     ISARTC_EV170,
     isartc_init, isartc_close, NULL,
@@ -662,6 +663,7 @@ static const device_config_t pii147_config[] = {
 
 static const device_t pii147_device = {
     "DTK PII-147 Hexa I/O Plus",
+    "pii147",
     DEVICE_ISA,
     ISARTC_DTK,
     isartc_init, isartc_close, NULL,
@@ -698,6 +700,7 @@ static const device_config_t p5pak_config[] = {
 
 static const device_t p5pak_device = {
     "Paradise Systems 5-PAK",
+    "p5pak",
     DEVICE_ISA,
     ISARTC_P5PAK,
     isartc_init, isartc_close, NULL,
@@ -734,6 +737,7 @@ static const device_config_t a6pak_config[] = {
 
 static const device_t a6pak_device = {
     "AST SixPakPlus",
+    "a6pak",
     DEVICE_ISA,
     ISARTC_A6PAK,
     isartc_init, isartc_close, NULL,
@@ -742,16 +746,25 @@ static const device_t a6pak_device = {
 };
 
 
+static const device_t isartc_none_device = {
+    "None",
+    "none",
+    0, 0,
+    NULL, NULL, NULL,
+    { NULL }, NULL, NULL,
+    NULL
+};
+
+
 static const struct {
-    const char		*internal_name;
     const device_t	*dev;
 } boards[] = {
-    { "none",	NULL	      	},
+    { &isartc_none_device	},
-    { "ev170",	&ev170_device	},
+    { &ev170_device		},
-    { "pii147",	&pii147_device	},
+    { &pii147_device		},
-    { "p5pak",	&p5pak_device	},
+    { &p5pak_device		},
-    { "a6pak",	&a6pak_device	},
+    { &a6pak_device		},
-    { "",	NULL		},
+    { NULL			},
 };
 
 
@@ -768,7 +781,7 @@ isartc_reset(void)
 char *
 isartc_get_internal_name(int board)
 {
-    return((char *)boards[board].internal_name);
+    return device_get_internal_name(boards[board].dev);
 }
 
 
@@ -777,8 +790,8 @@ isartc_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (strlen((char *) boards[c].internal_name)) {
+    while (boards[c].dev != NULL) {
-	if (! strcmp(boards[c].internal_name, s))
+	if (! strcmp(boards[c].dev->internal_name, s))
 		return(c);
 	c++;
     }

src/device/keyboard_at.c

@@ -2343,6 +2343,7 @@ kbd_init(const device_t *info)
 
 const device_t keyboard_at_device = {
     "PC/AT Keyboard",
+    "keyboard_at",
     0,
     KBC_TYPE_ISA | KBC_VEN_GENERIC,
     kbd_init,
@@ -2353,6 +2354,7 @@ const device_t keyboard_at_device = {
 
 const device_t keyboard_at_ami_device = {
     "PC/AT Keyboard (AMI)",
+    "keyboard_at_ami",
     0,
     KBC_TYPE_ISA | KBC_VEN_AMI,
     kbd_init,
@@ -2363,6 +2365,7 @@ const device_t keyboard_at_ami_device = {
 
 const device_t keyboard_at_samsung_device = {
     "PC/AT Keyboard (Samsung)",
+    "keyboard_at_samsung",
     0,
     KBC_TYPE_ISA | KBC_VEN_SAMSUNG,
     kbd_init,
@@ -2373,6 +2376,7 @@ const device_t keyboard_at_samsung_device = {
 
 const device_t keyboard_at_toshiba_device = {
     "PC/AT Keyboard (Toshiba)",
+    "keyboard_at_toshiba",
     0,
     KBC_TYPE_ISA | KBC_VEN_TOSHIBA,
     kbd_init,
@@ -2383,6 +2387,7 @@ const device_t keyboard_at_toshiba_device = {
 
 const device_t keyboard_at_olivetti_device = {
     "PC/AT Keyboard (Olivetti)",
+    "keyboard_at_olivetti",
     0,
     KBC_TYPE_ISA | KBC_VEN_OLIVETTI,
     kbd_init,
@@ -2393,6 +2398,7 @@ const device_t keyboard_at_olivetti_device = {
 
 const device_t keyboard_at_ncr_device = {
     "PC/AT Keyboard (NCR)",
+    "keyboard_at_ncr",
     0,
     KBC_TYPE_ISA | KBC_VEN_NCR,
     kbd_init,
@@ -2403,6 +2409,7 @@ const device_t keyboard_at_ncr_device = {
 
 const device_t keyboard_ps2_device = {
     "PS/2 Keyboard",
+    "keyboard_ps2",
     0,
     KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
     kbd_init,
@@ -2413,6 +2420,7 @@ const device_t keyboard_ps2_device = {
 
 const device_t keyboard_ps2_ps2_device = {
     "PS/2 Keyboard",
+    "keyboard_ps2_ps2",
     0,
     KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
     kbd_init,
@@ -2423,6 +2431,7 @@ const device_t keyboard_ps2_ps2_device = {
 
 const device_t keyboard_ps2_ps1_device = {
     "PS/2 Keyboard (IBM PS/1)",
+    "keyboard_ps2_ps1",
     0,
     KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
     kbd_init,
@@ -2433,6 +2442,7 @@ const device_t keyboard_ps2_ps1_device = {
 
 const device_t keyboard_ps2_ps1_pci_device = {
     "PS/2 Keyboard (IBM PS/1)",
+    "keyboard_ps2_ps1_pci",
     DEVICE_PCI,
     KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
     kbd_init,
@@ -2443,6 +2453,7 @@ const device_t keyboard_ps2_ps1_pci_device = {
 
 const device_t keyboard_ps2_xi8088_device = {
     "PS/2 Keyboard (Xi8088)",
+    "keyboard_ps2_xi8088",
     0,
     KBC_TYPE_PS2_1 | KBC_VEN_XI8088,
     kbd_init,
@@ -2453,6 +2464,7 @@ const device_t keyboard_ps2_xi8088_device = {
 
 const device_t keyboard_ps2_ami_device = {
     "PS/2 Keyboard (AMI)",
+    "keyboard_ps2_ami",
     0,
     KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
     kbd_init,
@@ -2463,6 +2475,7 @@ const device_t keyboard_ps2_ami_device = {
 
 const device_t keyboard_ps2_olivetti_device = {
     "PS/2 Keyboard (Olivetti)",
+    "keyboard_ps2_olivetti",
     0,
     KBC_TYPE_PS2_NOREF | KBC_VEN_OLIVETTI,
     kbd_init,
@@ -2473,6 +2486,7 @@ const device_t keyboard_ps2_olivetti_device = {
 
 const device_t keyboard_ps2_mca_device = {
     "PS/2 Keyboard",
+    "keyboard_ps2_mca",
     0,
     KBC_TYPE_PS2_1 | KBC_VEN_IBM_MCA,
     kbd_init,
@@ -2483,6 +2497,7 @@ const device_t keyboard_ps2_mca_device = {
 
 const device_t keyboard_ps2_mca_2_device = {
     "PS/2 Keyboard",
+    "keyboard_ps2_mca_2",
     0,
     KBC_TYPE_PS2_2 | KBC_VEN_IBM_MCA,
     kbd_init,
@@ -2493,6 +2508,7 @@ const device_t keyboard_ps2_mca_2_device = {
 
 const device_t keyboard_ps2_quadtel_device = {
     "PS/2 Keyboard (Quadtel/MegaPC)",
+    "keyboard_ps2_quadtel",
     0,
     KBC_TYPE_PS2_NOREF | KBC_VEN_QUADTEL,
     kbd_init,
@@ -2503,6 +2519,7 @@ const device_t keyboard_ps2_quadtel_device = {
 
 const device_t keyboard_ps2_pci_device = {
     "PS/2 Keyboard",
+    "keyboard_ps2_pci",
     DEVICE_PCI,
     KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
     kbd_init,
@@ -2513,6 +2530,7 @@ const device_t keyboard_ps2_pci_device = {
 
 const device_t keyboard_ps2_ami_pci_device = {
     "PS/2 Keyboard (AMI)",
+    "keyboard_ps2_ami_pci",
     DEVICE_PCI,
     KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
     kbd_init,
@@ -2523,6 +2541,7 @@ const device_t keyboard_ps2_ami_pci_device = {
 
 const device_t keyboard_ps2_intel_ami_pci_device = {
     "PS/2 Keyboard (AMI)",
+    "keyboard_ps2_intel_ami_pci",
     DEVICE_PCI,
     KBC_TYPE_PS2_NOREF | KBC_VEN_INTEL_AMI,
     kbd_init,
@@ -2533,6 +2552,7 @@ const device_t keyboard_ps2_intel_ami_pci_device = {
 
 const device_t keyboard_ps2_acer_pci_device = {
     "PS/2 Keyboard (Acer 90M002A)",
+    "keyboard_ps2_acer_pci",
     DEVICE_PCI,
     KBC_TYPE_PS2_NOREF | KBC_VEN_ACER,
     kbd_init,

src/device/keyboard_xt.c

@@ -874,6 +874,7 @@ kbd_close(void *priv)
 
 const device_t keyboard_pc_device = {
     "IBM PC Keyboard (1981)",
+    "keyboard_pc",
     0,
     KBD_TYPE_PC81,
     kbd_init,
@@ -884,6 +885,7 @@ const device_t keyboard_pc_device = {
 
 const device_t keyboard_pc82_device = {
     "IBM PC Keyboard (1982)",
+    "keyboard_pc82",
     0,
     KBD_TYPE_PC82,
     kbd_init,
@@ -894,6 +896,7 @@ const device_t keyboard_pc82_device = {
 
 const device_t keyboard_xt_device = {
     "XT (1982) Keyboard",
+    "keyboard_xt",
     0,
     KBD_TYPE_XT82,
     kbd_init,
@@ -904,6 +907,7 @@ const device_t keyboard_xt_device = {
 
 const device_t keyboard_xt86_device = {
     "XT (1986) Keyboard",
+    "keyboard_xt86",
     0,
     KBD_TYPE_XT86,
     kbd_init,
@@ -914,6 +918,7 @@ const device_t keyboard_xt86_device = {
 
 const device_t keyboard_xt_compaq_device = {
     "Compaq Portable Keyboard",
+    "keyboard_xt_compaq",
     0,
     KBD_TYPE_COMPAQ,
     kbd_init,
@@ -924,6 +929,7 @@ const device_t keyboard_xt_compaq_device = {
 
 const device_t keyboard_tandy_device = {
     "Tandy 1000 Keyboard",
+    "keyboard_tandy",
     0,
     KBD_TYPE_TANDY,
     kbd_init,
@@ -934,6 +940,7 @@ const device_t keyboard_tandy_device = {
 
 const device_t keyboard_xt_t1x00_device = {
     "Toshiba T1x00 Keyboard",
+    "keyboard_xt_t1x00",
     0,
     KBD_TYPE_TOSHIBA,
     kbd_init,
@@ -945,6 +952,7 @@ const device_t keyboard_xt_t1x00_device = {
 #if defined(DEV_BRANCH) && defined(USE_LASERXT)
 const device_t keyboard_xt_lxt3_device = {
     "VTech Laser XT3 Keyboard",
+    "keyboard_xt_lxt3",
     0,
     KBD_TYPE_VTECH,
     kbd_init,
@@ -956,6 +964,7 @@ const device_t keyboard_xt_lxt3_device = {
 
 const device_t keyboard_xt_olivetti_device = {
     "Olivetti XT Keyboard",
+    "keyboard_xt_olivetti",
     0,
     KBD_TYPE_OLIVETTI,
     kbd_init,
@@ -966,6 +975,7 @@ const device_t keyboard_xt_olivetti_device = {
 
 const device_t keyboard_xt_zenith_device = {
     "Zenith XT Keyboard",
+    "keyboard_xt_zenith",
     0,
     KBD_TYPE_ZENITH,
     kbd_init,

src/device/mouse.c

@@ -31,7 +31,6 @@
 
 
 typedef struct {
-    const char  *internal_name;
     const device_t    *device;
 } mouse_t;
 
@@ -45,13 +44,15 @@ int	mouse_x,
 
 static const device_t mouse_none_device = {
     "None",
+    "none",
     0, MOUSE_TYPE_NONE,
     NULL, NULL, NULL,
     { NULL }, NULL, NULL,
     NULL
 };
 static const device_t mouse_internal_device = {
-    "Internal Mouse",
+    "Internal",
+    "internal",
     0, MOUSE_TYPE_INTERNAL,
     NULL, NULL, NULL,
     { NULL }, NULL, NULL,
@@ -60,18 +61,18 @@ static const device_t mouse_internal_device = {
 
 
 static mouse_t mouse_devices[] = {
-    { "none",		&mouse_none_device	},
+    { &mouse_none_device	},
-    { "internal",	&mouse_internal_device	},
+    { &mouse_internal_device	},
-    { "logibus",	&mouse_logibus_device	},
+    { &mouse_logibus_device	},
-    { "msbus",		&mouse_msinport_device	},
+    { &mouse_msinport_device	},
 #if 0
-    { "genibus",	&mouse_genibus_device	},
+    { &mouse_genibus_device	},
 #endif
-    { "mssystems",	&mouse_mssystems_device	},
+    { &mouse_mssystems_device	},
-    { "msserial",	&mouse_msserial_device	},
+    { &mouse_msserial_device	},
-    { "ltserial",	&mouse_ltserial_device	},
+    { &mouse_ltserial_device	},
-    { "ps2",		&mouse_ps2_device	},
+    { &mouse_ps2_device		},
-    { NULL,		NULL			}
+    { NULL			}
 };
 
 
@@ -206,7 +207,7 @@ mouse_get_name(int mouse)
 char *
 mouse_get_internal_name(int mouse)
 {
-    return((char *)mouse_devices[mouse].internal_name);
+    return device_get_internal_name(mouse_devices[mouse].device);
 }
 
 
@@ -215,8 +216,8 @@ mouse_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (mouse_devices[c].internal_name != NULL) {
+    while (mouse_devices[c].device != NULL) {
-	if (! strcmp((char *)mouse_devices[c].internal_name, s))
+	if (! strcmp((char *)mouse_devices[c].device->internal_name, s))
 		return(c);
 	c++;
     }

src/device/mouse_bus.c

@@ -833,6 +833,7 @@ static const device_config_t ms_config[] = {
 
 const device_t mouse_logibus_device = {
     "Logitech/Microsoft Bus Mouse",
+    "logibus",
     DEVICE_ISA,
     MOUSE_TYPE_LOGIBUS,
     bm_init, bm_close, NULL,
@@ -842,6 +843,7 @@ const device_t mouse_logibus_device = {
 
 const device_t mouse_logibus_onboard_device = {
     "Logitech Bus Mouse (On-Board)",
+    "logibus_onboard",
     DEVICE_ISA,
     MOUSE_TYPE_LOGIBUS | MOUSE_TYPE_ONBOARD,
     bm_init, bm_close, NULL,
@@ -850,6 +852,7 @@ const device_t mouse_logibus_onboard_device = {
 
 const device_t mouse_msinport_device = {
     "Microsoft Bus Mouse (InPort)",
+    "msbus",
     DEVICE_ISA,
     MOUSE_TYPE_INPORT,
     bm_init, bm_close, NULL,

src/device/mouse_ps2.c

@@ -355,6 +355,7 @@ static const device_config_t ps2_config[] = {
 
 const device_t mouse_ps2_device = {
     "Standard PS/2 Mouse",
+    "ps2",
     DEVICE_PS2,
     MOUSE_TYPE_PS2,
     mouse_ps2_init, ps2_close, NULL,

src/device/mouse_serial.c

@@ -900,6 +900,7 @@ static const device_config_t ltsermouse_config[] = {
 
 const device_t mouse_mssystems_device = {
     "Mouse Systems Serial Mouse",
+    "mssystems",
     0,
     MOUSE_TYPE_MSYSTEMS,
     sermouse_init, sermouse_close, NULL,
@@ -909,6 +910,7 @@ const device_t mouse_mssystems_device = {
 
 const device_t mouse_msserial_device = {
     "Microsoft Serial Mouse",
+    "msserial",
     0,
     0,
     sermouse_init, sermouse_close, NULL,
@@ -918,6 +920,7 @@ const device_t mouse_msserial_device = {
 
 const device_t mouse_ltserial_device = {
     "Logitech Serial Mouse",
+    "ltserial",
     0,
     1,
     sermouse_init, sermouse_close, NULL,

src/device/pci_bridge.c

@@ -502,6 +502,7 @@ pci_bridge_init(const device_t *info)
 const device_t dec21150_device =
 {
     "DEC 21150 PCI Bridge",
+    "dec21150",
     DEVICE_PCI,
     PCI_BRIDGE_DEC_21150,
     pci_bridge_init,
@@ -517,6 +518,7 @@ const device_t dec21150_device =
 const device_t ali5243_agp_device =
 {
     "ALi M5243 AGP Bridge",
+    "ali5243_agp",
     DEVICE_PCI,
     AGP_BRIDGE_ALI_M5243,
     pci_bridge_init,
@@ -532,6 +534,7 @@ const device_t ali5243_agp_device =
 const device_t ali5247_agp_device =
 {
     "ALi M5247 AGP Bridge",
+    "ali5247_agp",
     DEVICE_PCI,
     AGP_BRIDGE_ALI_M5247,
     pci_bridge_init,
@@ -546,6 +549,7 @@ const device_t ali5247_agp_device =
 const device_t i440lx_agp_device =
 {
     "Intel 82443LX/EX AGP Bridge",
+    "i440lx_agp",
     DEVICE_PCI,
     AGP_BRIDGE_INTEL_440LX,
     pci_bridge_init,
@@ -560,6 +564,7 @@ const device_t i440lx_agp_device =
 const device_t i440bx_agp_device =
 {
     "Intel 82443BX/ZX AGP Bridge",
+    "i440bx_agp",
     DEVICE_PCI,
     AGP_BRIDGE_INTEL_440BX,
     pci_bridge_init,
@@ -574,6 +579,7 @@ const device_t i440bx_agp_device =
 const device_t i440gx_agp_device =
 {
     "Intel 82443GX AGP Bridge",
+    "i440gx_agp",
     DEVICE_PCI,
     AGP_BRIDGE_INTEL_440GX,
     pci_bridge_init,
@@ -588,6 +594,7 @@ const device_t i440gx_agp_device =
 const device_t via_vp3_agp_device =
 {
     "VIA Apollo VP3 AGP Bridge",
+    "via_vp3_agp",
     DEVICE_PCI,
     AGP_BRIDGE_VIA_597,
     pci_bridge_init,
@@ -602,6 +609,7 @@ const device_t via_vp3_agp_device =
 const device_t via_mvp3_agp_device =
 {
     "VIA Apollo MVP3 AGP Bridge",
+    "via_mvp3_agp",
     DEVICE_PCI,
     AGP_BRIDGE_VIA_598,
     pci_bridge_init,
@@ -616,6 +624,7 @@ const device_t via_mvp3_agp_device =
 const device_t via_apro_agp_device =
 {
     "VIA Apollo Pro AGP Bridge",
+    "via_apro_agp",
     DEVICE_PCI,
     AGP_BRIDGE_VIA_691,
     pci_bridge_init,
@@ -630,6 +639,7 @@ const device_t via_apro_agp_device =
 const device_t via_vt8601_agp_device =
 {
     "VIA Apollo ProMedia AGP Bridge",
+    "via_vt8601_agp",
     DEVICE_PCI,
     AGP_BRIDGE_VIA_8601,
     pci_bridge_init,

src/device/phoenix_486_jumper.c

@@ -126,6 +126,7 @@ phoenix_486_jumper_init(const device_t *info)
 
 const device_t phoenix_486_jumper_device = {
     "Phoenix 486 Jumper Readout",
+    "phoenix_486_jumper",
     0,
     0,
     phoenix_486_jumper_init, phoenix_486_jumper_close, phoenix_486_jumper_reset,
@@ -136,6 +137,7 @@ const device_t phoenix_486_jumper_device = {
 
 const device_t phoenix_486_jumper_pci_device = {
     "Phoenix 486 Jumper Readout (PCI machines)",
+    "phoenix_486_jumper_pci",
     0,
     1,
     phoenix_486_jumper_init, phoenix_486_jumper_close, phoenix_486_jumper_reset,

src/device/postcard.c

@@ -142,6 +142,7 @@ postcard_close(UNUSED(void *priv))
 
 const device_t postcard_device = {
     "POST Card",
+    "postcard",
     DEVICE_ISA,
     0,
     postcard_init, postcard_close, NULL,

src/device/serial.c

@@ -724,6 +724,7 @@ serial_standalone_init(void) {
 
 const device_t ns8250_device = {
     "National Semiconductor 8250(-compatible) UART",
+    "ns8250",
     0,
     SERIAL_8250,
     serial_init, serial_close, NULL,
@@ -733,6 +734,7 @@ const device_t ns8250_device = {
 
 const device_t ns8250_pcjr_device = {
     "National Semiconductor 8250(-compatible) UART for PCjr",
+    "ns8250_pcjr",
     DEVICE_PCJR,
     SERIAL_8250_PCJR,
     serial_init, serial_close, NULL,
@@ -742,6 +744,7 @@ const device_t ns8250_pcjr_device = {
 
 const device_t ns16450_device = {
     "National Semiconductor NS16450(-compatible) UART",
+    "ns16450",
     0,
     SERIAL_16450,
     serial_init, serial_close, NULL,
@@ -751,6 +754,7 @@ const device_t ns16450_device = {
 
 const device_t ns16550_device = {
     "National Semiconductor NS16550(-compatible) UART",
+    "ns16550",
     0,
     SERIAL_16550,
     serial_init, serial_close, NULL,
@@ -760,6 +764,7 @@ const device_t ns16550_device = {
 
 const device_t ns16650_device = {
     "Startech Semiconductor 16650(-compatible) UART",
+    "ns16650",
     0,
     SERIAL_16650,
     serial_init, serial_close, NULL,
@@ -769,6 +774,7 @@ const device_t ns16650_device = {
 
 const device_t ns16750_device = {
     "Texas Instruments 16750(-compatible) UART",
+    "ns16750",
     0,
     SERIAL_16750,
     serial_init, serial_close, NULL,
@@ -778,6 +784,7 @@ const device_t ns16750_device = {
 
 const device_t ns16850_device = {
     "Exar Corporation NS16850(-compatible) UART",
+    "ns16850",
     0,
     SERIAL_16850,
     serial_init, serial_close, NULL,
@@ -787,6 +794,7 @@ const device_t ns16850_device = {
 
 const device_t ns16950_device = {
     "Oxford Semiconductor NS16950(-compatible) UART",
+    "ns16950",
     0,
     SERIAL_16950,
     serial_init, serial_close, NULL,

src/device/smbus_ali7101.c

@@ -302,6 +302,7 @@ smbus_ali7101_close(void *priv)
 
 const device_t ali7101_smbus_device = {
     "ALi M7101-compatible SMBus Host Controller",
+    "ali7101_smbus",
     DEVICE_AT,
     0,
     smbus_ali7101_init, smbus_ali7101_close, smbus_ali7101_reset,

src/device/smbus_piix4.c

@@ -387,6 +387,7 @@ smbus_piix4_close(void *priv)
 
 const device_t piix4_smbus_device = {
     "PIIX4-compatible SMBus Host Controller",
+    "piix4_smbus",
     DEVICE_AT,
     SMBUS_PIIX4,
     smbus_piix4_init, smbus_piix4_close, NULL,
@@ -396,6 +397,7 @@ const device_t piix4_smbus_device = {
 
 const device_t via_smbus_device = {
     "VIA VT82C686B SMBus Host Controller",
+    "via_smbus",
     DEVICE_AT,
     SMBUS_VIA,
     smbus_piix4_init, smbus_piix4_close, NULL,

src/disk/hdc.c

@@ -66,13 +66,6 @@ null_close(void *priv)
 }
 
 
-static const device_t null_device = {
-    "Null HDC", 0, 0,
-    null_init, null_close, NULL,
-    { NULL }, NULL, NULL, NULL
-};
-
-
 static void *
 inthdc_init(const device_t *info)
 {
@@ -86,41 +79,45 @@ inthdc_close(void *priv)
 }
 
 
-static const device_t inthdc_device = {
+static const device_t hdc_none_device = {
-    "Internal controller", 0, 0,
+    "None", "none", 0, 0,
+    null_init, null_close, NULL,
+    { NULL }, NULL, NULL, NULL
+};
+static const device_t hdc_internal_device = {
+    "Internal", "internal", 0, 0,
     inthdc_init, inthdc_close, NULL,
     { NULL }, NULL, NULL, NULL
 };
 
 
 static const struct {
-    const char		*internal_name;
     const device_t	*device;
 } controllers[] = {
-    { "none",			&null_device			},
+    { &hdc_none_device			},
-    { "internal",		&inthdc_device			},
+    { &hdc_internal_device		},
-    { "st506_xt",		&st506_xt_xebec_device		},
+    { &st506_xt_xebec_device		},
-    { "st506_xt_dtc5150x",	&st506_xt_dtc5150x_device	},
+    { &st506_xt_dtc5150x_device		},
-    { "st506_xt_st11_m",	&st506_xt_st11_m_device		},
+    { &st506_xt_st11_m_device		},
-    { "st506_xt_wd1002a_wx1",	&st506_xt_wd1002a_wx1_device	},
+    { &st506_xt_wd1002a_wx1_device	},
-    { "st506_at",		&st506_at_wd1003_device		},
+    { &st506_at_wd1003_device		},
-    { "st506_xt_st11_r",	&st506_xt_st11_r_device		},
+    { &st506_xt_st11_r_device		},
-    { "st506_xt_wd1002a_27x",	&st506_xt_wd1002a_27x_device	},
+    { &st506_xt_wd1002a_27x_device	},
-    { "esdi_at",		&esdi_at_wd1007vse1_device	},
+    { &esdi_at_wd1007vse1_device	},
-    { "ide_isa",		&ide_isa_device			},
+    { &ide_isa_device			},
-    { "ide_isa_2ch",		&ide_isa_2ch_device		},
+    { &ide_isa_2ch_device		},
-    { "xtide_at",		&xtide_at_device		},
+    { &xtide_at_device			},
-    { "xtide_at_386",		&xtide_at_386_device		},
+    { &xtide_at_386_device		},
-    { "xtide_at_ps2",		&xtide_at_ps2_device		},
+    { &xtide_at_ps2_device		},
-    { "xta_wdxt150",		&xta_wdxt150_device		},
+    { &xta_wdxt150_device		},
-    { "xtide_acculogic",	&xtide_acculogic_device		},
+    { &xtide_acculogic_device		},
-    { "xtide",			&xtide_device			},
+    { &xtide_device			},
-    { "esdi_mca",		&esdi_ps2_device		},
+    { &esdi_ps2_device			},
-    { "ide_pci",		&ide_pci_device			},
+    { &ide_pci_device			},
-    { "ide_pci_2ch",		&ide_pci_2ch_device		},
+    { &ide_pci_2ch_device		},
-    { "ide_vlb",		&ide_vlb_device			},
+    { &ide_vlb_device			},
-    { "ide_vlb_2ch",		&ide_vlb_2ch_device		},
+    { &ide_vlb_2ch_device		},
-    { "",			NULL				}
+    { NULL				}
 };
 
 
@@ -157,7 +154,7 @@ hdc_reset(void)
 char *
 hdc_get_internal_name(int hdc)
 {
-    return((char *) controllers[hdc].internal_name);
+    return device_get_internal_name(controllers[hdc].device);
 }
 
 
@@ -166,9 +163,8 @@ hdc_get_from_internal_name(char *s)
 {
     int c = 0;
 
-	while (strlen((char *) controllers[c].internal_name))
+    while (controllers[c].device != NULL) {
-	{
+	if (!strcmp((char *) controllers[c].device->internal_name, s))
-		if (!strcmp((char *) controllers[c].internal_name, s))
 		return c;
 	c++;
     }

src/disk/hdc_esdi_at.c

@@ -846,6 +846,7 @@ wd1007vse1_available(void)
 
 const device_t esdi_at_wd1007vse1_device = {
     "Western Digital WD1007V-SE1 (ESDI)",
+    "esdi_at",
     DEVICE_ISA | DEVICE_AT,
     0,
     wd1007vse1_init, wd1007vse1_close, NULL,

src/disk/hdc_esdi_mca.c

@@ -1181,6 +1181,7 @@ esdi_available(void)
 
 const device_t esdi_ps2_device = {
     "IBM PS/2 ESDI Fixed Disk Adapter (MCA)",
+    "esdi_mca",
     DEVICE_MCA, 0,
     esdi_init, esdi_close, NULL,
     { esdi_available }, NULL, NULL, NULL

src/disk/hdc_ide.c

@@ -3035,6 +3035,7 @@ ide_close(void *priv)
 
 const device_t ide_isa_device = {
     "ISA PC/AT IDE Controller",
+    "ide_isa",
     DEVICE_ISA | DEVICE_AT,
     0,
     ide_init, ide_close, ide_reset,
@@ -3043,6 +3044,7 @@ const device_t ide_isa_device = {
 
 const device_t ide_isa_2ch_device = {
     "ISA PC/AT IDE Controller (Dual-Channel)",
+    "ide_isa_2ch",
     DEVICE_ISA | DEVICE_AT,
     1,
     ide_init, ide_close, ide_reset,
@@ -3051,6 +3053,7 @@ const device_t ide_isa_2ch_device = {
 
 const device_t ide_vlb_device = {
     "VLB IDE Controller",
+    "ide_vlb",
     DEVICE_VLB | DEVICE_AT,
     2,
     ide_init, ide_close, ide_reset,
@@ -3059,6 +3062,7 @@ const device_t ide_vlb_device = {
 
 const device_t ide_vlb_2ch_device = {
     "VLB IDE Controller (Dual-Channel)",
+    "ide_vlb_2ch",
     DEVICE_VLB | DEVICE_AT,
     3,
     ide_init, ide_close, ide_reset,
@@ -3067,6 +3071,7 @@ const device_t ide_vlb_2ch_device = {
 
 const device_t ide_pci_device = {
     "PCI IDE Controller",
+    "ide_pci",
     DEVICE_PCI | DEVICE_AT,
     4,
     ide_init, ide_close, ide_reset,
@@ -3075,6 +3080,7 @@ const device_t ide_pci_device = {
 
 const device_t ide_pci_2ch_device = {
     "PCI IDE Controller (Dual-Channel)",
+    "ide_pci_2ch",
     DEVICE_PCI | DEVICE_AT,
     5,
     ide_init, ide_close, ide_reset,
@@ -3173,6 +3179,7 @@ static const device_config_t ide_qua_config[] =
 
 const device_t ide_ter_device = {
     "Tertiary IDE Controller",
+    "ide_ter",
     DEVICE_AT,
     0,
     ide_ter_init, ide_ter_close, NULL,
@@ -3182,6 +3189,7 @@ const device_t ide_ter_device = {
 
 const device_t ide_ter_pnp_device = {
     "Tertiary IDE Controller (Plug and Play only)",
+    "ide_ter_pnp",
     DEVICE_AT,
     1,
     ide_ter_init, ide_ter_close, NULL,
@@ -3191,6 +3199,7 @@ const device_t ide_ter_pnp_device = {
 
 const device_t ide_qua_device = {
     "Quaternary IDE Controller",
+    "ide_qua",
     DEVICE_AT,
     0,
     ide_qua_init, ide_qua_close, NULL,
@@ -3200,6 +3209,7 @@ const device_t ide_qua_device = {
 
 const device_t ide_qua_pnp_device = {
     "Quaternary IDE Controller (Plug and Play only)",
+    "ide_qua_pnp",
     DEVICE_AT,
     1,
     ide_qua_init, ide_qua_close, NULL,

src/disk/hdc_ide_cmd640.c

@@ -494,6 +494,7 @@ cmd640_init(const device_t *info)
 
 const device_t ide_cmd640_vlb_device = {
     "CMD PCI-0640B VLB",
+    "ide_cmd640_vlb",
     DEVICE_VLB,
     0x0078,
     cmd640_init, cmd640_close, cmd640_reset,
@@ -503,6 +504,7 @@ const device_t ide_cmd640_vlb_device = {
 
 const device_t ide_cmd640_vlb_178_device = {
     "CMD PCI-0640B VLB (Port 178h)",
+    "ide_cmd640_vlb_178",
     DEVICE_VLB,
     0x0178,
     cmd640_init, cmd640_close, cmd640_reset,
@@ -512,6 +514,7 @@ const device_t ide_cmd640_vlb_178_device = {
 
 const device_t ide_cmd640_pci_device = {
     "CMD PCI-0640B PCI",
+    "ide_cmd640_pci",
     DEVICE_PCI,
     0x0a,
     cmd640_init, cmd640_close, cmd640_reset,
@@ -521,6 +524,7 @@ const device_t ide_cmd640_pci_device = {
 
 const device_t ide_cmd640_pci_legacy_only_device = {
     "CMD PCI-0640B PCI (Legacy Mode Only)",
+    "ide_cmd640_pci_legacy_only",
     DEVICE_PCI,
     0x00,
     cmd640_init, cmd640_close, cmd640_reset,
@@ -530,6 +534,7 @@ const device_t ide_cmd640_pci_legacy_only_device = {
 
 const device_t ide_cmd640_pci_single_channel_device = {
     "CMD PCI-0640B PCI",
+    "ide_cmd640_pci_single_channel",
     DEVICE_PCI,
     0x2000a,
     cmd640_init, cmd640_close, cmd640_reset,

src/disk/hdc_ide_cmd646.c

@@ -409,6 +409,7 @@ cmd646_init(const device_t *info)
 
 const device_t ide_cmd646_device = {
     "CMD PCI-0646",
+    "ide_cmd646",
     DEVICE_PCI,
     0x8a,
     cmd646_init, cmd646_close, cmd646_reset,
@@ -418,6 +419,7 @@ const device_t ide_cmd646_device = {
 
 const device_t ide_cmd646_legacy_only_device = {
     "CMD PCI-0646 (Legacy Mode Only)",
+    "ide_cmd646_legacy_only",
     DEVICE_PCI,
     0x80,
     cmd646_init, cmd646_close, cmd646_reset,
@@ -427,6 +429,7 @@ const device_t ide_cmd646_legacy_only_device = {
 
 const device_t ide_cmd646_single_channel_device = {
     "CMD PCI-0646",
+    "ide_cmd646_single_channel",
     DEVICE_PCI,
     0x2008a,
     cmd646_init, cmd646_close, cmd646_reset,

src/disk/hdc_ide_opti611.c

@@ -314,6 +314,7 @@ opti611_init(const device_t *info)
 
 const device_t ide_opti611_vlb_device = {
     "OPTi 82C611/82C611A VLB",
+    "ide_opti611_vlb",
     0,
     0,
     opti611_init, opti611_close, NULL,

src/disk/hdc_ide_sff8038i.c

@@ -588,6 +588,7 @@ static void
 const device_t sff8038i_device =
 {
     "SFF-8038i IDE Bus Master",
+    "sff8038i",
     DEVICE_PCI,
     0,
     sff_init, 

src/disk/hdc_st506_at.c

@@ -770,6 +770,7 @@ mfm_close(void *priv)
 
 const device_t st506_at_wd1003_device = {
     "WD1003 AT MFM/RLL Controller",
+    "st506_at",
     DEVICE_ISA | DEVICE_AT,
     0,
     mfm_init, mfm_close, NULL,

src/disk/hdc_st506_xt.c

@@ -1834,6 +1834,7 @@ static const device_config_t wd_rll_config[] = {
 
 const device_t st506_xt_xebec_device = {
     "IBM PC Fixed Disk Adapter (MFM)",
+    "st506_xt",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 0,
     st506_init, st506_close, NULL,
@@ -1844,6 +1845,7 @@ const device_t st506_xt_xebec_device = {
 
 const device_t st506_xt_dtc5150x_device = {
     "DTC 5150X MFM Fixed Disk Adapter",
+    "st506_xt_dtc5150x",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 1,
     st506_init, st506_close, NULL,
@@ -1854,6 +1856,7 @@ const device_t st506_xt_dtc5150x_device = {
 
 const device_t st506_xt_st11_m_device = {
     "ST-11M MFM Fixed Disk Adapter",
+    "st506_xt_st11_m",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 11,
     st506_init, st506_close, NULL,
@@ -1864,6 +1867,7 @@ const device_t st506_xt_st11_m_device = {
 
 const device_t st506_xt_st11_r_device = {
     "ST-11R RLL Fixed Disk Adapter",
+    "st506_xt_st11_r",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 12,
     st506_init, st506_close, NULL,
@@ -1874,6 +1878,7 @@ const device_t st506_xt_st11_r_device = {
 
 const device_t st506_xt_wd1002a_wx1_device = {
     "WD1002A-WX1 MFM Fixed Disk Adapter",
+    "st506_xt_wd1002a_wx1",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 21,
     st506_init, st506_close, NULL,
@@ -1884,6 +1889,7 @@ const device_t st506_xt_wd1002a_wx1_device = {
 
 const device_t st506_xt_wd1002a_27x_device = {
     "WD1002A-27X RLL Fixed Disk Adapter",
+    "st506_xt_wd1002a_27x",
     DEVICE_ISA,
     (HDD_BUS_MFM << 8) | 22,
     st506_init, st506_close, NULL,

src/disk/hdc_xta.c

@@ -1154,6 +1154,7 @@ static const device_config_t wdxt150_config[] = {
 
 const device_t xta_wdxt150_device = {
     "WDXT-150 XTA Fixed Disk Controller",
+    "xta_wdxt150",
     DEVICE_ISA,
     0,
     xta_init, xta_close, NULL,
@@ -1164,6 +1165,7 @@ const device_t xta_wdxt150_device = {
 
 const device_t xta_hd20_device = {
     "EuroPC HD20 Fixed Disk Controller",
+    "xta_hd20",
     DEVICE_ISA,
     1,
     xta_init, xta_close, NULL,

src/disk/hdc_xtide.c

@@ -262,6 +262,7 @@ xtide_at_close(void *priv)
 
 const device_t xtide_device = {
     "PC/XT XTIDE",
+    "xtide",
     DEVICE_ISA,
     0,
     xtide_init, xtide_close, NULL,
@@ -271,6 +272,7 @@ const device_t xtide_device = {
 
 const device_t xtide_at_device = {
     "PC/AT XTIDE",
+    "xtide_at",
     DEVICE_ISA | DEVICE_AT,
     0,
     xtide_at_init, xtide_at_close, NULL,
@@ -280,6 +282,7 @@ const device_t xtide_at_device = {
 
 const device_t xtide_at_386_device = {
     "PC/AT XTIDE (386)",
+    "xtide_at_386",
     DEVICE_ISA | DEVICE_AT,
     1,
     xtide_at_init, xtide_at_close, NULL,
@@ -289,6 +292,7 @@ const device_t xtide_at_386_device = {
 
 const device_t xtide_acculogic_device = {
     "Acculogic XT IDE",
+    "xtide_acculogic",
     DEVICE_ISA,
     0,
     xtide_acculogic_init, xtide_close, NULL,
@@ -298,6 +302,7 @@ const device_t xtide_acculogic_device = {
 
 const device_t xtide_at_ps2_device = {
     "PS/2 AT XTIDE (1.1.5)",
+    "xtide_at_ps2",
     DEVICE_ISA | DEVICE_AT,
     0,
     xtide_at_ps2_init, xtide_at_close, NULL,

src/floppy/fdc.c

@@ -101,18 +101,27 @@ fdc_log(const char *fmt, ...)
 #endif
 
 
+const device_t fdc_internal_device = {
+  "Internal",
+  "internal",
+  0, 0,
+  NULL, NULL, NULL,
+  { NULL }, NULL, NULL,
+  NULL
+};
+
+
 typedef const struct {
-    const char  *internal_name;
     const device_t    *device;
 } fdc_cards_t;
 
 /* All emulated machines have at least one integrated FDC controller */
 static fdc_cards_t fdc_cards[] = {
-    { "internal",	NULL			},
+    { &fdc_internal_device	},
-    { "b215",	&fdc_b215_device	},
+    { &fdc_b215_device  	},
-    { "dtk_pii151b",	&fdc_pii151b_device	},
+    { &fdc_pii151b_device 	},
-    { "dtk_pii158b",	&fdc_pii158b_device	},
+    { &fdc_pii158b_device 	},
-    { "",		NULL			},
+    { NULL			}
 };
 
 
@@ -145,7 +154,7 @@ fdc_card_has_config(int card)
 char *
 fdc_card_get_internal_name(int card)
 {
-    return((char *) fdc_cards[card].internal_name);
+    return device_get_internal_name(fdc_cards[card].device);
 }
 
 
@@ -154,8 +163,8 @@ fdc_card_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (strlen((char *) fdc_cards[c].internal_name)) {
+    while (fdc_cards[c].device != NULL) {
-	if (!strcmp((char *) fdc_cards[c].internal_name, s))
+	if (!strcmp((char *) fdc_cards[c].device->internal_name, s))
 		return(c);
 	c++;
     }
@@ -2373,8 +2382,11 @@ fdc_3f1_enable(fdc_t *fdc, int enable)
 }
 
 
+
+
 const device_t fdc_xt_device = {
     "PC/XT Floppy Drive Controller",
+    "fdc_xt",
     0,
     0,
     fdc_init,
@@ -2385,6 +2397,7 @@ const device_t fdc_xt_device = {
 
 const device_t fdc_xt_t1x00_device = {
     "PC/XT Floppy Drive Controller (Toshiba)",
+    "fdc_xt_t1x00",
     0,
     FDC_FLAG_TOSHIBA,
     fdc_init,
@@ -2395,6 +2408,7 @@ const device_t fdc_xt_t1x00_device = {
 
 const device_t fdc_xt_amstrad_device = {
     "PC/XT Floppy Drive Controller (Amstrad)",
+    "fdc_xt_amstrad",
     0,
     FDC_FLAG_DISKCHG_ACTLOW | FDC_FLAG_AMSTRAD,
     fdc_init,
@@ -2405,6 +2419,7 @@ const device_t fdc_xt_amstrad_device = {
 
 const device_t fdc_xt_tandy_device = {
     "PC/XT Floppy Drive Controller (Tandy)",
+    "fdc_xt_tandy",
     0,
     FDC_FLAG_AMSTRAD,
     fdc_init,
@@ -2416,6 +2431,7 @@ const device_t fdc_xt_tandy_device = {
 
 const device_t fdc_pcjr_device = {
     "PCjr Floppy Drive Controller",
+    "fdc_pcjr",
     0,
     FDC_FLAG_PCJR,
     fdc_init,
@@ -2426,6 +2442,7 @@ const device_t fdc_pcjr_device = {
 
 const device_t fdc_at_device = {
     "PC/AT Floppy Drive Controller",
+    "fdc_at",
     0,
     FDC_FLAG_AT,
     fdc_init,
@@ -2436,6 +2453,7 @@ const device_t fdc_at_device = {
 
 const device_t fdc_at_actlow_device = {
     "PC/AT Floppy Drive Controller (Active low)",
+    "fdc_at_actlow",
     0,
     FDC_FLAG_DISKCHG_ACTLOW | FDC_FLAG_AT,
     fdc_init,
@@ -2446,6 +2464,7 @@ const device_t fdc_at_actlow_device = {
 
 const device_t fdc_at_ps1_device = {
     "PC/AT Floppy Drive Controller (PS/1, PS/2 ISA)",
+    "fdc_at_ps1",
     0,
     FDC_FLAG_DISKCHG_ACTLOW | FDC_FLAG_AT | FDC_FLAG_PS1,
     fdc_init,
@@ -2456,6 +2475,7 @@ const device_t fdc_at_ps1_device = {
 
 const device_t fdc_at_smc_device = {
     "PC/AT Floppy Drive Controller (SM(s)C FDC37Cxxx)",
+    "fdc_at_smc",
     0,
     FDC_FLAG_AT | FDC_FLAG_SUPERIO,
     fdc_init,
@@ -2466,6 +2486,7 @@ const device_t fdc_at_smc_device = {
 
 const device_t fdc_at_winbond_device = {
     "PC/AT Floppy Drive Controller (Winbond W83x77F)",
+    "fdc_at_winbond",
     0,
     FDC_FLAG_AT | FDC_FLAG_SUPERIO | FDC_FLAG_START_RWC_1 | FDC_FLAG_MORE_TRACKS,
     fdc_init,
@@ -2476,6 +2497,7 @@ const device_t fdc_at_winbond_device = {
 
 const device_t fdc_at_nsc_device = {
     "PC/AT Floppy Drive Controller (NSC PC8730x)",
+    "fdc_at_nsc",
     0,
     FDC_FLAG_AT | FDC_FLAG_MORE_TRACKS | FDC_FLAG_NSC,
     fdc_init,
@@ -2486,6 +2508,7 @@ const device_t fdc_at_nsc_device = {
 
 const device_t fdc_dp8473_device = {
     "NS DP8473 Floppy Drive Controller",
+    "fdc_dp8473",
     0,
     FDC_FLAG_AT | FDC_FLAG_NSC,
     fdc_init,
@@ -2496,6 +2519,7 @@ const device_t fdc_dp8473_device = {
 
 const device_t fdc_um8398_device = {
     "UMC UM8398 Floppy Drive Controller",
+    "fdc_um8398",
     0,
     FDC_FLAG_UMC,
     fdc_init,

src/floppy/fdc_magitronic.c

@@ -133,6 +133,7 @@ static const device_config_t b215_config[] = {
 
 const device_t fdc_b215_device = {
     "Magitronic B215",
+    "b215",
     DEVICE_ISA,
     0,
     b215_init,

src/floppy/fdc_pii15xb.c

@@ -149,6 +149,7 @@ static const device_config_t pii_config[] = {
 
 const device_t fdc_pii151b_device = {
     "DTK PII-151B (MiniMicro) Floppy Drive Controller",
+    "dtk_pii151b",
     DEVICE_ISA,
     151,
     pii_init,
@@ -161,6 +162,7 @@ const device_t fdc_pii151b_device = {
 
 const device_t fdc_pii158b_device = {
     "DTK PII-158B (MiniMicro4) Floppy Drive Controller",
+    "dtk_pii158b",
     DEVICE_ISA,
     158,
     pii_init,

src/game/gameport.c

@@ -64,6 +64,7 @@ int		joystick_type = 0;
 
 static const joystick_if_t joystick_none = {
     "None",
+    "none",
     NULL,
     NULL,
     NULL,
@@ -77,21 +78,20 @@ static const joystick_if_t joystick_none = {
 
 
 static const struct {
-    const char		*internal_name;
     const joystick_if_t	*joystick;
 } joysticks[] = {
-    { "none",				&joystick_none			},
+    { &joystick_none			},
-    { "2axis_2button",		&joystick_2axis_2button	},
+    { &joystick_2axis_2button		},
-    { "2axis_4button",		&joystick_2axis_4button	},
+    { &joystick_2axis_4button		},
-    { "2axis_6button",		&joystick_2axis_6button	},
+    { &joystick_2axis_6button		},
-    { "2axis_8button",		&joystick_2axis_8button	},
+    { &joystick_2axis_8button		},
-    { "3axis_2button",		&joystick_3axis_2button	},
+    { &joystick_3axis_2button		},
-    { "3axis_4button",		&joystick_3axis_4button	},
+    { &joystick_3axis_4button		},
-    { "4axis_4button",		&joystick_4axis_4button	},
+    { &joystick_4axis_4button		},
-    { "ch_flighstick_pro",	&joystick_ch_flightstick_pro	},
+    { &joystick_ch_flightstick_pro	},
-    { "sidewinder_pad",		&joystick_sw_pad		},
+    { &joystick_sw_pad			},
-    { "thrustmaster_fcs",	&joystick_tm_fcs		},
+    { &joystick_tm_fcs			},
-    { "",					NULL					}
+    { NULL				}
 };
 static joystick_instance_t *joystick_instance = NULL;
 
@@ -140,7 +140,10 @@ joystick_get_name(int js)
 char *
 joystick_get_internal_name(int js)
 {
-    return (char *) joysticks[js].internal_name;
+    if (joysticks[js].joystick == NULL)
+	return "";
+
+    return (char *) joysticks[js].joystick->internal_name;
 }
 
 
@@ -149,8 +152,8 @@ joystick_get_from_internal_name(char *s)
 {
     int c = 0;
 
-    while (strlen((char *) joysticks[c].internal_name)) {
+    while (joysticks[c].joystick != NULL) {
-	if (!strcmp((char *) joysticks[c].internal_name, s))
+	if (!strcmp((char *) joysticks[c].joystick->internal_name, s))
 		return c;
 	c++;
     }
@@ -438,6 +441,7 @@ gameport_close(void *priv)
 
 const device_t gameport_device = {
     "Game port",
+    "gameport",
     0, 0x080200,
     gameport_init,
     gameport_close,
@@ -447,6 +451,7 @@ const device_t gameport_device = {
 
 const device_t gameport_201_device = {
     "Game port (Port 201h only)",
+    "gameport_201",
     0, 0x010201,
     gameport_init,
     gameport_close,
@@ -456,6 +461,7 @@ const device_t gameport_201_device = {
 
 const device_t gameport_208_device = {
     "Game port (Port 208h-20fh)",
+    "gameport_208",
     0, 0x080208,
     gameport_init,
     gameport_close,
@@ -465,6 +471,7 @@ const device_t gameport_208_device = {
 
 const device_t gameport_209_device = {
     "Game port (Port 209h only)",
+    "gameport_209",
     0, 0x010209,
     gameport_init,
     gameport_close,
@@ -474,6 +481,7 @@ const device_t gameport_209_device = {
 
 const device_t gameport_pnp_device = {
     "Game port (Plug and Play only)",
+    "gameport_pnp",
     0, 0x080000,
     gameport_init,
     gameport_close,
@@ -483,6 +491,7 @@ const device_t gameport_pnp_device = {
 
 const device_t gameport_pnp_6io_device = {
     "Game port (Plug and Play only, 6 I/O ports)",
+    "gameport_pnp_6io",
     0, 0x060000,
     gameport_init,
     gameport_close,
@@ -492,6 +501,7 @@ const device_t gameport_pnp_6io_device = {
 
 const device_t gameport_sio_device = {
     "Game port (Super I/O)",
+    "gameport_sio",
     0, 0x1080000,
     gameport_init,
     gameport_close,

src/game/joystick_ch_flightstick_pro.c

@@ -116,6 +116,7 @@ static void ch_flightstick_pro_a0_over(void *p)
 const joystick_if_t joystick_ch_flightstick_pro =
 {
         "CH Flightstick Pro",
+        "ch_flighstick_pro",
         ch_flightstick_pro_init,
         ch_flightstick_pro_close,
         ch_flightstick_pro_read,

src/game/joystick_standard.c

@@ -239,6 +239,7 @@ static void joystick_standard_a0_over(void *p)
 const joystick_if_t joystick_2axis_2button =
 {
         "2-axis, 2-button joystick(s)",
+	"2axis_2button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read,
@@ -255,6 +256,7 @@ const joystick_if_t joystick_2axis_2button =
 const joystick_if_t joystick_2axis_4button =
 {
         "2-axis, 4-button joystick",
+	"2axis_4button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read_4button,
@@ -271,6 +273,7 @@ const joystick_if_t joystick_2axis_4button =
 const joystick_if_t joystick_3axis_2button =
 {
         "3-axis, 2-button joystick",
+	"3axis_2button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read,
@@ -287,6 +290,7 @@ const joystick_if_t joystick_3axis_2button =
 const joystick_if_t joystick_3axis_4button =
 {
         "3-axis, 4-button joystick",
+	"3axis_4button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read_4button,
@@ -303,6 +307,7 @@ const joystick_if_t joystick_3axis_4button =
 const joystick_if_t joystick_4axis_4button =
 {
         "4-axis, 4-button joystick",
+	"4axis_4button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read_4button,
@@ -319,6 +324,7 @@ const joystick_if_t joystick_4axis_4button =
 const joystick_if_t joystick_2axis_6button =
 {
         "2-axis, 6-button joystick",
+	"2axis_6button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read_4button,
@@ -335,6 +341,7 @@ const joystick_if_t joystick_2axis_6button =
 const joystick_if_t joystick_2axis_8button =
 {
         "2-axis, 8-button joystick",
+	"2axis_8button",
         joystick_standard_init,
         joystick_standard_close,
         joystick_standard_read_4button,

src/game/joystick_sw_pad.c

@@ -265,6 +265,7 @@ static void sw_a0_over(void *p)
 const joystick_if_t joystick_sw_pad =
 {
         "Microsoft SideWinder Pad",
+        "sidewinder_pad",
         sw_init,
         sw_close,
         sw_read,

src/game/joystick_tm_fcs.c

@@ -115,6 +115,7 @@ static void tm_fcs_a0_over(void *p)
 const joystick_if_t joystick_tm_fcs =
 {
         "Thrustmaster Flight Control System",
+        "thrustmaster_fcs",
         tm_fcs_init,
         tm_fcs_close,
         tm_fcs_read,

src/include/86box/device.h

@@ -95,6 +95,7 @@ typedef struct {
 
 typedef struct _device_ {
     const char	*name;
+    const char *internal_name;
     uint32_t	flags;		/* system flags */
     uint32_t	local;		/* flags local to device */
 
@@ -159,6 +160,8 @@ extern void		device_set_config_hex20(const char *s, int val);
 extern void		device_set_config_mac(const char *s, int val);
 extern const char	*device_get_config_string(const char *name);
 
+extern char *		device_get_internal_name(const device_t *d);
+
 extern int	machine_get_config_int(char *s);
 extern char	*machine_get_config_string(char *s);
 

src/include/86box/gameport.h

@@ -83,6 +83,7 @@ typedef struct {
 
 typedef struct {
     const char *name;
+    const char *internal_name;
 
     void	*(*init)(void);
     void	(*close)(void *p);

src/include/86box/network.h

@@ -78,7 +78,6 @@ typedef struct netpkt {
 } netpkt_t;
 
 typedef struct {
-    const char		*internal_name;
     const device_t	*device;
     void		*priv;
     int			(*poll)(void *);

src/ioapic.c

@@ -122,6 +122,7 @@ ioapic_init(const device_t *info)
 
 const device_t ioapic_device = {
     "I/O Advanced Programmable Interrupt Controller",
+    "ioapic",
     DEVICE_AT,
     0,
     ioapic_init, ioapic_close, NULL,

src/machine/m_amstrad.c

@@ -743,6 +743,7 @@ device_config_t vid_1512_config[] =
 
 static const device_t vid_1512_device = {
     "Amstrad PC1512 (video)",
+    "vid_1512",
     0, 0,
     NULL, vid_close_1512, NULL,
     { NULL },
@@ -939,6 +940,7 @@ device_config_t vid_1640_config[] =
 
 static const device_t vid_1640_device = {
     "Amstrad PC1640 (video)",
+    "vid_1640",
     0, 0,
     NULL, vid_close_1640, NULL,
     { NULL },
@@ -1848,6 +1850,7 @@ device_config_t vid_200_config[] =
 
 static const device_t vid_200_device = {
     "Amstrad PC200 (video)",
+    "vid_200",
     0, 0,
     NULL, vid_close_200, NULL,
     { NULL },
@@ -1975,6 +1978,7 @@ device_config_t vid_ppc512_config[] =
 
 static const device_t vid_ppc512_device = {
     "Amstrad PPC512 (video)",
+    "vid_ppc512",
     0, 0,
     NULL, vid_close_200, NULL,
     { NULL },
@@ -2014,6 +2018,7 @@ device_config_t vid_pc2086_config[] =
 
 static const device_t vid_pc2086_device = {
     "Amstrad PC2086",
+    "vid_pc2086",
     0, 0,
     NULL, NULL, NULL,
     { NULL },
@@ -2053,6 +2058,7 @@ device_config_t vid_pc3086_config[] =
 
 static const device_t vid_pc3086_device = {
     "Amstrad PC3086",
+    "vid_pc3086",
     0, 0,
     NULL, NULL, NULL,
     { NULL },