refactored device_t and all declarations

src/scsi/scsi_aha154x.c

@@ -1501,6 +1501,7 @@ static const device_config_t aha_154xcf_config[] = {
 
 const device_t aha154xa_device = {
     "Adaptec AHA-154xA",
+    "aha154xa",
     DEVICE_ISA | DEVICE_AT,
     AHA_154xA,
     aha_init, x54x_close, NULL,
@@ -1510,6 +1511,7 @@ const device_t aha154xa_device = {
 
 const device_t aha154xb_device = {
     "Adaptec AHA-154xB",
+    "aha154xb",
     DEVICE_ISA | DEVICE_AT,
     AHA_154xB,
     aha_init, x54x_close, NULL,
@@ -1519,6 +1521,7 @@ const device_t aha154xb_device = {
 
 const device_t aha154xc_device = {
     "Adaptec AHA-154xC",
+    "aha154xc",
     DEVICE_ISA | DEVICE_AT,
     AHA_154xC,
     aha_init, x54x_close, NULL,
@@ -1528,6 +1531,7 @@ const device_t aha154xc_device = {
 
 const device_t aha154xcf_device = {
     "Adaptec AHA-154xCF",
+    "aha154xcf",
     DEVICE_ISA | DEVICE_AT,
     AHA_154xCF,
     aha_init, x54x_close, NULL,
@@ -1537,6 +1541,7 @@ const device_t aha154xcf_device = {
 
 const device_t aha154xcp_device = {
     "Adaptec AHA-154xCP",
+    "aha154xcp",
     DEVICE_ISA | DEVICE_AT,
     AHA_154xCP,
     aha_init, aha1542cp_close, NULL,
@@ -1546,6 +1551,7 @@ const device_t aha154xcp_device = {
 
 const device_t aha1640_device = {
     "Adaptec AHA-1640",
+    "aha1640",
     DEVICE_MCA,
     AHA_1640,
     aha_init, x54x_close, NULL,

src/scsi/scsi_buslogic.c

@@ -1910,6 +1910,7 @@ static const device_config_t BT958D_Config[] = {
 
 const device_t buslogic_542b_device = {
 	"BusLogic BT-542B ISA",
+    "buslogic_542b_1991",
 	DEVICE_ISA | DEVICE_AT,
 	CHIP_BUSLOGIC_ISA_542B_1991_12_14,
 	buslogic_init, x54x_close, NULL,
@@ -1928,6 +1929,7 @@ const device_t buslogic_545s_device = {
 
 const device_t buslogic_542bh_device = {
 	"BusLogic BT-542BH ISA",
+    "buslogic",
 	DEVICE_ISA | DEVICE_AT,
 	CHIP_BUSLOGIC_ISA_542BH_1993_05_23,
 	buslogic_init, x54x_close, NULL,
@@ -1935,8 +1937,9 @@ const device_t buslogic_542bh_device = {
 	BT_ISA_Config
 };
 
-const device_t buslogic_545c_device = {
+const device_t buslogic_545s_device = {
 	"BusLogic BT-545C ISA",
+    "buslogic_545c",
 	DEVICE_ISA | DEVICE_AT,
 	CHIP_BUSLOGIC_ISA_545C_1994_12_01,
 	buslogic_init, x54x_close, NULL,
@@ -1946,6 +1949,7 @@ const device_t buslogic_545c_device = {
 
 const device_t buslogic_640a_device = {
 	"BusLogic BT-640A MCA",
+    "buslogic_640a",
 	DEVICE_MCA,
 	CHIP_BUSLOGIC_MCA_640A_1993_05_23,
 	buslogic_init, x54x_close, NULL,
@@ -1955,6 +1959,7 @@ const device_t buslogic_640a_device = {
 
 const device_t buslogic_445s_device = {
 	"BusLogic BT-445S VLB",
+    "buslogic_445s",
 	DEVICE_VLB,
 	CHIP_BUSLOGIC_VLB_445S_1993_11_16,
 	buslogic_init, x54x_close, NULL,
@@ -1973,6 +1978,7 @@ const device_t buslogic_445c_device = {
 
 const device_t buslogic_958d_pci_device = {
 	"BusLogic BT-958D PCI",
+    "buslogic_pci",
 	DEVICE_PCI,
 	CHIP_BUSLOGIC_PCI_958D_1995_12_30,
 	buslogic_init, x54x_close, NULL,

src/scsi/scsi_ncr5380.c

@@ -1786,6 +1786,7 @@ static const device_config_t t128_config[] = {
 const device_t scsi_lcs6821n_device =
 {
     "Longshine LCS-6821N",
+    "scsi_lcs6821n",
     DEVICE_ISA,
     0,
     ncr_init, ncr_close, NULL,
@@ -1797,6 +1798,7 @@ const device_t scsi_lcs6821n_device =
 const device_t scsi_rt1000b_device =
 {
     "Rancho RT1000B",
+    "scsi_rt1000b",
     DEVICE_ISA,
     1,
     ncr_init, ncr_close, NULL,
@@ -1808,6 +1810,7 @@ const device_t scsi_rt1000b_device =
 const device_t scsi_t130b_device =
 {
     "Trantor T130B",
+    "scsi_t130b",
     DEVICE_ISA,
     2,
     ncr_init, ncr_close, NULL,
@@ -1819,6 +1822,7 @@ const device_t scsi_t130b_device =
 const device_t scsi_t128_device =
 {
     "Trantor T128",
+    "scsi_t128",
     DEVICE_ISA,
     3,
     ncr_init, ncr_close, NULL,

src/scsi/scsi_ncr53c8xx.c

@@ -2660,6 +2660,7 @@ static const device_config_t ncr53c8xx_pci_config[] = {
 const device_t ncr53c810_pci_device =
 {
     "NCR 53c810",
+    "ncr53c810_pci",
     DEVICE_PCI,
     CHIP_810,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2670,6 +2671,7 @@ const device_t ncr53c810_pci_device =
 const device_t ncr53c810_onboard_pci_device =
 {
     "NCR 53c810 On-Board",
+    "ncr53c810_onboard_pci",
     DEVICE_PCI,
     0x8001,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2680,6 +2682,7 @@ const device_t ncr53c810_onboard_pci_device =
 const device_t ncr53c815_pci_device =
 {
     "NCR 53c815",
+    "ncr53c815_pci",
     DEVICE_PCI,
     CHIP_815,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2690,6 +2693,7 @@ const device_t ncr53c815_pci_device =
 const device_t ncr53c820_pci_device =
 {
     "NCR 53c820",
+    "ncr53c820_pci",
     DEVICE_PCI,
     CHIP_820,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2700,6 +2704,7 @@ const device_t ncr53c820_pci_device =
 const device_t ncr53c825a_pci_device =
 {
     "NCR 53c825A",
+    "ncr53c825a_pci",
     DEVICE_PCI,
     CHIP_825,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2710,6 +2715,7 @@ const device_t ncr53c825a_pci_device =
 const device_t ncr53c860_pci_device =
 {
     "NCR 53c860",
+    "ncr53c860_pci",
     DEVICE_PCI,
     CHIP_860,
     ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2720,6 +2726,7 @@ const device_t ncr53c860_pci_device =
 const device_t ncr53c875_pci_device =
 {
     "NCR 53c875",
+    "ncr53c875_pci",
     DEVICE_PCI,
     CHIP_875,
     ncr53c8xx_init, ncr53c8xx_close, NULL,

src/scsi/scsi_pcscsi.c

@@ -2012,6 +2012,7 @@ static const device_config_t bios_enable_config[] = {
 const device_t dc390_pci_device =
 {
     "Tekram DC-390 PCI",
+    "dc390_pci",
     DEVICE_PCI,
     0,
     dc390_init, esp_close, NULL,
@@ -2022,6 +2023,7 @@ const device_t dc390_pci_device =
 const device_t ncr53c90_mca_device =
 {
     "NCR 53c90 MCA",
+    "ncr53c90_mca",
     DEVICE_MCA,
     0,
     ncr53c90_mca_init, esp_close, NULL,

src/scsi/scsi_spock.c

@@ -1179,6 +1179,7 @@ static const device_config_t spock_rom_config[] = {
 const device_t spock_device =
 {
 	"IBM PS/2 SCSI Adapter (Spock)",
+  "spock",
 	DEVICE_MCA,
 	0,
 	spock_init, spock_close, NULL,