From f18615ae87a6247041d0da48405136bcd1eaa3bd Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Thu, 13 Jan 2022 21:06:11 -0500 Subject: [PATCH 01/23] refactored device_t and all declarations --- src/acpi.c | 6 ++++ src/apm.c | 3 ++ src/chipset/82c100.c | 1 + src/chipset/acc2168.c | 1 + src/chipset/ali1429.c | 2 ++ src/chipset/ali1489.c | 1 + src/chipset/ali1531.c | 1 + src/chipset/ali1541.c | 1 + src/chipset/ali1543.c | 2 ++ src/chipset/ali1621.c | 1 + src/chipset/ali6117.c | 2 ++ src/chipset/contaq_82c59x.c | 2 ++ src/chipset/cs4031.c | 1 + src/chipset/cs8230.c | 1 + src/chipset/et6000.c | 1 + src/chipset/gc100.c | 2 ++ src/chipset/headland.c | 4 +++ src/chipset/ims8848.c | 1 + src/chipset/intel_420ex.c | 2 ++ src/chipset/intel_4x0.c | 16 +++++++++++ src/chipset/intel_82335.c | 1 + src/chipset/intel_i450kx.c | 1 + src/chipset/intel_piix.c | 6 ++++ src/chipset/intel_sio.c | 2 ++ src/chipset/neat.c | 1 + src/chipset/olivetti_eva.c | 1 + src/chipset/opti283.c | 1 + src/chipset/opti291.c | 1 + src/chipset/opti391.c | 1 + src/chipset/opti495.c | 2 ++ src/chipset/opti499.c | 1 + src/chipset/opti5x7.c | 1 + src/chipset/opti822.c | 1 + src/chipset/opti895.c | 2 ++ src/chipset/scamp.c | 1 + src/chipset/scat.c | 3 ++ src/chipset/sis_5511.c | 1 + src/chipset/sis_5571.c | 1 + src/chipset/sis_85c310.c | 1 + src/chipset/sis_85c496.c | 2 ++ src/chipset/sis_85c4xx.c | 4 +++ src/chipset/sis_85c50x.c | 1 + src/chipset/stpc.c | 6 ++++ src/chipset/umc_8886.c | 2 ++ src/chipset/umc_hb4.c | 1 + src/chipset/via_apollo.c | 8 ++++++ src/chipset/via_pipc.c | 6 ++++ src/chipset/via_vt82c49x.c | 4 +++ src/chipset/via_vt82c505.c | 1 + src/chipset/vl82c480.c | 2 ++ src/chipset/wd76c10.c | 1 + src/ddma.c | 1 + src/device/bugger.c | 1 + src/device/cassette.c | 1 + src/device/hwm_gl518sm.c | 2 ++ src/device/hwm_lm75.c | 2 ++ src/device/hwm_lm78.c | 6 ++++ src/device/hwm_vt82c686.c | 1 + src/device/ibm_5161.c | 1 + src/device/isamem.c | 6 ++++ src/device/isapnp.c | 1 + src/device/isartc.c | 3 ++ src/device/keyboard_at.c | 20 ++++++++++++++ src/device/keyboard_xt.c | 10 +++++++ src/device/mouse.c | 2 ++ src/device/mouse_bus.c | 3 ++ src/device/mouse_ps2.c | 1 + src/device/mouse_serial.c | 3 ++ src/device/pci_bridge.c | 10 +++++++ src/device/phoenix_486_jumper.c | 2 ++ src/device/postcard.c | 1 + src/device/serial.c | 8 ++++++ src/device/smbus_ali7101.c | 1 + src/device/smbus_piix4.c | 2 ++ src/disk/hdc.c | 2 +- src/disk/hdc_esdi_at.c | 1 + src/disk/hdc_esdi_mca.c | 1 + src/disk/hdc_ide.c | 10 +++++++ src/disk/hdc_ide_cmd640.c | 5 ++++ src/disk/hdc_ide_cmd646.c | 3 ++ src/disk/hdc_ide_opti611.c | 1 + src/disk/hdc_ide_sff8038i.c | 1 + src/disk/hdc_st506_at.c | 1 + src/disk/hdc_st506_xt.c | 6 ++++ src/disk/hdc_xta.c | 2 ++ src/disk/hdc_xtide.c | 5 ++++ src/floppy/fdc.c | 13 +++++++++ src/floppy/fdc_magitronic.c | 1 + src/floppy/fdc_pii15xb.c | 2 ++ src/game/gameport.c | 7 +++++ src/include/86box/device.h | 7 +++-- src/ioapic.c | 1 + src/machine/m_amstrad.c | 6 ++++ src/machine/m_at_compaq.c | 1 + src/machine/m_at_t3100e_vid.c | 1 + src/machine/m_europc.c | 1 + src/machine/m_pcjr.c | 1 + src/machine/m_ps1_hdc.c | 1 + src/machine/m_tandy.c | 5 ++++ src/machine/m_xt_olivetti.c | 2 ++ src/machine/m_xt_philips.c | 1 + src/machine/m_xt_t1000_vid.c | 2 ++ src/machine/m_xt_xi8088.c | 1 + src/machine/m_xt_zenith.c | 1 + src/mem/catalyst_flash.c | 1 + src/mem/intel_flash.c | 3 ++ src/mem/spd.c | 1 + src/mem/sst_flash.c | 6 ++++ src/network/net_3c503.c | 1 + src/network/net_dp8390.c | 1 + src/network/net_ne2000.c | 5 ++++ src/network/net_pcnet.c | 6 ++++ src/network/net_plip.c | 1 + src/network/net_wd8003.c | 5 ++++ src/nvr_at.c | 11 ++++++++ src/nvr_ps2.c | 1 + src/pit.c | 13 ++++++--- src/port_6x.c | 4 +++ src/port_92.c | 4 +++ src/scsi/scsi_aha154x.c | 6 ++++ src/scsi/scsi_buslogic.c | 8 +++++- src/scsi/scsi_ncr5380.c | 4 +++ src/scsi/scsi_ncr53c8xx.c | 7 +++++ src/scsi/scsi_pcscsi.c | 2 ++ src/scsi/scsi_spock.c | 1 + src/sio/sio_82091aa.c | 3 ++ src/sio/sio_acc3221.c | 1 + src/sio/sio_detect.c | 1 + src/sio/sio_f82c710.c | 2 ++ src/sio/sio_fdc37c669.c | 2 ++ src/sio/sio_fdc37c67x.c | 1 + src/sio/sio_fdc37c6xx.c | 8 ++++++ src/sio/sio_fdc37c93x.c | 6 ++++ src/sio/sio_fdc37m60x.c | 2 ++ src/sio/sio_it8661f.c | 1 + src/sio/sio_pc87306.c | 1 + src/sio/sio_pc87307.c | 4 +++ src/sio/sio_pc87309.c | 2 ++ src/sio/sio_pc87310.c | 2 ++ src/sio/sio_pc87311.c | 2 ++ src/sio/sio_pc87332.c | 6 ++++ src/sio/sio_prime3b.c | 2 ++ src/sio/sio_prime3c.c | 2 ++ src/sio/sio_um8669f.c | 1 + src/sio/sio_vt82c686.c | 1 + src/sio/sio_w83787f.c | 4 +++ src/sio/sio_w83877f.c | 4 +++ src/sio/sio_w83977f.c | 5 ++++ src/sound/midi_fluidsynth.c | 1 + src/sound/midi_mt32.c | 2 ++ src/sound/midi_rtmidi.cpp | 2 ++ src/sound/snd_ac97_codec.c | 8 ++++++ src/sound/snd_ac97_via.c | 3 +- src/sound/snd_adlib.c | 2 ++ src/sound/snd_adlibgold.c | 1 + src/sound/snd_audiopci.c | 2 ++ src/sound/snd_azt2316a.c | 2 ++ src/sound/snd_cms.c | 1 + src/sound/snd_cs423x.c | 3 ++ src/sound/snd_gus.c | 1 + src/sound/snd_mpu401.c | 2 ++ src/sound/snd_pas16.c | 1 + src/sound/snd_pssj.c | 2 ++ src/sound/snd_sb.c | 14 ++++++++++ src/sound/snd_sn76489.c | 2 ++ src/sound/snd_ssi2001.c | 1 + src/sound/snd_wss.c | 2 ++ src/usb.c | 1 + src/video/agpgart.c | 1 + src/video/vid_ati18800.c | 2 ++ src/video/vid_ati28800.c | 6 ++++ src/video/vid_ati68860_ramdac.c | 1 + src/video/vid_ati_mach64.c | 4 +++ src/video/vid_att20c49x_ramdac.c | 3 ++ src/video/vid_att2xc498_ramdac.c | 1 + src/video/vid_av9194.c | 1 + src/video/vid_bt48x_ramdac.c | 5 ++++ src/video/vid_cga.c | 1 + src/video/vid_cl54xx.c | 30 ++++++++++++++++++++ src/video/vid_colorplus.c | 1 + src/video/vid_compaq_cga.c | 2 ++ src/video/vid_ega.c | 6 ++++ src/video/vid_et4000.c | 5 ++++ src/video/vid_et4000w32.c | 12 ++++++++ src/video/vid_f82c425.c | 1 + src/video/vid_genius.c | 1 + src/video/vid_hercules.c | 1 + src/video/vid_herculesplus.c | 1 + src/video/vid_ht216.c | 6 ++++ src/video/vid_ibm_rgb528_ramdac.c | 1 + src/video/vid_icd2061.c | 2 ++ src/video/vid_ics2494.c | 1 + src/video/vid_ics2595.c | 1 + src/video/vid_im1024.c | 1 + src/video/vid_incolor.c | 1 + src/video/vid_mda.c | 1 + src/video/vid_mga.c | 2 ++ src/video/vid_nga.c | 1 + src/video/vid_oak_oti.c | 5 ++++ src/video/vid_ogc.c | 2 ++ src/video/vid_paradise.c | 7 +++++ src/video/vid_pgc.c | 1 + src/video/vid_rtg310x.c | 1 + src/video/vid_s3.c | 46 +++++++++++++++++++++++++++++++ src/video/vid_s3_virge.c | 12 ++++++++ src/video/vid_sc1148x_ramdac.c | 4 +++ src/video/vid_sc1502x_ramdac.c | 1 + src/video/vid_sdac_ramdac.c | 4 +++ src/video/vid_sigma.c | 1 + src/video/vid_stg_ramdac.c | 1 + src/video/vid_tgui9440.c | 6 ++++ src/video/vid_ti_cf62011.c | 1 + src/video/vid_tkd8001_ramdac.c | 1 + src/video/vid_tvga.c | 3 ++ src/video/vid_tvp3026_ramdac.c | 1 + src/video/vid_vga.c | 3 ++ src/video/vid_voodoo.c | 1 + src/video/vid_voodoo_banshee.c | 8 ++++++ src/video/vid_wy700.c | 1 + 219 files changed, 707 insertions(+), 10 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 0b9676c81..02d97ebf8 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -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, diff --git a/src/apm.c b/src/apm.c index 9b667d72c..35c9a2a3c 100644 --- a/src/apm.c +++ b/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, diff --git a/src/chipset/82c100.c b/src/chipset/82c100.c index c7e84c612..76a6590bf 100644 --- a/src/chipset/82c100.c +++ b/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, diff --git a/src/chipset/acc2168.c b/src/chipset/acc2168.c index b30a7951e..ba8331447 100644 --- a/src/chipset/acc2168.c +++ b/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, diff --git a/src/chipset/ali1429.c b/src/chipset/ali1429.c index b96ec7896..ccd7e5007 100644 --- a/src/chipset/ali1429.c +++ b/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, diff --git a/src/chipset/ali1489.c b/src/chipset/ali1489.c index 330792b78..1ab245b40 100644 --- a/src/chipset/ali1489.c +++ b/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, diff --git a/src/chipset/ali1531.c b/src/chipset/ali1531.c index 59080144f..12f425c36 100644 --- a/src/chipset/ali1531.c +++ b/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, diff --git a/src/chipset/ali1541.c b/src/chipset/ali1541.c index 16587b3fc..3f94ec694 100644 --- a/src/chipset/ali1541.c +++ b/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, diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c index 5e43ec9fd..7aa7e13bc 100644 --- a/src/chipset/ali1543.c +++ b/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, diff --git a/src/chipset/ali1621.c b/src/chipset/ali1621.c index cc83899e8..65cee2fd6 100644 --- a/src/chipset/ali1621.c +++ b/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, diff --git a/src/chipset/ali6117.c b/src/chipset/ali6117.c index e7196f952..52975671a 100644 --- a/src/chipset/ali6117.c +++ b/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, diff --git a/src/chipset/contaq_82c59x.c b/src/chipset/contaq_82c59x.c index 93c841b9b..0abab7f02 100644 --- a/src/chipset/contaq_82c59x.c +++ b/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, diff --git a/src/chipset/cs4031.c b/src/chipset/cs4031.c index 2d55ce90d..01e3edc18 100644 --- a/src/chipset/cs4031.c +++ b/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, diff --git a/src/chipset/cs8230.c b/src/chipset/cs8230.c index e7ae64134..e9e060138 100644 --- a/src/chipset/cs8230.c +++ b/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, diff --git a/src/chipset/et6000.c b/src/chipset/et6000.c index f099d56d2..4dd00bdf3 100644 --- a/src/chipset/et6000.c +++ b/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, diff --git a/src/chipset/gc100.c b/src/chipset/gc100.c index 79182a380..079f775e5 100644 --- a/src/chipset/gc100.c +++ b/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, diff --git a/src/chipset/headland.c b/src/chipset/headland.c index bf2332c46..8a67df9b1 100644 --- a/src/chipset/headland.c +++ b/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, diff --git a/src/chipset/ims8848.c b/src/chipset/ims8848.c index da758ad5e..d96c53508 100644 --- a/src/chipset/ims8848.c +++ b/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, diff --git a/src/chipset/intel_420ex.c b/src/chipset/intel_420ex.c index f0511d0e8..aed5a6e6d 100644 --- a/src/chipset/intel_420ex.c +++ b/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, diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c index 7681a5781..b4cdc3aef 100644 --- a/src/chipset/intel_4x0.c +++ b/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, diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c index d123b4bdc..6dbe0ea4f 100644 --- a/src/chipset/intel_82335.c +++ b/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, diff --git a/src/chipset/intel_i450kx.c b/src/chipset/intel_i450kx.c index 2696db495..38b2afc1d 100644 --- a/src/chipset/intel_i450kx.c +++ b/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, diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c index 1a278a2c3..9a93feb56 100644 --- a/src/chipset/intel_piix.c +++ b/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, diff --git a/src/chipset/intel_sio.c b/src/chipset/intel_sio.c index 33b8a44ba..df8bb8e61 100644 --- a/src/chipset/intel_sio.c +++ b/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, diff --git a/src/chipset/neat.c b/src/chipset/neat.c index 862eae81d..7badc0de8 100644 --- a/src/chipset/neat.c +++ b/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, diff --git a/src/chipset/olivetti_eva.c b/src/chipset/olivetti_eva.c index 34b09c622..2858307d4 100644 --- a/src/chipset/olivetti_eva.c +++ b/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, diff --git a/src/chipset/opti283.c b/src/chipset/opti283.c index 1ac1fdfc0..d02ea4add 100644 --- a/src/chipset/opti283.c +++ b/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, diff --git a/src/chipset/opti291.c b/src/chipset/opti291.c index 4bb4ac937..3105d50d7 100644 --- a/src/chipset/opti291.c +++ b/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, diff --git a/src/chipset/opti391.c b/src/chipset/opti391.c index f6b1f2686..fde71fe3e 100644 --- a/src/chipset/opti391.c +++ b/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, diff --git a/src/chipset/opti495.c b/src/chipset/opti495.c index cdde85300..605d0fb8d 100644 --- a/src/chipset/opti495.c +++ b/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, diff --git a/src/chipset/opti499.c b/src/chipset/opti499.c index 1768908a4..ca9692964 100644 --- a/src/chipset/opti499.c +++ b/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, diff --git a/src/chipset/opti5x7.c b/src/chipset/opti5x7.c index 9c506daad..483580803 100644 --- a/src/chipset/opti5x7.c +++ b/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, diff --git a/src/chipset/opti822.c b/src/chipset/opti822.c index 546a9778f..42a7c89cd 100644 --- a/src/chipset/opti822.c +++ b/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, diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c index 289388391..14b0080fd 100644 --- a/src/chipset/opti895.c +++ b/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, diff --git a/src/chipset/scamp.c b/src/chipset/scamp.c index ea9b68d9a..ae48ef915 100644 --- a/src/chipset/scamp.c +++ b/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, diff --git a/src/chipset/scat.c b/src/chipset/scat.c index 9825dc057..4a58d2a1f 100644 --- a/src/chipset/scat.c +++ b/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, diff --git a/src/chipset/sis_5511.c b/src/chipset/sis_5511.c index f85b021b5..44e8f98de 100644 --- a/src/chipset/sis_5511.c +++ b/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, diff --git a/src/chipset/sis_5571.c b/src/chipset/sis_5571.c index 674db6bb5..4cc99319f 100644 --- a/src/chipset/sis_5571.c +++ b/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, diff --git a/src/chipset/sis_85c310.c b/src/chipset/sis_85c310.c index a7cae53c1..6e31f8456 100644 --- a/src/chipset/sis_85c310.c +++ b/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, diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c index 9f4952597..1c1ddb036 100644 --- a/src/chipset/sis_85c496.c +++ b/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, diff --git a/src/chipset/sis_85c4xx.c b/src/chipset/sis_85c4xx.c index 4ca0c76d7..c679c1dad 100644 --- a/src/chipset/sis_85c4xx.c +++ b/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, diff --git a/src/chipset/sis_85c50x.c b/src/chipset/sis_85c50x.c index 84ad90c91..5bbe99f1d 100644 --- a/src/chipset/sis_85c50x.c +++ b/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, diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c index 6541837cb..6e7067ebc 100644 --- a/src/chipset/stpc.c +++ b/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, diff --git a/src/chipset/umc_8886.c b/src/chipset/umc_8886.c index 591805329..a5206d678 100644 --- a/src/chipset/umc_8886.c +++ b/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, diff --git a/src/chipset/umc_hb4.c b/src/chipset/umc_hb4.c index 0948a228b..8294323ad 100644 --- a/src/chipset/umc_hb4.c +++ b/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, diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c index 5d6f2f6e7..ea30c14c9 100644 --- a/src/chipset/via_apollo.c +++ b/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, diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c index 15c3c2592..a9da704d8 100644 --- a/src/chipset/via_pipc.c +++ b/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, diff --git a/src/chipset/via_vt82c49x.c b/src/chipset/via_vt82c49x.c index 20824b006..bed86068b 100644 --- a/src/chipset/via_vt82c49x.c +++ b/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, diff --git a/src/chipset/via_vt82c505.c b/src/chipset/via_vt82c505.c index 1c7f944dd..6dea85d80 100644 --- a/src/chipset/via_vt82c505.c +++ b/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, diff --git a/src/chipset/vl82c480.c b/src/chipset/vl82c480.c index f5cc06d6a..7a0568a6c 100644 --- a/src/chipset/vl82c480.c +++ b/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, diff --git a/src/chipset/wd76c10.c b/src/chipset/wd76c10.c index 9d4f95d80..82e5d57d5 100644 --- a/src/chipset/wd76c10.c +++ b/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, diff --git a/src/ddma.c b/src/ddma.c index a1c6ab76b..1ce7f1997 100644 --- a/src/ddma.c +++ b/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, diff --git a/src/device/bugger.c b/src/device/bugger.c index 170b610c6..56ad119a1 100644 --- a/src/device/bugger.c +++ b/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, diff --git a/src/device/cassette.c b/src/device/cassette.c index c613b278b..9c13c7dbb 100644 --- a/src/device/cassette.c +++ b/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, diff --git a/src/device/hwm_gl518sm.c b/src/device/hwm_gl518sm.c index b628a9891..67742679a 100644 --- a/src/device/hwm_gl518sm.c +++ b/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, diff --git a/src/device/hwm_lm75.c b/src/device/hwm_lm75.c index b6988232b..f9bfa397b 100644 --- a/src/device/hwm_lm75.c +++ b/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, diff --git a/src/device/hwm_lm78.c b/src/device/hwm_lm78.c index f15f1ee7c..b49807bff 100644 --- a/src/device/hwm_lm78.c +++ b/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, diff --git a/src/device/hwm_vt82c686.c b/src/device/hwm_vt82c686.c index 9aa0fc35f..d2a1d00dc 100644 --- a/src/device/hwm_vt82c686.c +++ b/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, diff --git a/src/device/ibm_5161.c b/src/device/ibm_5161.c index f6ed88476..31a2e7bf9 100644 --- a/src/device/ibm_5161.c +++ b/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, diff --git a/src/device/isamem.c b/src/device/isamem.c index 54d78eb24..e26b51035 100644 --- a/src/device/isamem.c +++ b/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, @@ -748,6 +749,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, @@ -802,6 +804,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, @@ -875,6 +878,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 +982,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, @@ -1169,6 +1174,7 @@ static const device_config_t rampage_config[] = static const device_t rampage_device = { "AST RAMpage/XT", + "isamem_rampage", DEVICE_ISA, ISAMEM_RAMPAGEXT_CARD, isamem_init, isamem_close, NULL, diff --git a/src/device/isapnp.c b/src/device/isapnp.c index e948d97f9..2b75969ce 100644 --- a/src/device/isapnp.c +++ b/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, diff --git a/src/device/isartc.c b/src/device/isartc.c index bc1fa795b..efaaf65f5 100644 --- a/src/device/isartc.c +++ b/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, diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index 584575ec4..06357e605 100644 --- a/src/device/keyboard_at.c +++ b/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, diff --git a/src/device/keyboard_xt.c b/src/device/keyboard_xt.c index 9b7f98f64..9e0cf8ff7 100644 --- a/src/device/keyboard_xt.c +++ b/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, diff --git a/src/device/mouse.c b/src/device/mouse.c index 1bab34dd1..6720ddabd 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -45,6 +45,7 @@ int mouse_x, static const device_t mouse_none_device = { "None", + "mouse_none", 0, MOUSE_TYPE_NONE, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -52,6 +53,7 @@ static const device_t mouse_none_device = { }; static const device_t mouse_internal_device = { "Internal Mouse", + "mouse_internal", 0, MOUSE_TYPE_INTERNAL, NULL, NULL, NULL, { NULL }, NULL, NULL, diff --git a/src/device/mouse_bus.c b/src/device/mouse_bus.c index 86f456981..901abc7aa 100644 --- a/src/device/mouse_bus.c +++ b/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", + "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)", + "mouse_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)", + "mouse_msinport", DEVICE_ISA, MOUSE_TYPE_INPORT, bm_init, bm_close, NULL, diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c index a28a085ff..6086b40c6 100644 --- a/src/device/mouse_ps2.c +++ b/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", + "mouse_ps2", DEVICE_PS2, MOUSE_TYPE_PS2, mouse_ps2_init, ps2_close, NULL, diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c index 32b0f6341..be5e7d638 100644 --- a/src/device/mouse_serial.c +++ b/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", + "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", + "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", + "mouse_ltserial", 0, 1, sermouse_init, sermouse_close, NULL, diff --git a/src/device/pci_bridge.c b/src/device/pci_bridge.c index 3980f8df6..5cb13a1f5 100644 --- a/src/device/pci_bridge.c +++ b/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, diff --git a/src/device/phoenix_486_jumper.c b/src/device/phoenix_486_jumper.c index 53fea5d92..8bbbdaee1 100644 --- a/src/device/phoenix_486_jumper.c +++ b/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, diff --git a/src/device/postcard.c b/src/device/postcard.c index b769cbbd4..62d37c156 100644 --- a/src/device/postcard.c +++ b/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, diff --git a/src/device/serial.c b/src/device/serial.c index d9178e566..65c919d1b 100644 --- a/src/device/serial.c +++ b/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, diff --git a/src/device/smbus_ali7101.c b/src/device/smbus_ali7101.c index 5b112a1a5..5733c46eb 100644 --- a/src/device/smbus_ali7101.c +++ b/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, diff --git a/src/device/smbus_piix4.c b/src/device/smbus_piix4.c index 297b3543d..0b2416ad7 100644 --- a/src/device/smbus_piix4.c +++ b/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, diff --git a/src/disk/hdc.c b/src/disk/hdc.c index dc2234fc0..f6b6fc2e0 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -87,7 +87,7 @@ inthdc_close(void *priv) static const device_t inthdc_device = { - "Internal controller", 0, 0, + "Internal controller", "inthdc", 0, 0, inthdc_init, inthdc_close, NULL, { NULL }, NULL, NULL, NULL }; diff --git a/src/disk/hdc_esdi_at.c b/src/disk/hdc_esdi_at.c index 25ff5255e..36b6d9b64 100644 --- a/src/disk/hdc_esdi_at.c +++ b/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_wd1007vse1", DEVICE_ISA | DEVICE_AT, 0, wd1007vse1_init, wd1007vse1_close, NULL, diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c index e9bb48981..7d43edafb 100644 --- a/src/disk/hdc_esdi_mca.c +++ b/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_ps2" DEVICE_MCA, 0, esdi_init, esdi_close, NULL, { esdi_available }, NULL, NULL, NULL diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index a04de517c..120f76616 100644 --- a/src/disk/hdc_ide.c +++ b/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, diff --git a/src/disk/hdc_ide_cmd640.c b/src/disk/hdc_ide_cmd640.c index ac6146094..a4e1c8ca6 100644 --- a/src/disk/hdc_ide_cmd640.c +++ b/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, diff --git a/src/disk/hdc_ide_cmd646.c b/src/disk/hdc_ide_cmd646.c index 4a8e9a176..d2b2fe978 100644 --- a/src/disk/hdc_ide_cmd646.c +++ b/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, diff --git a/src/disk/hdc_ide_opti611.c b/src/disk/hdc_ide_opti611.c index 4cdf06b78..30b57249f 100644 --- a/src/disk/hdc_ide_opti611.c +++ b/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, diff --git a/src/disk/hdc_ide_sff8038i.c b/src/disk/hdc_ide_sff8038i.c index 8fe9fec88..516b8dcc7 100644 --- a/src/disk/hdc_ide_sff8038i.c +++ b/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, diff --git a/src/disk/hdc_st506_at.c b/src/disk/hdc_st506_at.c index 192a8b6a3..dafa34c43 100644 --- a/src/disk/hdc_st506_at.c +++ b/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_wd1003", DEVICE_ISA | DEVICE_AT, 0, mfm_init, mfm_close, NULL, diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c index e591de018..f5666ed50 100644 --- a/src/disk/hdc_st506_xt.c +++ b/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_xebec", 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, diff --git a/src/disk/hdc_xta.c b/src/disk/hdc_xta.c index b841e6ac7..ee43461c1 100644 --- a/src/disk/hdc_xta.c +++ b/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, diff --git a/src/disk/hdc_xtide.c b/src/disk/hdc_xtide.c index c5cb0c153..84b31bc8d 100644 --- a/src/disk/hdc_xtide.c +++ b/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, diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index 5f47a5c34..4860897af 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -2375,6 +2375,7 @@ 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 +2386,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 +2397,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 +2408,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 +2420,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 +2431,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 +2442,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 +2453,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 +2464,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 +2475,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 +2486,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 +2497,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 +2508,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, diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c index 807e021e7..915ce36d4 100644 --- a/src/floppy/fdc_magitronic.c +++ b/src/floppy/fdc_magitronic.c @@ -133,6 +133,7 @@ static const device_config_t b215_config[] = { const device_t fdc_b215_device = { "Magitronic B215", + "fdc_b215", DEVICE_ISA, 0, b215_init, diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c index 7a746f142..18ae0f2cb 100644 --- a/src/floppy/fdc_pii15xb.c +++ b/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", + "fdc_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", + "fdc_pii158b", DEVICE_ISA, 158, pii_init, diff --git a/src/game/gameport.c b/src/game/gameport.c index 145262278..a4a48cbea 100644 --- a/src/game/gameport.c +++ b/src/game/gameport.c @@ -438,6 +438,7 @@ gameport_close(void *priv) const device_t gameport_device = { "Game port", + "gameport", 0, 0x080200, gameport_init, gameport_close, @@ -447,6 +448,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 +458,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 +468,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 +478,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 +488,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 +498,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, diff --git a/src/include/86box/device.h b/src/include/86box/device.h index 6e7fa53cf..33336ba93 100644 --- a/src/include/86box/device.h +++ b/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 */ @@ -102,9 +103,9 @@ typedef struct _device_ { void (*close)(void *priv); void (*reset)(void *priv); union { - int (*available)(void); - int (*poll)(int x, int y, int z, int b, void *priv); - void (*register_pci_slot)(int device, int type, int inta, int intb, int intc, int intd, void *priv); + int (*available)(void); + int (*poll)(int x, int y, int z, int b, void *priv); + void (*register_pci_slot)(int device, int type, int inta, int intb, int intc, int intd, void *priv); }; void (*speed_changed)(void *priv); void (*force_redraw)(void *priv); diff --git a/src/ioapic.c b/src/ioapic.c index b2ce9dd52..b899beec0 100644 --- a/src/ioapic.c +++ b/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, diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c index 10e4df12e..704933d0f 100644 --- a/src/machine/m_amstrad.c +++ b/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 }, diff --git a/src/machine/m_at_compaq.c b/src/machine/m_at_compaq.c index 4e9d9e152..3c1db5ea6 100644 --- a/src/machine/m_at_compaq.c +++ b/src/machine/m_at_compaq.c @@ -732,6 +732,7 @@ const device_config_t compaq_plasma_config[] = static const device_t compaq_plasma_device = { "Compaq Plasma", + "compaq_plasma", 0, 0, compaq_plasma_init, compaq_plasma_close, diff --git a/src/machine/m_at_t3100e_vid.c b/src/machine/m_at_t3100e_vid.c index b52c8ef03..0367b28f2 100644 --- a/src/machine/m_at_t3100e_vid.c +++ b/src/machine/m_at_t3100e_vid.c @@ -760,6 +760,7 @@ void t3100e_speed_changed(void *p) const device_t t3100e_device = { "Toshiba T3100e", + "t3100e", 0, 0, t3100e_init, diff --git a/src/machine/m_europc.c b/src/machine/m_europc.c index bff981c29..29405024b 100644 --- a/src/machine/m_europc.c +++ b/src/machine/m_europc.c @@ -690,6 +690,7 @@ static const device_config_t europc_config[] = { const device_t europc_device = { "EuroPC System Board", + "europc", 0, 0, europc_boot, europc_close, NULL, { NULL }, NULL, NULL, diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c index 80c982bee..e6cafb1ac 100644 --- a/src/machine/m_pcjr.c +++ b/src/machine/m_pcjr.c @@ -793,6 +793,7 @@ static const device_config_t pcjr_config[] = { static const device_t pcjr_device = { "IBM PCjr", + "pcjr", 0, 0, NULL, NULL, NULL, { NULL }, diff --git a/src/machine/m_ps1_hdc.c b/src/machine/m_ps1_hdc.c index ab9d84491..e7547a681 100644 --- a/src/machine/m_ps1_hdc.c +++ b/src/machine/m_ps1_hdc.c @@ -1352,6 +1352,7 @@ ps1_hdc_close(void *priv) const device_t ps1_hdc_device = { "PS/1 2011 Fixed Disk Controller", + "ps1_hdc", DEVICE_ISA | DEVICE_PS2, 0, ps1_hdc_init, ps1_hdc_close, NULL, diff --git a/src/machine/m_tandy.c b/src/machine/m_tandy.c index 8de9883b7..1eaf93163 100644 --- a/src/machine/m_tandy.c +++ b/src/machine/m_tandy.c @@ -1165,6 +1165,7 @@ static const device_config_t vid_config[] = { static const device_t vid_device = { "Tandy 1000", + "tandy1000_video", 0, 0, NULL, vid_close, NULL, { NULL }, @@ -1175,6 +1176,7 @@ static const device_t vid_device = { static const device_t vid_device_hx = { "Tandy 1000 HX", + "tandy1000_hx_video", 0, 0, NULL, vid_close, NULL, { NULL }, @@ -1185,6 +1187,7 @@ static const device_t vid_device_hx = { static const device_t vid_device_sl = { "Tandy 1000SL2", + "tandy1000_sl_video", 0, 1, NULL, vid_close, NULL, { NULL }, @@ -1344,6 +1347,7 @@ eep_close(void *priv) static const device_t eep_1000hx_device = { "Tandy 1000HX EEPROM", + "eep_1000hx", 0, TYPE_TANDY1000HX, eep_init, eep_close, NULL, { NULL }, NULL, NULL, @@ -1353,6 +1357,7 @@ static const device_t eep_1000hx_device = { static const device_t eep_1000sl2_device = { "Tandy 1000SL2 EEPROM", + "eep_1000sl2", 0, TYPE_TANDY1000SL2, eep_init, eep_close, NULL, { NULL }, NULL, NULL, diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c index a76a3cfc8..9100bbe3b 100644 --- a/src/machine/m_xt_olivetti.c +++ b/src/machine/m_xt_olivetti.c @@ -589,6 +589,7 @@ m19_vid_init(m19_vid_t *vid) const device_t m24_kbd_device = { "Olivetti M24 keyboard and mouse", + "m24_kbd", 0, 0, NULL, @@ -630,6 +631,7 @@ const device_config_t m19_vid_config[] = const device_t m19_vid_device = { "Olivetti M19 graphics card", + "m19_vid", 0, 0, NULL, m19_vid_close, NULL, { NULL }, diff --git a/src/machine/m_xt_philips.c b/src/machine/m_xt_philips.c index 2b04e42c6..753d1300b 100644 --- a/src/machine/m_xt_philips.c +++ b/src/machine/m_xt_philips.c @@ -135,6 +135,7 @@ philips_init(const device_t *info) const device_t philips_device = { "Philips XT Mainboard", + "philips", 0, 0, philips_init, philips_close, NULL, diff --git a/src/machine/m_xt_t1000_vid.c b/src/machine/m_xt_t1000_vid.c index 8e1c7029c..d5cd7b21e 100644 --- a/src/machine/m_xt_t1000_vid.c +++ b/src/machine/m_xt_t1000_vid.c @@ -773,6 +773,7 @@ static const device_config_t t1000_config[] = const device_t t1000_video_device = { "Toshiba T1000 Video", + "t1000_video", 0, 0, t1000_init, t1000_close, NULL, { NULL }, @@ -784,6 +785,7 @@ const device_t t1000_video_device = { const device_t t1200_video_device = { "Toshiba T1200 Video", + "t1200_video", 0, 0, t1000_init, t1000_close, NULL, { NULL }, diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c index f192c6d86..bb56b3486 100644 --- a/src/machine/m_xt_xi8088.c +++ b/src/machine/m_xt_xi8088.c @@ -173,6 +173,7 @@ static const device_config_t xi8088_config[] = const device_t xi8088_device = { "Xi8088", + "xi8088", 0, 0, xi8088_init, diff --git a/src/machine/m_xt_zenith.c b/src/machine/m_xt_zenith.c index f820bfd2e..19f2bc748 100644 --- a/src/machine/m_xt_zenith.c +++ b/src/machine/m_xt_zenith.c @@ -101,6 +101,7 @@ zenith_scratchpad_close(void *p) static const device_t zenith_scratchpad_device = { "Zenith scratchpad RAM", + "zenith_scratchpad", 0, 0, zenith_scratchpad_init, zenith_scratchpad_close, NULL, { NULL }, diff --git a/src/mem/catalyst_flash.c b/src/mem/catalyst_flash.c index 6dc9b2538..246063276 100644 --- a/src/mem/catalyst_flash.c +++ b/src/mem/catalyst_flash.c @@ -245,6 +245,7 @@ catalyst_flash_close(void *p) const device_t catalyst_flash_device = { "Catalyst 28F010-D Flash BIOS", + "catalyst_flash", DEVICE_PCI, 0, catalyst_flash_init, diff --git a/src/mem/intel_flash.c b/src/mem/intel_flash.c index cd064ddee..4387746e3 100644 --- a/src/mem/intel_flash.c +++ b/src/mem/intel_flash.c @@ -565,6 +565,7 @@ intel_flash_close(void *p) const device_t intel_flash_bxt_ami_device = { "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS", + "intel_flash_bxt_ami", DEVICE_PCI, FLAG_INV_A16, intel_flash_init, @@ -577,6 +578,7 @@ const device_t intel_flash_bxt_ami_device = const device_t intel_flash_bxt_device = { "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS", + "intel_flash_bxt", DEVICE_PCI, 0, intel_flash_init, intel_flash_close, @@ -588,6 +590,7 @@ const device_t intel_flash_bxt_device = const device_t intel_flash_bxb_device = { "Intel 28F001BXB/28F002BXB/28F004BXB Flash BIOS", + "intel_flash_bxb", DEVICE_PCI, FLAG_BXB, intel_flash_init, intel_flash_close, diff --git a/src/mem/spd.c b/src/mem/spd.c index 547b0c722..2ce97153b 100644 --- a/src/mem/spd.c +++ b/src/mem/spd.c @@ -529,6 +529,7 @@ spd_write_drbs_ali1621(uint8_t *regs, uint8_t reg_min, uint8_t reg_max) static const device_t spd_device = { "Serial Presence Detect ROMs", + "spd", DEVICE_ISA, 0, spd_init, spd_close, NULL, diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c index 23110cb75..1de5e6e32 100644 --- a/src/mem/sst_flash.c +++ b/src/mem/sst_flash.c @@ -478,6 +478,7 @@ sst_close(void *p) const device_t sst_flash_29ee010_device = { "SST 29EE010 Flash BIOS", + "sst_flash_29ee010", 0, SST | SST29EE010 | SIZE_1M, sst_init, @@ -490,6 +491,7 @@ const device_t sst_flash_29ee010_device = const device_t sst_flash_29ee020_device = { "SST 29EE020 Flash BIOS", + "sst_flash_29ee020", 0, SST | SST29EE020 | SIZE_2M, sst_init, @@ -502,6 +504,7 @@ const device_t sst_flash_29ee020_device = const device_t winbond_flash_w29c020_device = { "Winbond W29C020 Flash BIOS", + "winbond_flash_w29c020", 0, WINBOND | W29C020 | SIZE_2M, sst_init, @@ -514,6 +517,7 @@ const device_t winbond_flash_w29c020_device = const device_t sst_flash_39sf010_device = { "SST 39SF010 Flash BIOS", + "sst_flash_39sf010", 0, SST | SST39SF010 | SIZE_1M, sst_init, @@ -526,6 +530,7 @@ const device_t sst_flash_39sf010_device = const device_t sst_flash_39sf020_device = { "SST 39SF020 Flash BIOS", + "sst_flash_39sf020", 0, SST | SST39SF020 | SIZE_2M, sst_init, @@ -537,6 +542,7 @@ const device_t sst_flash_39sf020_device = const device_t sst_flash_39sf040_device = { "SST 39SF040 Flash BIOS", + "sst_flash_39sf040", 0, SST | SST39SF040 | SIZE_4M, sst_init, diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c index 66221c62a..747bcae6b 100644 --- a/src/network/net_3c503.c +++ b/src/network/net_3c503.c @@ -743,6 +743,7 @@ static const device_config_t threec503_config[] = const device_t threec503_device = { "3Com EtherLink II", + "threec503", DEVICE_ISA, 0, threec503_nic_init, threec503_nic_close, NULL, diff --git a/src/network/net_dp8390.c b/src/network/net_dp8390.c index 5f31ba58a..d3d4aa46c 100644 --- a/src/network/net_dp8390.c +++ b/src/network/net_dp8390.c @@ -1114,6 +1114,7 @@ dp8390_close(void *priv) const device_t dp8390_device = { "DP8390 Network Interface Controller", + "dp8390", 0, 0, dp8390_init, dp8390_close, NULL, { NULL }, NULL, NULL diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index ab66079e3..5157823eb 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -1330,6 +1330,7 @@ static const device_config_t mca_mac_config[] = const device_t ne1000_device = { "Novell NE1000", + "ne1000", DEVICE_ISA, NE2K_NE1000, nic_init, nic_close, NULL, @@ -1339,6 +1340,7 @@ const device_t ne1000_device = { const device_t ne2000_device = { "Novell NE2000", + "ne2000", DEVICE_ISA | DEVICE_AT, NE2K_NE2000, nic_init, nic_close, NULL, @@ -1348,6 +1350,7 @@ const device_t ne2000_device = { const device_t ethernext_mc_device = { "NetWorth EtherNext/MC", + "ethernext_mc", DEVICE_MCA, NE2K_ETHERNEXT_MC, nic_init, nic_close, NULL, @@ -1357,6 +1360,7 @@ const device_t ethernext_mc_device = { const device_t rtl8019as_device = { "Realtek RTL8019AS", + "rtl8019as", DEVICE_ISA | DEVICE_AT, NE2K_RTL8019AS, nic_init, nic_close, NULL, @@ -1366,6 +1370,7 @@ const device_t rtl8019as_device = { const device_t rtl8029as_device = { "Realtek RTL8029AS", + "rtl8029as", DEVICE_PCI, NE2K_RTL8029AS, nic_init, nic_close, NULL, diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c index 8c6f46897..e17893bb4 100644 --- a/src/network/net_pcnet.c +++ b/src/network/net_pcnet.c @@ -3219,6 +3219,7 @@ static const device_config_t pcnet_vlb_config[] = const device_t pcnet_am79c960_device = { "AMD PCnet-ISA ", + "pcnet_am79c960", DEVICE_AT | DEVICE_ISA, DEV_AM79C960, pcnet_init, pcnet_close, NULL, @@ -3228,6 +3229,7 @@ const device_t pcnet_am79c960_device = { const device_t pcnet_am79c960_eb_device = { "Racal Interlan EtherBlaster", + "pcnet_am79c960_eb", DEVICE_AT | DEVICE_ISA, DEV_AM79C960_EB, pcnet_init, pcnet_close, NULL, @@ -3237,6 +3239,7 @@ const device_t pcnet_am79c960_eb_device = { const device_t pcnet_am79c960_vlb_device = { "AMD PCnet-VL", + "pcnet_am79c960_vlb", DEVICE_VLB, DEV_AM79C960_VLB, pcnet_init, pcnet_close, NULL, @@ -3246,6 +3249,7 @@ const device_t pcnet_am79c960_vlb_device = { const device_t pcnet_am79c961_device = { "AMD PCnet-ISA+", + "pcnet_am79c961", DEVICE_AT | DEVICE_ISA, DEV_AM79C961, pcnet_init, pcnet_close, NULL, @@ -3255,6 +3259,7 @@ const device_t pcnet_am79c961_device = { const device_t pcnet_am79c970a_device = { "AMD PCnet-PCI II", + "pcnet_am79c970a", DEVICE_PCI, DEV_AM79C970A, pcnet_init, pcnet_close, NULL, @@ -3264,6 +3269,7 @@ const device_t pcnet_am79c970a_device = { const device_t pcnet_am79c973_device = { "AMD PCnet-FAST III", + "pcnet_am79c973", DEVICE_PCI, DEV_AM79C973, pcnet_init, pcnet_close, NULL, diff --git a/src/network/net_plip.c b/src/network/net_plip.c index c71cf77d1..f0af9dee5 100644 --- a/src/network/net_plip.c +++ b/src/network/net_plip.c @@ -504,6 +504,7 @@ const lpt_device_t lpt_plip_device = { const device_t plip_device = { "Parallel Line Internet Protocol", + "plip", DEVICE_LPT, 0, plip_net_init, NULL, NULL, { NULL }, NULL, NULL diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c index 4206c88a2..4a8559dc4 100644 --- a/src/network/net_wd8003.c +++ b/src/network/net_wd8003.c @@ -1073,6 +1073,7 @@ static const device_config_t mca_mac_config[] = const device_t wd8003e_device = { "Western Digital WD8003E", + "wd8003e", DEVICE_ISA, WD8003E, wd_init, wd_close, NULL, @@ -1082,6 +1083,7 @@ const device_t wd8003e_device = { const device_t wd8003eb_device = { "Western Digital WD8003EB", + "wd8003eb", DEVICE_ISA, WD8003EB, wd_init, wd_close, NULL, @@ -1091,6 +1093,7 @@ const device_t wd8003eb_device = { const device_t wd8013ebt_device = { "Western Digital WD8013EBT", + "wd8013ebt", DEVICE_ISA, WD8013EBT, wd_init, wd_close, NULL, @@ -1100,6 +1103,7 @@ const device_t wd8013ebt_device = { const device_t wd8003eta_device = { "Western Digital WD8003ET/A", + "wd8003eta", DEVICE_MCA, WD8003ETA, wd_init, wd_close, NULL, @@ -1109,6 +1113,7 @@ const device_t wd8003eta_device = { const device_t wd8003ea_device = { "Western Digital WD8003E/A", + "wd8003ea", DEVICE_MCA, WD8003EA, wd_init, wd_close, NULL, diff --git a/src/nvr_at.c b/src/nvr_at.c index 5b258a057..a7ee53c65 100644 --- a/src/nvr_at.c +++ b/src/nvr_at.c @@ -1123,6 +1123,7 @@ nvr_at_close(void *priv) const device_t at_nvr_old_device = { "PC/AT NVRAM (No century)", + "at_nvr_old", DEVICE_ISA | DEVICE_AT, 0, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1132,6 +1133,7 @@ const device_t at_nvr_old_device = { const device_t at_nvr_device = { "PC/AT NVRAM", + "at_nvr", DEVICE_ISA | DEVICE_AT, 1, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1141,6 +1143,7 @@ const device_t at_nvr_device = { const device_t ps_nvr_device = { "PS/1 or PS/2 NVRAM", + "ps_nvr", DEVICE_PS2, 2, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1150,6 +1153,7 @@ const device_t ps_nvr_device = { const device_t amstrad_nvr_device = { "Amstrad NVRAM", + "amstrad_nvr", DEVICE_ISA | DEVICE_AT, 3, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1159,6 +1163,7 @@ const device_t amstrad_nvr_device = { const device_t ibmat_nvr_device = { "IBM AT NVRAM", + "ibmat_nvr", DEVICE_ISA | DEVICE_AT, 4, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1168,6 +1173,7 @@ const device_t ibmat_nvr_device = { const device_t piix4_nvr_device = { "Intel PIIX4 PC/AT NVRAM", + "piix4_nvr", DEVICE_ISA | DEVICE_AT, 9, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1177,6 +1183,7 @@ const device_t piix4_nvr_device = { const device_t ami_1992_nvr_device = { "AMI Color 1992 PC/AT NVRAM", + "ami_1992_nvr", DEVICE_ISA | DEVICE_AT, 12, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1186,6 +1193,7 @@ const device_t ami_1992_nvr_device = { const device_t ami_1994_nvr_device = { "AMI WinBIOS 1994 PC/AT NVRAM", + "ami_1994_nvr", DEVICE_ISA | DEVICE_AT, 13, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1195,6 +1203,7 @@ const device_t ami_1994_nvr_device = { const device_t ami_1995_nvr_device = { "AMI WinBIOS 1995 PC/AT NVRAM", + "ami_1995_nvr", DEVICE_ISA | DEVICE_AT, 14, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1204,6 +1213,7 @@ const device_t ami_1995_nvr_device = { const device_t via_nvr_device = { "VIA PC/AT NVRAM", + "via_nvr", DEVICE_ISA | DEVICE_AT, 15, nvr_at_init, nvr_at_close, nvr_at_reset, @@ -1213,6 +1223,7 @@ const device_t via_nvr_device = { const device_t p6rp4_nvr_device = { "ASUS P/I-P6RP4 PC/AT NVRAM", + "p6rp4_nvr", DEVICE_ISA | DEVICE_AT, 16, nvr_at_init, nvr_at_close, nvr_at_reset, diff --git a/src/nvr_ps2.c b/src/nvr_ps2.c index 68006ca84..5e38d5a57 100644 --- a/src/nvr_ps2.c +++ b/src/nvr_ps2.c @@ -154,6 +154,7 @@ ps2_nvr_close(void *priv) const device_t ps2_nvr_device = { "PS/2 Secondary NVRAM", + "ps2_nvr", 0, 0, ps2_nvr_init, ps2_nvr_close, NULL, { NULL }, NULL, diff --git a/src/pit.c b/src/pit.c index fe256f53d..5057b6efa 100644 --- a/src/pit.c +++ b/src/pit.c @@ -844,18 +844,20 @@ pit_init(const device_t *info) const device_t i8253_device = { - "Intel 8253/8253-5 Programmable Interval Timer", - DEVICE_ISA, - PIT_8253, + "Intel 8253/8253-5 Programmable Interval Timer", + "i8253", + DEVICE_ISA, + PIT_8253, pit_init, pit_close, NULL, { NULL }, NULL, NULL, - NULL + NULL }; const device_t i8254_device = { "Intel 8254 Programmable Interval Timer", + "i8254", DEVICE_ISA, PIT_8254, pit_init, pit_close, NULL, @@ -867,6 +869,7 @@ const device_t i8254_device = const device_t i8254_sec_device = { "Intel 8254 Programmable Interval Timer (Secondary)", + "i8254_sec", DEVICE_ISA, PIT_8254 | PIT_SECONDARY, pit_init, pit_close, NULL, @@ -878,6 +881,7 @@ const device_t i8254_sec_device = const device_t i8254_ext_io_device = { "Intel 8254 Programmable Interval Timer (External I/O)", + "i8254_ext_io", DEVICE_ISA, PIT_8254 | PIT_EXT_IO, pit_init, pit_close, NULL, @@ -889,6 +893,7 @@ const device_t i8254_ext_io_device = const device_t i8254_ps2_device = { "Intel 8254 Programmable Interval Timer (PS/2)", + "i8254_ps2", DEVICE_ISA, PIT_8254 | PIT_PS2 | PIT_EXT_IO, pit_init, pit_close, NULL, diff --git a/src/port_6x.c b/src/port_6x.c index 98cd4350d..ef6c8365d 100644 --- a/src/port_6x.c +++ b/src/port_6x.c @@ -176,6 +176,7 @@ port_6x_init(const device_t *info) const device_t port_6x_device = { "Port 6x Registers", + "port_6x", 0, 0, port_6x_init, port_6x_close, NULL, @@ -186,6 +187,7 @@ const device_t port_6x_device = { const device_t port_6x_xi8088_device = { "Port 6x Registers (Xi8088)", + "port_6x_xi8088", 0, PORT_6X_TURBO | PORT_6X_EXT_REF | PORT_6X_MIRROR, port_6x_init, port_6x_close, NULL, @@ -196,6 +198,7 @@ const device_t port_6x_xi8088_device = { const device_t port_6x_ps2_device = { "Port 6x Registers (IBM PS/2)", + "port_6x_ps2", 0, PORT_6X_EXT_REF, port_6x_init, port_6x_close, NULL, @@ -206,6 +209,7 @@ const device_t port_6x_ps2_device = { const device_t port_6x_olivetti_device = { "Port 6x Registers (Olivetti)", + "port_6x_olivetti", 0, PORT_6X_SWA, port_6x_init, port_6x_close, NULL, diff --git a/src/port_92.c b/src/port_92.c index 5e19bee34..6981a3596 100644 --- a/src/port_92.c +++ b/src/port_92.c @@ -219,6 +219,7 @@ port_92_init(const device_t *info) const device_t port_92_device = { "Port 92 Register", + "port_92", 0, 0, port_92_init, port_92_close, NULL, @@ -229,6 +230,7 @@ const device_t port_92_device = { const device_t port_92_inv_device = { "Port 92 Register (inverted bits 2-7)", + "port_92_inv", 0, PORT_92_INV, port_92_init, port_92_close, NULL, @@ -239,6 +241,7 @@ const device_t port_92_inv_device = { const device_t port_92_word_device = { "Port 92 Register (16-bit)", + "port_92_word", 0, PORT_92_WORD, port_92_init, port_92_close, NULL, @@ -249,6 +252,7 @@ const device_t port_92_word_device = { const device_t port_92_pci_device = { "Port 92 Register (PCI)", + "port_92_pci", 0, PORT_92_PCI, port_92_init, port_92_close, NULL, diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c index ed97f2ab2..d0c81a08d 100644 --- a/src/scsi/scsi_aha154x.c +++ b/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, diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index 2ea041aaa..8ef468544 100644 --- a/src/scsi/scsi_buslogic.c +++ b/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, diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c index e232e3684..95c6bcc48 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/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, diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c index db54f1422..66d4dc1f8 100644 --- a/src/scsi/scsi_ncr53c8xx.c +++ b/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, diff --git a/src/scsi/scsi_pcscsi.c b/src/scsi/scsi_pcscsi.c index 8fddabd7b..044079337 100644 --- a/src/scsi/scsi_pcscsi.c +++ b/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, diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c index 5075d7f0a..7e1eb987f 100644 --- a/src/scsi/scsi_spock.c +++ b/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, diff --git a/src/sio/sio_82091aa.c b/src/sio/sio_82091aa.c index f31b3fe9f..f266f0a40 100644 --- a/src/sio/sio_82091aa.c +++ b/src/sio/sio_82091aa.c @@ -278,6 +278,7 @@ i82091aa_init(const device_t *info) const device_t i82091aa_device = { "Intel 82091AA Super I/O", + "i82091aa", 0, 0x40, i82091aa_init, i82091aa_close, NULL, @@ -288,6 +289,7 @@ const device_t i82091aa_device = { const device_t i82091aa_398_device = { "Intel 82091AA Super I/O (Port 398h)", + "i82091aa_398", 0, 0x148, i82091aa_init, i82091aa_close, NULL, @@ -298,6 +300,7 @@ const device_t i82091aa_398_device = { const device_t i82091aa_ide_device = { "Intel 82091AA Super I/O (With IDE)", + "i82091aa_ide", 0, 0x240, i82091aa_init, i82091aa_close, NULL, diff --git a/src/sio/sio_acc3221.c b/src/sio/sio_acc3221.c index 96a5005c4..17536690c 100644 --- a/src/sio/sio_acc3221.c +++ b/src/sio/sio_acc3221.c @@ -477,6 +477,7 @@ acc3221_init(const device_t *info) const device_t acc3221_device = { "ACC 3221-SP Super I/O", + "acc3221", 0, 0, acc3221_init, acc3221_close, NULL, diff --git a/src/sio/sio_detect.c b/src/sio/sio_detect.c index 8df3864c3..5daa13fcd 100644 --- a/src/sio/sio_detect.c +++ b/src/sio/sio_detect.c @@ -109,6 +109,7 @@ sio_detect_init(const device_t *info) const device_t sio_detect_device = { "Super I/O Detection Helper", + "sio_detect", 0, 0, sio_detect_init, sio_detect_close, NULL, diff --git a/src/sio/sio_f82c710.c b/src/sio/sio_f82c710.c index 6b866c094..feb623a10 100644 --- a/src/sio/sio_f82c710.c +++ b/src/sio/sio_f82c710.c @@ -343,6 +343,7 @@ f82c710_init(const device_t *info) const device_t f82c606_device = { "82C606 CHIPSpak Multifunction Controller", + "f82c606", 0, 606, f82c710_init, f82c710_close, f82c710_reset, @@ -352,6 +353,7 @@ const device_t f82c606_device = { const device_t f82c710_device = { "F82C710 UPC Super I/O", + "f82c710", 0, 710, f82c710_init, f82c710_close, f82c710_reset, diff --git a/src/sio/sio_fdc37c669.c b/src/sio/sio_fdc37c669.c index d223cf0df..a365f0ede 100644 --- a/src/sio/sio_fdc37c669.c +++ b/src/sio/sio_fdc37c669.c @@ -329,6 +329,7 @@ fdc37c669_init(const device_t *info) const device_t fdc37c669_device = { "SMC FDC37C669 Super I/O", + "fdc37c669", 0, 0, fdc37c669_init, fdc37c669_close, NULL, @@ -339,6 +340,7 @@ const device_t fdc37c669_device = { const device_t fdc37c669_370_device = { "SMC FDC37C669 Super I/O (Port 370h)", + "fdc37c669_370", 0, 1, fdc37c669_init, fdc37c669_close, NULL, diff --git a/src/sio/sio_fdc37c67x.c b/src/sio/sio_fdc37c67x.c index 7e1b4d917..727390535 100644 --- a/src/sio/sio_fdc37c67x.c +++ b/src/sio/sio_fdc37c67x.c @@ -605,6 +605,7 @@ fdc37c67x_init(const device_t *info) const device_t fdc37c67x_device = { "SMC FDC37C67X Super I/O", + "fdc37c67x", 0, 0x40, fdc37c67x_init, fdc37c67x_close, NULL, diff --git a/src/sio/sio_fdc37c6xx.c b/src/sio/sio_fdc37c6xx.c index 59f93c1fa..6de33a820 100644 --- a/src/sio/sio_fdc37c6xx.c +++ b/src/sio/sio_fdc37c6xx.c @@ -347,6 +347,7 @@ const device_t fdc37c651_device = { const device_t fdc37c651_ide_device = { "SMC FDC37C651 Super I/O (With IDE)", + "fdc37c651_ide", 0, 0x151, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -356,6 +357,7 @@ const device_t fdc37c651_ide_device = { const device_t fdc37c661_device = { "SMC FDC37C661 Super I/O", + "fdc37c661", 0, 0x61, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -365,6 +367,7 @@ const device_t fdc37c661_device = { const device_t fdc37c661_ide_device = { "SMC FDC37C661 Super I/O (With IDE)", + "fdc37c661_ide", 0, 0x161, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -374,6 +377,7 @@ const device_t fdc37c661_ide_device = { const device_t fdc37c663_device = { "SMC FDC37C663 Super I/O", + "fdc37c663", 0, 0x63, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -383,6 +387,7 @@ const device_t fdc37c663_device = { const device_t fdc37c663_ide_device = { "SMC FDC37C663 Super I/O (With IDE)", + "fdc37c663_ide", 0, 0x163, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -392,6 +397,7 @@ const device_t fdc37c663_ide_device = { const device_t fdc37c665_device = { "SMC FDC37C665 Super I/O", + "fdc37c665", 0, 0x65, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -401,6 +407,7 @@ const device_t fdc37c665_device = { const device_t fdc37c665_ide_device = { "SMC FDC37C665 Super I/O (With IDE)", + "fdc37c665_ide", 0, 0x265, fdc37c6xx_init, fdc37c6xx_close, NULL, @@ -410,6 +417,7 @@ const device_t fdc37c665_ide_device = { const device_t fdc37c666_device = { "SMC FDC37C666 Super I/O", + "fdc37c666", 0, 0x66, fdc37c6xx_init, fdc37c6xx_close, NULL, diff --git a/src/sio/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c index a20349aff..1747df076 100644 --- a/src/sio/sio_fdc37c93x.c +++ b/src/sio/sio_fdc37c93x.c @@ -814,6 +814,7 @@ access_bus_init(const device_t *info) static const device_t access_bus_device = { "SMC FDC37C932FR ACCESS.bus", + "access_bus", 0, 0x03, access_bus_init, access_bus_close, NULL, @@ -886,6 +887,7 @@ fdc37c93x_init(const device_t *info) const device_t fdc37c931apm_device = { "SMC FDC37C932QF Super I/O", + "fdc37c931apm", 0, 0x130, /* Share the same ID with the 932QF. */ fdc37c93x_init, fdc37c93x_close, NULL, @@ -895,6 +897,7 @@ const device_t fdc37c931apm_device = { const device_t fdc37c931apm_compaq_device = { "SMC FDC37C932QF Super I/O (Compaq Presario 4500)", + "fdc37c931apm_compaq", 0, 0x330, /* Share the same ID with the 932QF. */ fdc37c93x_init, fdc37c93x_close, NULL, @@ -904,6 +907,7 @@ const device_t fdc37c931apm_compaq_device = { const device_t fdc37c932fr_device = { "SMC FDC37C932FR Super I/O", + "fdc37c932fr", 0, 0x03, fdc37c93x_init, fdc37c93x_close, NULL, @@ -913,6 +917,7 @@ const device_t fdc37c932fr_device = { const device_t fdc37c932qf_device = { "SMC FDC37C932QF Super I/O", + "fdc37c932qf", 0, 0x30, fdc37c93x_init, fdc37c93x_close, NULL, @@ -922,6 +927,7 @@ const device_t fdc37c932qf_device = { const device_t fdc37c935_device = { "SMC FDC37C935 Super I/O", + "fdc37c935", 0, 0x02, fdc37c93x_init, fdc37c93x_close, NULL, diff --git a/src/sio/sio_fdc37m60x.c b/src/sio/sio_fdc37m60x.c index b98801ff2..1b36ad996 100644 --- a/src/sio/sio_fdc37m60x.c +++ b/src/sio/sio_fdc37m60x.c @@ -317,6 +317,7 @@ fdc37m60x_init(const device_t *info) const device_t fdc37m60x_device = { "SMSC FDC37M60X", + "fdc37m60x", 0, 0x03f0, fdc37m60x_init, @@ -330,6 +331,7 @@ const device_t fdc37m60x_device = { const device_t fdc37m60x_370_device = { "SMSC FDC37M60X with 10K Pull Up Resistor", + "fdc37m60x_370", 0, 0x0370, fdc37m60x_init, diff --git a/src/sio/sio_it8661f.c b/src/sio/sio_it8661f.c index 3bfc317ac..565feb72c 100644 --- a/src/sio/sio_it8661f.c +++ b/src/sio/sio_it8661f.c @@ -338,6 +338,7 @@ it8661f_init(const device_t *info) const device_t it8661f_device = { "ITE IT8661F", + "it8661f", 0, 0, it8661f_init, diff --git a/src/sio/sio_pc87306.c b/src/sio/sio_pc87306.c index 78883169f..2b72e3de1 100644 --- a/src/sio/sio_pc87306.c +++ b/src/sio/sio_pc87306.c @@ -421,6 +421,7 @@ pc87306_init(const device_t *info) const device_t pc87306_device = { "National Semiconductor PC87306 Super I/O", + "pc87306", 0, 0, pc87306_init, pc87306_close, NULL, diff --git a/src/sio/sio_pc87307.c b/src/sio/sio_pc87307.c index 08cfe0364..24432c670 100644 --- a/src/sio/sio_pc87307.c +++ b/src/sio/sio_pc87307.c @@ -593,6 +593,7 @@ pc87307_init(const device_t *info) const device_t pc87307_device = { "National Semiconductor PC87307 Super I/O", + "pc87307", 0, 0x1c0, pc87307_init, pc87307_close, NULL, @@ -603,6 +604,7 @@ const device_t pc87307_device = { const device_t pc87307_15c_device = { "National Semiconductor PC87307 Super I/O (Port 15Ch)", + "pc87307_15c", 0, 0x2c0, pc87307_init, pc87307_close, NULL, @@ -613,6 +615,7 @@ const device_t pc87307_15c_device = { const device_t pc87307_both_device = { "National Semiconductor PC87307 Super I/O (Ports 2Eh and 15Ch)", + "pc87307_both", 0, 0x3c0, pc87307_init, pc87307_close, NULL, @@ -623,6 +626,7 @@ const device_t pc87307_both_device = { const device_t pc97307_device = { "National Semiconductor PC97307 Super I/O", + "pc97307", 0, 0x1cf, pc87307_init, pc87307_close, NULL, diff --git a/src/sio/sio_pc87309.c b/src/sio/sio_pc87309.c index 5179dbb6a..ad214ff6a 100644 --- a/src/sio/sio_pc87309.c +++ b/src/sio/sio_pc87309.c @@ -474,6 +474,7 @@ pc87309_init(const device_t *info) const device_t pc87309_device = { "National Semiconductor PC87309 Super I/O", + "pc87309", 0, 0xe0, pc87309_init, pc87309_close, NULL, @@ -484,6 +485,7 @@ const device_t pc87309_device = { const device_t pc87309_15c_device = { "National Semiconductor PC87309 Super I/O (Port 15Ch)", + "pc87309_15c", 0, 0x1e0, pc87309_init, pc87309_close, NULL, diff --git a/src/sio/sio_pc87310.c b/src/sio/sio_pc87310.c index 41322a818..424a9524b 100644 --- a/src/sio/sio_pc87310.c +++ b/src/sio/sio_pc87310.c @@ -266,6 +266,7 @@ pc87310_init(const device_t *info) const device_t pc87310_device = { "National Semiconductor PC87310 Super I/O", + "pc87310", 0, 0, pc87310_init, pc87310_close, NULL, @@ -275,6 +276,7 @@ const device_t pc87310_device = { const device_t pc87310_ide_device = { "National Semiconductor PC87310 Super I/O with IDE functionality", + "pc87310_ide", 0, 1, pc87310_init, pc87310_close, NULL, diff --git a/src/sio/sio_pc87311.c b/src/sio/sio_pc87311.c index c4cbe2056..6406c766d 100644 --- a/src/sio/sio_pc87311.c +++ b/src/sio/sio_pc87311.c @@ -274,6 +274,7 @@ pc87311_init(const device_t *info) const device_t pc87311_device = { "National Semiconductor PC87311", + "pc87311", 0, 0, pc87311_init, @@ -286,6 +287,7 @@ const device_t pc87311_device = { const device_t pc87311_ide_device = { "National Semiconductor PC87311 with IDE functionality", + "pc87311_ide", 0, 1, pc87311_init, diff --git a/src/sio/sio_pc87332.c b/src/sio/sio_pc87332.c index c5eb40e60..131ccec3b 100644 --- a/src/sio/sio_pc87332.c +++ b/src/sio/sio_pc87332.c @@ -338,6 +338,7 @@ pc87332_init(const device_t *info) const device_t pc87332_device = { "National Semiconductor PC87332 Super I/O", + "pc87332", 0, 0x00, pc87332_init, pc87332_close, NULL, @@ -348,16 +349,19 @@ const device_t pc87332_device = { const device_t pc87332_398_device = { "National Semiconductor PC87332 Super I/O (Port 398h)", + "pc87332_398", 0, 0x01, pc87332_init, pc87332_close, NULL, { NULL }, NULL, NULL, + "pc87332", NULL }; const device_t pc87332_398_ide_device = { "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE)", + "pc87332_398_ide", 0, 0x101, pc87332_init, pc87332_close, NULL, @@ -368,6 +372,7 @@ const device_t pc87332_398_ide_device = { const device_t pc87332_398_ide_sec_device = { "National Semiconductor PC87332 Super I/O (Port 398h) (With Secondary IDE)", + "pc87332_398_ide_sec", 0, 0x201, pc87332_init, pc87332_close, NULL, @@ -378,6 +383,7 @@ const device_t pc87332_398_ide_sec_device = { const device_t pc87332_398_ide_fdcon_device = { "National Semiconductor PC87332 Super I/O (Port 398h) (With IDE and FDC on)", + "pc87332_398_ide_fdcon", 0, 0x10101, pc87332_init, pc87332_close, NULL, diff --git a/src/sio/sio_prime3b.c b/src/sio/sio_prime3b.c index 3277aa306..9e71f3124 100644 --- a/src/sio/sio_prime3b.c +++ b/src/sio/sio_prime3b.c @@ -269,6 +269,7 @@ prime3b_init(const device_t *info) const device_t prime3b_device = { "Goldstar Prime3B", + "prime3b", 0, 0, prime3b_init, @@ -281,6 +282,7 @@ const device_t prime3b_device = { const device_t prime3b_ide_device = { "Goldstar Prime3B with IDE functionality", + "prime3b_ide", 0, 1, prime3b_init, diff --git a/src/sio/sio_prime3c.c b/src/sio/sio_prime3c.c index 2d2d0435e..1b4bde5d4 100644 --- a/src/sio/sio_prime3c.c +++ b/src/sio/sio_prime3c.c @@ -319,6 +319,7 @@ prime3c_init(const device_t *info) const device_t prime3c_device = { "Goldstar Prime3C", + "prime3c", 0, 0, prime3c_init, @@ -331,6 +332,7 @@ const device_t prime3c_device = { const device_t prime3c_ide_device = { "Goldstar Prime3C with IDE functionality", + "prime3c_ide", 0, 1, prime3c_init, diff --git a/src/sio/sio_um8669f.c b/src/sio/sio_um8669f.c index 91b5c8d56..aeef3a51e 100644 --- a/src/sio/sio_um8669f.c +++ b/src/sio/sio_um8669f.c @@ -303,6 +303,7 @@ um8669f_init(const device_t *info) const device_t um8669f_device = { "UMC UM8669F Super I/O", + "um8669f", 0, 0, um8669f_init, um8669f_close, NULL, diff --git a/src/sio/sio_vt82c686.c b/src/sio/sio_vt82c686.c index 007ae6d93..3f6229f15 100644 --- a/src/sio/sio_vt82c686.c +++ b/src/sio/sio_vt82c686.c @@ -304,6 +304,7 @@ vt82c686_init(const device_t *info) const device_t via_vt82c686_sio_device = { "VIA VT82C686 Integrated Super I/O", + "via_vt82c686_sio", 0, 0, vt82c686_init, vt82c686_close, NULL, diff --git a/src/sio/sio_w83787f.c b/src/sio/sio_w83787f.c index 6affb7e1c..5cd7017bc 100644 --- a/src/sio/sio_w83787f.c +++ b/src/sio/sio_w83787f.c @@ -447,6 +447,7 @@ w83787f_init(const device_t *info) const device_t w83787f_device = { "Winbond W83787F/IF Super I/O", + "w83787f", 0, 0x09, w83787f_init, w83787f_close, NULL, @@ -456,6 +457,7 @@ const device_t w83787f_device = { const device_t w83787f_ide_device = { "Winbond W83787F/IF Super I/O (With IDE)", + "w83787f_ide", 0, 0x19, w83787f_init, w83787f_close, NULL, @@ -465,6 +467,7 @@ const device_t w83787f_ide_device = { const device_t w83787f_ide_en_device = { "Winbond W83787F/IF Super I/O (With IDE Enabled)", + "w83787f_ide_en", 0, 0x59, w83787f_init, w83787f_close, NULL, @@ -474,6 +477,7 @@ const device_t w83787f_ide_en_device = { const device_t w83787f_ide_sec_device = { "Winbond W83787F/IF Super I/O (With Secondary IDE)", + "w83787f_ide_sec", 0, 0x39, w83787f_init, w83787f_close, NULL, diff --git a/src/sio/sio_w83877f.c b/src/sio/sio_w83877f.c index a053ff371..d1433cb1f 100644 --- a/src/sio/sio_w83877f.c +++ b/src/sio/sio_w83877f.c @@ -462,6 +462,7 @@ w83877f_init(const device_t *info) const device_t w83877f_device = { "Winbond W83877F Super I/O", + "w83877f", 0, 0x0a05, w83877f_init, w83877f_close, NULL, @@ -472,6 +473,7 @@ const device_t w83877f_device = { const device_t w83877f_president_device = { "Winbond W83877F Super I/O (President)", + "w83877f_president", 0, 0x0a04, w83877f_init, w83877f_close, NULL, @@ -482,6 +484,7 @@ const device_t w83877f_president_device = { const device_t w83877tf_device = { "Winbond W83877TF Super I/O", + "w83877tf", 0, 0x0c04, w83877f_init, w83877f_close, NULL, @@ -492,6 +495,7 @@ const device_t w83877tf_device = { const device_t w83877tf_acorp_device = { "Winbond W83877TF Super I/O", + "w83877tf_acorp", 0, 0x0c05, w83877f_init, w83877f_close, NULL, diff --git a/src/sio/sio_w83977f.c b/src/sio/sio_w83977f.c index 46a75ac9e..66678d741 100644 --- a/src/sio/sio_w83977f.c +++ b/src/sio/sio_w83977f.c @@ -569,6 +569,7 @@ w83977f_init(const device_t *info) const device_t w83977f_device = { "Winbond W83977F Super I/O", + "w83977f", 0, 0, w83977f_init, w83977f_close, NULL, @@ -579,6 +580,7 @@ const device_t w83977f_device = { const device_t w83977f_370_device = { "Winbond W83977F Super I/O (Port 370h)", + "w83977f_370", 0, 0x40, w83977f_init, w83977f_close, NULL, @@ -589,6 +591,7 @@ const device_t w83977f_370_device = { const device_t w83977tf_device = { "Winbond W83977TF Super I/O", + "w83977tf", 0, 1, w83977f_init, w83977f_close, NULL, @@ -599,6 +602,7 @@ const device_t w83977tf_device = { const device_t w83977ef_device = { "Winbond W83977TF Super I/O", + "w83977ef", 0, 2, w83977f_init, w83977f_close, NULL, @@ -609,6 +613,7 @@ const device_t w83977ef_device = { const device_t w83977ef_370_device = { "Winbond W83977TF Super I/O (Port 370h)", + "w83977ef_370", 0, 0x42, w83977f_init, w83977f_close, NULL, diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c index 1a3ae2764..06250c2bf 100644 --- a/src/sound/midi_fluidsynth.c +++ b/src/sound/midi_fluidsynth.c @@ -556,6 +556,7 @@ static const device_config_t fluidsynth_config[] = const device_t fluidsynth_device = { "FluidSynth", + "fluidsynth", 0, 0, fluidsynth_init, diff --git a/src/sound/midi_mt32.c b/src/sound/midi_mt32.c index ed87411cc..595023d52 100644 --- a/src/sound/midi_mt32.c +++ b/src/sound/midi_mt32.c @@ -319,6 +319,7 @@ static const device_config_t mt32_config[] = const device_t mt32_device = { "Roland MT-32 Emulation", + "mt32", 0, 0, mt32_init, @@ -333,6 +334,7 @@ const device_t mt32_device = const device_t cm32l_device = { "Roland CM-32L Emulation", + "cm32l", 0, 0, cm32l_init, diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index b6df5c48b..b2275fdf7 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -264,6 +264,7 @@ static const device_config_t midi_input_config[] = const device_t rtmidi_device = { SYSTEM_MIDI_NAME, + "rtmidi", 0, 0, rtmidi_init, rtmidi_close, @@ -278,6 +279,7 @@ const device_t rtmidi_device = const device_t rtmidi_input_device = { MIDI_INPUT_NAME, + "rtmidi_input", 0, 0, rtmidi_input_init, rtmidi_input_close, diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c index a868b2acd..2f52892e9 100644 --- a/src/sound/snd_ac97_codec.c +++ b/src/sound/snd_ac97_codec.c @@ -646,6 +646,7 @@ ac97_codec_get(int model) const device_t ad1881_device = { "Analog Devices AD1881", + "ad1881", DEVICE_AC97, AC97_CODEC_AD1881, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -658,6 +659,7 @@ const device_t ad1881_device = const device_t ak4540_device = { "Asahi Kasei AK4540", + "ak4540", DEVICE_AC97, AC97_CODEC_AK4540, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -670,6 +672,7 @@ const device_t ak4540_device = const device_t alc100_device = { "Avance Logic ALC100", + "alc100", DEVICE_AC97, AC97_CODEC_ALC100, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -682,6 +685,7 @@ const device_t alc100_device = const device_t cs4297_device = { "Crystal CS4297", + "cs4297", DEVICE_AC97, AC97_CODEC_CS4297, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -694,6 +698,7 @@ const device_t cs4297_device = const device_t cs4297a_device = { "Crystal CS4297A", + "cs4297a", DEVICE_AC97, AC97_CODEC_CS4297A, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -706,6 +711,7 @@ const device_t cs4297a_device = const device_t stac9708_device = { "SigmaTel STAC9708", + "stac9708", DEVICE_AC97, AC97_CODEC_STAC9708, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -718,6 +724,7 @@ const device_t stac9708_device = const device_t stac9721_device = { "SigmaTel STAC9721", + "stac9721", DEVICE_AC97, AC97_CODEC_STAC9721, ac97_codec_init, ac97_codec_close, ac97_codec_reset, @@ -730,6 +737,7 @@ const device_t stac9721_device = const device_t wm9701a_device = { "Wolfson WM9701A", + "wm9701a", DEVICE_AC97, AC97_CODEC_WM9701A, ac97_codec_init, ac97_codec_close, ac97_codec_reset, diff --git a/src/sound/snd_ac97_via.c b/src/sound/snd_ac97_via.c index aea9d6ee0..876701bc7 100644 --- a/src/sound/snd_ac97_via.c +++ b/src/sound/snd_ac97_via.c @@ -829,9 +829,10 @@ ac97_via_close(void *priv) } -const device_t ac97_via_device = { +const device_t ac97_via_device = "VIA VT82C686 Integrated AC97 Controller", + "ac97_via", DEVICE_PCI, 0, ac97_via_init, ac97_via_close, NULL, diff --git a/src/sound/snd_adlib.c b/src/sound/snd_adlib.c index ff55cad84..ca6916ad8 100644 --- a/src/sound/snd_adlib.c +++ b/src/sound/snd_adlib.c @@ -127,6 +127,7 @@ void adlib_close(void *p) const device_t adlib_device = { "AdLib", + "adlib", DEVICE_ISA, 0, adlib_init, adlib_close, NULL, @@ -137,6 +138,7 @@ const device_t adlib_device = const device_t adlib_mca_device = { "AdLib (MCA)", + "adlib_mca", DEVICE_MCA, 0, adlib_init, adlib_close, NULL, diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c index fea4052d2..6cc3cba79 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/sound/snd_adlibgold.c @@ -1024,6 +1024,7 @@ static const device_config_t adgold_config[] = const device_t adgold_device = { "AdLib Gold", + "adgold", DEVICE_ISA, 0, adgold_init, adgold_close, diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c index 91d04a311..6e88d401b 100644 --- a/src/sound/snd_audiopci.c +++ b/src/sound/snd_audiopci.c @@ -2103,6 +2103,7 @@ static const device_config_t es1371_config[] = const device_t es1371_device = { "Ensoniq AudioPCI (ES1371)", + "es1371", DEVICE_PCI, 0, es1371_init, @@ -2117,6 +2118,7 @@ const device_t es1371_device = const device_t es1371_onboard_device = { "Ensoniq AudioPCI (ES1371) (On-Board)", + "es1371_onboard", DEVICE_PCI, 1, es1371_init, diff --git a/src/sound/snd_azt2316a.c b/src/sound/snd_azt2316a.c index 405d929a6..fd8bf6555 100644 --- a/src/sound/snd_azt2316a.c +++ b/src/sound/snd_azt2316a.c @@ -1466,6 +1466,7 @@ static const device_config_t azt2316a_config[] = const device_t azt2316a_device = { "Aztech Sound Galaxy Pro 16 AB (Washington)", + "azt2316a", DEVICE_ISA | DEVICE_AT, SB_SUBTYPE_CLONE_AZT2316A_0X11, azt_init, azt_close, NULL, { NULL }, @@ -1477,6 +1478,7 @@ const device_t azt2316a_device = const device_t azt1605_device = { "Aztech Sound Galaxy Nova 16 Extra (Clinton)", + "azt1605", DEVICE_ISA | DEVICE_AT, SB_SUBTYPE_CLONE_AZT1605_0X0C, azt_init, azt_close, NULL, { NULL }, diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c index 15a065776..b0f979849 100644 --- a/src/sound/snd_cms.c +++ b/src/sound/snd_cms.c @@ -207,6 +207,7 @@ static const device_config_t cms_config[] = const device_t cms_device = { "Creative Music System / Game Blaster", + "cms", DEVICE_ISA, 0, cms_init, cms_close, NULL, { NULL }, NULL, NULL, diff --git a/src/sound/snd_cs423x.c b/src/sound/snd_cs423x.c index c5b349c9e..d159182e4 100644 --- a/src/sound/snd_cs423x.c +++ b/src/sound/snd_cs423x.c @@ -820,6 +820,7 @@ cs423x_speed_changed(void *priv) const device_t cs4236b_device = { "Crystal CS4236B", + "cs4236b", DEVICE_ISA | DEVICE_AT, CRYSTAL_CS4236B, cs423x_init, cs423x_close, cs423x_reset, @@ -832,6 +833,7 @@ const device_t cs4236b_device = const device_t cs4237b_device = { "Crystal CS4237B", + "cs4237b", DEVICE_ISA | DEVICE_AT, CRYSTAL_CS4237B, cs423x_init, cs423x_close, cs423x_reset, @@ -844,6 +846,7 @@ const device_t cs4237b_device = const device_t cs4238b_device = { "Crystal CS4238B", + "cs4238b", DEVICE_ISA | DEVICE_AT, CRYSTAL_CS4238B, cs423x_init, cs423x_close, cs423x_reset, diff --git a/src/sound/snd_gus.c b/src/sound/snd_gus.c index afe19bc2a..6cdf26ff6 100644 --- a/src/sound/snd_gus.c +++ b/src/sound/snd_gus.c @@ -1315,6 +1315,7 @@ static const device_config_t gus_config[] = { const device_t gus_device = { "Gravis UltraSound", + "gus", DEVICE_ISA | DEVICE_AT, 0, gus_init, gus_close, NULL, diff --git a/src/sound/snd_mpu401.c b/src/sound/snd_mpu401.c index 12e92b905..7183195d6 100644 --- a/src/sound/snd_mpu401.c +++ b/src/sound/snd_mpu401.c @@ -1902,6 +1902,7 @@ static const device_config_t mpu401_standalone_mca_config[] = const device_t mpu401_device = { "Roland MPU-IPC-T", + "mpu401", DEVICE_ISA, 0, mpu401_standalone_init, mpu401_standalone_close, NULL, { NULL }, @@ -1912,6 +1913,7 @@ const device_t mpu401_device = { const device_t mpu401_mca_device = { "Roland MPU-IMC", + "mpu401_mca", DEVICE_MCA, 0, mpu401_standalone_init, mpu401_standalone_close, NULL, { NULL }, diff --git a/src/sound/snd_pas16.c b/src/sound/snd_pas16.c index 483b7548c..65a0026fb 100644 --- a/src/sound/snd_pas16.c +++ b/src/sound/snd_pas16.c @@ -759,6 +759,7 @@ static void pas16_close(void *p) const device_t pas16_device = { "Pro Audio Spectrum 16", + "pas16", DEVICE_ISA | DEVICE_NOT_WORKING, 0, pas16_init, pas16_close, NULL, diff --git a/src/sound/snd_pssj.c b/src/sound/snd_pssj.c index a69420c2e..b6b86705d 100644 --- a/src/sound/snd_pssj.c +++ b/src/sound/snd_pssj.c @@ -265,6 +265,7 @@ static const device_config_t pssj_isa_config[] = const device_t pssj_device = { "Tandy PSSJ", + "pssj", 0, 0, pssj_init, @@ -278,6 +279,7 @@ const device_t pssj_device = const device_t pssj_1e0_device = { "Tandy PSSJ (port 1e0h)", + "pssj_1e0", 0, 0, pssj_1e0_init, diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index ef0fa626d..5fbfa74ba 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -2603,6 +2603,7 @@ static const device_config_t sb_awe64_gold_config[] = const device_t sb_1_device = { "Sound Blaster v1.0", + "sb_1", DEVICE_ISA, 0, sb_1_init, sb_close, NULL, { NULL }, @@ -2614,6 +2615,7 @@ const device_t sb_1_device = const device_t sb_15_device = { "Sound Blaster v1.5", + "sb_15", DEVICE_ISA, 0, sb_15_init, sb_close, NULL, { NULL }, @@ -2625,6 +2627,7 @@ const device_t sb_15_device = const device_t sb_mcv_device = { "Sound Blaster MCV", + "sb_mcv", DEVICE_MCA, 0, sb_mcv_init, sb_close, NULL, { NULL }, @@ -2636,6 +2639,7 @@ const device_t sb_mcv_device = const device_t sb_2_device = { "Sound Blaster v2.0", + "sb_2", DEVICE_ISA, 0, sb_2_init, sb_close, NULL, { NULL }, @@ -2647,6 +2651,7 @@ const device_t sb_2_device = const device_t sb_pro_v1_device = { "Sound Blaster Pro v1", + "sb_pro_v1", DEVICE_ISA, 0, sb_pro_v1_init, sb_close, NULL, { NULL }, @@ -2658,6 +2663,7 @@ const device_t sb_pro_v1_device = const device_t sb_pro_v2_device = { "Sound Blaster Pro v2", + "sb_pro_v2", DEVICE_ISA, 0, sb_pro_v2_init, sb_close, NULL, { NULL }, @@ -2669,6 +2675,7 @@ const device_t sb_pro_v2_device = const device_t sb_pro_mcv_device = { "Sound Blaster Pro MCV", + "sb_pro_mcv", DEVICE_MCA, 0, sb_pro_mcv_init, sb_close, NULL, { NULL }, @@ -2680,6 +2687,7 @@ const device_t sb_pro_mcv_device = const device_t sb_pro_compat_device = { "Sound Blaster Pro (Compatibility)", + "sb_pro_compat", DEVICE_ISA | DEVICE_AT, 0, sb_pro_compat_init, sb_close, NULL, { NULL }, @@ -2691,6 +2699,7 @@ const device_t sb_pro_compat_device = const device_t sb_16_device = { "Sound Blaster 16", + "sb_16", DEVICE_ISA | DEVICE_AT, 0, sb_16_init, sb_close, NULL, { NULL }, @@ -2702,6 +2711,7 @@ const device_t sb_16_device = const device_t sb_16_pnp_device = { "Sound Blaster 16 PnP", + "sb_16_pnp", DEVICE_ISA | DEVICE_AT, 0, sb_16_pnp_init, sb_close, NULL, { NULL }, @@ -2713,6 +2723,7 @@ const device_t sb_16_pnp_device = const device_t sb_32_pnp_device = { "Sound Blaster 32 PnP", + "sb_32_pnp", DEVICE_ISA | DEVICE_AT, 0, sb_awe32_pnp_init, sb_awe32_close, NULL, @@ -2726,6 +2737,7 @@ const device_t sb_32_pnp_device = const device_t sb_awe32_device = { "Sound Blaster AWE32", + "sb_awe32", DEVICE_ISA | DEVICE_AT, 0, sb_awe32_init, sb_awe32_close, NULL, @@ -2738,6 +2750,7 @@ const device_t sb_awe32_device = const device_t sb_awe32_pnp_device = { "Sound Blaster AWE32 PnP", + "sb_awe32_pnp", DEVICE_ISA | DEVICE_AT, 1, sb_awe32_pnp_init, sb_awe32_close, NULL, @@ -2750,6 +2763,7 @@ const device_t sb_awe32_pnp_device = const device_t sb_awe64_gold_device = { "Sound Blaster AWE64 Gold", + "sb_awe64_gold", DEVICE_ISA | DEVICE_AT, 2, sb_awe32_pnp_init, sb_awe32_close, NULL, diff --git a/src/sound/snd_sn76489.c b/src/sound/snd_sn76489.c index b31bc0734..6f60a077e 100644 --- a/src/sound/snd_sn76489.c +++ b/src/sound/snd_sn76489.c @@ -234,6 +234,7 @@ void sn76489_device_close(void *p) const device_t sn76489_device = { "TI SN74689 PSG", + "sn76489", 0, 0, sn76489_device_init, @@ -244,6 +245,7 @@ const device_t sn76489_device = const device_t ncr8496_device = { "NCR8496 PSG", + "ncr8496", 0, 0, ncr8496_device_init, diff --git a/src/sound/snd_ssi2001.c b/src/sound/snd_ssi2001.c index 400700131..1aba2210a 100644 --- a/src/sound/snd_ssi2001.c +++ b/src/sound/snd_ssi2001.c @@ -118,6 +118,7 @@ static const device_config_t ssi2001_config[] = const device_t ssi2001_device = { "Innovation SSI-2001", + "ssi2001", DEVICE_ISA, 0, ssi2001_init, ssi2001_close, NULL, { NULL }, NULL, NULL, diff --git a/src/sound/snd_wss.c b/src/sound/snd_wss.c index 9017fe2c1..2f9639e1f 100644 --- a/src/sound/snd_wss.c +++ b/src/sound/snd_wss.c @@ -244,6 +244,7 @@ static const device_config_t wss_config[] = { const device_t wss_device = { "Windows Sound System", + "wss", DEVICE_ISA | DEVICE_AT, 0, wss_init, wss_close, NULL, { NULL }, @@ -255,6 +256,7 @@ const device_t wss_device = const device_t ncr_business_audio_device = { "NCR Business Audio", + "ncr_business_audio", DEVICE_MCA, 0, ncr_audio_init, wss_close, NULL, { NULL }, diff --git a/src/usb.c b/src/usb.c index dce1a31af..784f8f151 100644 --- a/src/usb.c +++ b/src/usb.c @@ -413,6 +413,7 @@ usb_init(const device_t *info) const device_t usb_device = { "Universal Serial Bus", + "usb", DEVICE_PCI, 0, usb_init, diff --git a/src/video/agpgart.c b/src/video/agpgart.c index 731cc3f71..05bf2d631 100644 --- a/src/video/agpgart.c +++ b/src/video/agpgart.c @@ -183,6 +183,7 @@ agpgart_close(void *priv) const device_t agpgart_device = { "AGP Graphics Address Remapping Table", + "agpgart", DEVICE_PCI, 0, agpgart_init, agpgart_close, NULL, diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c index d5c7a2bbd..550e3c088 100644 --- a/src/video/vid_ati18800.c +++ b/src/video/vid_ati18800.c @@ -298,6 +298,7 @@ const device_t ati18800_wonder_device = const device_t ati18800_vga88_device = { "ATI-18800-1", + "ati18800_vga88", DEVICE_ISA, ATI18800_VGA88, ati18800_init, ati18800_close, @@ -311,6 +312,7 @@ const device_t ati18800_vga88_device = const device_t ati18800_device = { "ATI-18800-5", + "ati18800", DEVICE_ISA, ATI18800_EDGE16, ati18800_init, ati18800_close, diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c index f4a40f89e..67e683ed1 100644 --- a/src/video/vid_ati28800.c +++ b/src/video/vid_ati28800.c @@ -759,6 +759,7 @@ static const device_config_t ati28800_wonderxl_config[] = const device_t ati28800_device = { "ATI 28800-5 (ATI VGA Charger)", + "ati28800", DEVICE_ISA, 0, ati28800_init, ati28800_close, NULL, @@ -771,6 +772,7 @@ const device_t ati28800_device = const device_t ati28800k_device = { "ATI Korean VGA", + "ati28800k", DEVICE_ISA, 0, ati28800k_init, ati28800_close, NULL, @@ -783,6 +785,7 @@ const device_t ati28800k_device = const device_t ati28800k_spc4620p_device = { "ATI Korean VGA On-Board SPC-4620P", + "ati28800k_spc4620p", DEVICE_ISA, 1, ati28800k_init, ati28800_close, NULL, @@ -794,6 +797,7 @@ const device_t ati28800k_spc4620p_device = const device_t ati28800k_spc6033p_device = { "ATI Korean VGA On-Board SPC-6033P", + "ati28800k_spc6033p", DEVICE_ISA, 2, ati28800k_init, ati28800_close, NULL, @@ -805,6 +809,7 @@ const device_t ati28800k_spc6033p_device = const device_t compaq_ati28800_device = { "ATI 28800-5 (ATI VGA Wonder XL)", + "compaq_ati28800", DEVICE_ISA, VGAWONDERXL, ati28800_init, ati28800_close, NULL, @@ -818,6 +823,7 @@ const device_t compaq_ati28800_device = const device_t ati28800_wonderxl24_device = { "ATI-28800 (VGA Wonder XL24)", + "ati28800_wonderxl24", DEVICE_ISA, VGAWONDERXL24, ati28800_init, ati28800_close, NULL, diff --git a/src/video/vid_ati68860_ramdac.c b/src/video/vid_ati68860_ramdac.c index b5165dcc6..2a7299d00 100644 --- a/src/video/vid_ati68860_ramdac.c +++ b/src/video/vid_ati68860_ramdac.c @@ -290,6 +290,7 @@ ati68860_ramdac_close(void *priv) const device_t ati68860_ramdac_device = { "ATI-68860 RAMDAC", + "ati68860_ramdac", 0, 0, ati68860_ramdac_init, ati68860_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c index 1e19adf84..d6291cd5e 100644 --- a/src/video/vid_ati_mach64.c +++ b/src/video/vid_ati_mach64.c @@ -3531,6 +3531,7 @@ static const device_config_t mach64vt2_config[] = const device_t mach64gx_isa_device = { "ATI Mach64GX ISA", + "mach64gx_isa", DEVICE_AT | DEVICE_ISA, 0, mach64gx_init, mach64_close, NULL, @@ -3543,6 +3544,7 @@ const device_t mach64gx_isa_device = const device_t mach64gx_vlb_device = { "ATI Mach64GX VLB", + "mach64gx_vlb", DEVICE_VLB, 0, mach64gx_init, mach64_close, NULL, @@ -3555,6 +3557,7 @@ const device_t mach64gx_vlb_device = const device_t mach64gx_pci_device = { "ATI Mach64GX PCI", + "mach64gx_pci", DEVICE_PCI, 0, mach64gx_init, mach64_close, NULL, @@ -3567,6 +3570,7 @@ const device_t mach64gx_pci_device = const device_t mach64vt2_device = { "ATI Mach64VT2", + "mach64vt2", DEVICE_PCI, 0, mach64vt2_init, mach64_close, NULL, diff --git a/src/video/vid_att20c49x_ramdac.c b/src/video/vid_att20c49x_ramdac.c index 4c09f1e8f..e533015b0 100644 --- a/src/video/vid_att20c49x_ramdac.c +++ b/src/video/vid_att20c49x_ramdac.c @@ -178,6 +178,7 @@ att49x_ramdac_close(void *priv) const device_t att490_ramdac_device = { "AT&T 20c490 RAMDAC", + "att490_ramdac", 0, ATT_490, att49x_ramdac_init, att49x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -186,6 +187,7 @@ const device_t att490_ramdac_device = const device_t att491_ramdac_device = { "AT&T 20c491 RAMDAC", + "att491_ramdac", 0, ATT_491, att49x_ramdac_init, att49x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -194,6 +196,7 @@ const device_t att491_ramdac_device = const device_t att492_ramdac_device = { "AT&T 20c492 RAMDAC", + "att492_ramdac", 0, ATT_492, att49x_ramdac_init, att49x_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_att2xc498_ramdac.c b/src/video/vid_att2xc498_ramdac.c index 747ffe75c..122a97d2c 100644 --- a/src/video/vid_att2xc498_ramdac.c +++ b/src/video/vid_att2xc498_ramdac.c @@ -180,6 +180,7 @@ att498_ramdac_close(void *priv) const device_t att498_ramdac_device = { "AT&T 22c498 RAMDAC", + "att498_ramdac", 0, 0, att498_ramdac_init, att498_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_av9194.c b/src/video/vid_av9194.c index a01946e26..a2e208621 100644 --- a/src/video/vid_av9194.c +++ b/src/video/vid_av9194.c @@ -98,6 +98,7 @@ av9194_init(const device_t *info) const device_t av9194_device = { "AV9194 Clock Generator", + "av9194", 0, 0, av9194_init, NULL, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_bt48x_ramdac.c b/src/video/vid_bt48x_ramdac.c index 20479ba47..0d02922ae 100644 --- a/src/video/vid_bt48x_ramdac.c +++ b/src/video/vid_bt48x_ramdac.c @@ -503,6 +503,7 @@ bt48x_ramdac_close(void *priv) const device_t bt484_ramdac_device = { "Brooktree Bt484 RAMDAC", + "bt484_ramdac", 0, BT484, bt48x_ramdac_init, bt48x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -511,6 +512,7 @@ const device_t bt484_ramdac_device = const device_t att20c504_ramdac_device = { "AT&T 20c504 RAMDAC", + "att20c504_ramdac", 0, ATT20C504, bt48x_ramdac_init, bt48x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -519,6 +521,7 @@ const device_t att20c504_ramdac_device = const device_t bt485_ramdac_device = { "Brooktree Bt485 RAMDAC", + "bt485_ramdac", 0, BT485, bt48x_ramdac_init, bt48x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -527,6 +530,7 @@ const device_t bt485_ramdac_device = const device_t att20c505_ramdac_device = { "AT&T 20c505 RAMDAC", + "att20c505_ramdac", 0, ATT20C505, bt48x_ramdac_init, bt48x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -535,6 +539,7 @@ const device_t att20c505_ramdac_device = const device_t bt485a_ramdac_device = { "Brooktree Bt485A RAMDAC", + "bt485a_ramdac", 0, BT485A, bt48x_ramdac_init, bt48x_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c index ef3f2c4ef..651039517 100644 --- a/src/video/vid_cga.c +++ b/src/video/vid_cga.c @@ -641,6 +641,7 @@ const device_config_t cga_config[] = const device_t cga_device = { "CGA", + "cga", DEVICE_ISA, 0, cga_standalone_init, cga_close, diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index 620f5e8dc..317b32071 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -4517,6 +4517,7 @@ static const device_config_t gd5480_config[] = const device_t gd5401_isa_device = { "Cirrus Logic GD5401 (ISA) (ACUMOS AVGA1)", + "gd5401_isa", DEVICE_ISA, CIRRUS_ID_CLGD5401, gd54xx_init, gd54xx_close, @@ -4530,6 +4531,7 @@ const device_t gd5401_isa_device = const device_t gd5402_isa_device = { "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2)", + "gd5402_isa", DEVICE_ISA, CIRRUS_ID_CLGD5402, gd54xx_init, gd54xx_close, @@ -4543,6 +4545,7 @@ const device_t gd5402_isa_device = const device_t gd5402_onboard_device = { "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2) (On-Board)", + "gd5402_onboard", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5402 | 0x200, gd54xx_init, gd54xx_close, @@ -4556,6 +4559,7 @@ const device_t gd5402_onboard_device = const device_t gd5420_isa_device = { "Cirrus Logic GD5420 (ISA)", + "gd5420_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5420, gd54xx_init, gd54xx_close, @@ -4569,6 +4573,7 @@ const device_t gd5420_isa_device = const device_t gd5422_isa_device = { "Cirrus Logic GD5422 (ISA)", DEVICE_AT | DEVICE_ISA, + "gd5422_isa", CIRRUS_ID_CLGD5422, gd54xx_init, gd54xx_close, gd54xx_reset, @@ -4581,6 +4586,7 @@ const device_t gd5422_isa_device = { const device_t gd5424_vlb_device = { "Cirrus Logic GD5424 (VLB)", DEVICE_VLB, + "gd5424_vlb", CIRRUS_ID_CLGD5424, gd54xx_init, gd54xx_close, gd54xx_reset, @@ -4593,6 +4599,7 @@ const device_t gd5424_vlb_device = { const device_t gd5426_isa_device = { "Cirrus Logic GD5426 (ISA)", + "gd5426_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5426, gd54xx_init, @@ -4609,6 +4616,7 @@ const device_t gd5426_isa_device = const device_t gd5426_diamond_speedstar_pro_a1_isa_device = { "Cirrus Logic GD5426 (ISA) (Diamond SpeedStar Pro Rev. A1)", + "gd5426_diamond_speedstar_pro_a1_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5426 | 0x100, gd54xx_init, @@ -4623,6 +4631,7 @@ const device_t gd5426_diamond_speedstar_pro_a1_isa_device = const device_t gd5426_vlb_device = { "Cirrus Logic GD5426 (VLB)", + "gd5426_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5426, gd54xx_init, @@ -4638,6 +4647,7 @@ const device_t gd5426_vlb_device = const device_t gd5426_onboard_device = { "Cirrus Logic GD5426 (VLB) (On-Board)", + "gd5426_onboard", DEVICE_VLB, CIRRUS_ID_CLGD5426 | 0x200, gd54xx_init, @@ -4652,6 +4662,7 @@ const device_t gd5426_onboard_device = const device_t gd5428_isa_device = { "Cirrus Logic GD5428 (ISA)", + "gd5428_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4666,6 +4677,7 @@ const device_t gd5428_isa_device = const device_t gd5428_vlb_device = { "Cirrus Logic GD5428 (VLB)", + "gd5428_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4681,6 +4693,7 @@ const device_t gd5428_vlb_device = const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = { "Cirrus Logic GD5428 (VLB) (Diamond SpeedStar Pro Rev. B1)", + "gd5428_diamond_speedstar_pro_b1_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5428 | 0x100, gd54xx_init, @@ -4695,6 +4708,7 @@ const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = const device_t gd5428_mca_device = { "Cirrus Logic GD5428 (MCA) (IBM SVGA Adapter/A)", + "gd5428_mca", DEVICE_MCA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4709,6 +4723,7 @@ const device_t gd5428_mca_device = const device_t gd5428_onboard_device = { "Cirrus Logic GD5428 (ISA) (On-Board)", + "gd5428_onboard", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4723,6 +4738,7 @@ const device_t gd5428_onboard_device = const device_t gd5429_isa_device = { "Cirrus Logic GD5429 (ISA)", + "gd5429_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5429, gd54xx_init, @@ -4737,6 +4753,7 @@ const device_t gd5429_isa_device = const device_t gd5429_vlb_device = { "Cirrus Logic GD5429 (VLB)", + "gd5429_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5429, gd54xx_init, @@ -4752,6 +4769,7 @@ const device_t gd5429_vlb_device = const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device = { "Cirrus Logic GD5430 (VLB) (Diamond SpeedStar Pro SE Rev. A8)", + "gd5430_diamond_speedstar_pro_se_a8_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5430, gd54xx_init, @@ -4766,6 +4784,7 @@ const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device = const device_t gd5430_pci_device = { "Cirrus Logic GD5430 (PCI)", + "gd5430_pci", DEVICE_PCI, CIRRUS_ID_CLGD5430, gd54xx_init, @@ -4780,6 +4799,7 @@ const device_t gd5430_pci_device = const device_t gd5434_isa_device = { "Cirrus Logic GD5434 (ISA)", + "gd5434_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4795,6 +4815,7 @@ const device_t gd5434_isa_device = const device_t gd5434_diamond_speedstar_64_a3_isa_device = { "Cirrus Logic GD5434 (ISA) (Diamond SpeedStar 64 Rev. A3)", + "gd5434_diamond_speedstar_64_a3_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5434 | 0x100, gd54xx_init, @@ -4809,6 +4830,7 @@ const device_t gd5434_diamond_speedstar_64_a3_isa_device = const device_t gd5434_onboard_pci_device = { "Cirrus Logic GD5434-4 (PCI) (On-Board)", + "gd5434_onboard_pci", DEVICE_PCI, CIRRUS_ID_CLGD5434 | 0x200, gd54xx_init, @@ -4823,6 +4845,7 @@ const device_t gd5434_onboard_pci_device = const device_t gd5434_vlb_device = { "Cirrus Logic GD5434 (VLB)", + "gd5434_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4837,6 +4860,7 @@ const device_t gd5434_vlb_device = const device_t gd5434_pci_device = { "Cirrus Logic GD5434 (PCI)", + "gd5434_pci", DEVICE_PCI, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4851,6 +4875,7 @@ const device_t gd5434_pci_device = const device_t gd5436_pci_device = { "Cirrus Logic GD5436 (PCI)", + "gd5436_pci", DEVICE_PCI, CIRRUS_ID_CLGD5436, gd54xx_init, @@ -4865,6 +4890,7 @@ const device_t gd5436_pci_device = const device_t gd5440_onboard_pci_device = { "Cirrus Logic GD5440 (PCI) (On-Board)", + "gd5440_onboard_pci", DEVICE_PCI, CIRRUS_ID_CLGD5440 | 0x600, gd54xx_init, @@ -4879,6 +4905,7 @@ const device_t gd5440_onboard_pci_device = const device_t gd5440_pci_device = { "Cirrus Logic GD5440 (PCI)", + "gd5440_pci", DEVICE_PCI, CIRRUS_ID_CLGD5440 | 0x400, gd54xx_init, @@ -4893,6 +4920,7 @@ const device_t gd5440_pci_device = const device_t gd5446_pci_device = { "Cirrus Logic GD5446 (PCI)", + "gd5446_pci", DEVICE_PCI, CIRRUS_ID_CLGD5446, gd54xx_init, @@ -4907,6 +4935,7 @@ const device_t gd5446_pci_device = const device_t gd5446_stb_pci_device = { "Cirrus Logic GD5446 (PCI) (STB Nitro 64V)", + "gd5446_stb_pci", DEVICE_PCI, CIRRUS_ID_CLGD5446 | 0x100, gd54xx_init, @@ -4921,6 +4950,7 @@ const device_t gd5446_stb_pci_device = const device_t gd5480_pci_device = { "Cirrus Logic GD5480 (PCI)", + "gd5480_pci", DEVICE_PCI, CIRRUS_ID_CLGD5480, gd54xx_init, diff --git a/src/video/vid_colorplus.c b/src/video/vid_colorplus.c index 3343aaf0e..08ffb87de 100644 --- a/src/video/vid_colorplus.c +++ b/src/video/vid_colorplus.c @@ -468,6 +468,7 @@ static const device_config_t colorplus_config[] = const device_t colorplus_device = { "Colorplus", + "colorplus", DEVICE_ISA, 0, colorplus_standalone_init, colorplus_close, diff --git a/src/video/vid_compaq_cga.c b/src/video/vid_compaq_cga.c index 99655b551..821b4c4a9 100644 --- a/src/video/vid_compaq_cga.c +++ b/src/video/vid_compaq_cga.c @@ -479,6 +479,7 @@ extern const device_config_t cga_config[]; const device_t compaq_cga_device = { "Compaq CGA", + "compaq_cga", DEVICE_ISA, 0, compaq_cga_init, compaq_cga_close, @@ -492,6 +493,7 @@ const device_t compaq_cga_device = const device_t compaq_cga_2_device = { "Compaq CGA 2", + "compaq_cga_2", DEVICE_ISA, 1, compaq_cga_init, compaq_cga_close, diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c index 43f157f29..366db73c6 100644 --- a/src/video/vid_ega.c +++ b/src/video/vid_ega.c @@ -1247,6 +1247,7 @@ static const device_config_t ega_config[] = const device_t ega_device = { "EGA", + "ega", DEVICE_ISA, EGA_IBM, ega_standalone_init, ega_close, NULL, @@ -1259,6 +1260,7 @@ const device_t ega_device = const device_t cpqega_device = { "Compaq EGA", + "cpqega", DEVICE_ISA, EGA_COMPAQ, ega_standalone_init, ega_close, NULL, @@ -1271,6 +1273,7 @@ const device_t cpqega_device = const device_t sega_device = { "SuperEGA", + "sega", DEVICE_ISA, EGA_SUPEREGA, ega_standalone_init, ega_close, NULL, @@ -1283,6 +1286,7 @@ const device_t sega_device = const device_t atiega_device = { "ATI EGA Wonder 800+", + "atiega", DEVICE_ISA, EGA_ATI, ega_standalone_init, ega_close, NULL, @@ -1295,6 +1299,7 @@ const device_t atiega_device = const device_t iskra_ega_device = { "Iskra EGA (Cyrillic ROM)", + "iskra_ega", DEVICE_ISA, EGA_ISKRA, ega_standalone_init, ega_close, NULL, @@ -1307,6 +1312,7 @@ const device_t iskra_ega_device = const device_t et2000_device = { "Tseng Labs ET2000", + "et2000", DEVICE_ISA, EGA_TSENG, ega_standalone_init, ega_close, NULL, diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c index b1649b67d..b8b494a28 100644 --- a/src/video/vid_et4000.c +++ b/src/video/vid_et4000.c @@ -830,6 +830,7 @@ static const device_config_t et4000_config[] = const device_t et4000_isa_device = { "Tseng Labs ET4000AX (ISA)", + "et4000_isa", DEVICE_ISA, 0, et4000_init, et4000_close, NULL, @@ -841,6 +842,7 @@ const device_t et4000_isa_device = { const device_t et4000_mca_device = { "Tseng Labs ET4000AX (MCA)", + "et4000_mca", DEVICE_MCA, 1, et4000_init, et4000_close, NULL, @@ -852,6 +854,7 @@ const device_t et4000_mca_device = { const device_t et4000k_isa_device = { "Trigem Korean VGA (Tseng Labs ET4000AX Korean)", + "et4000k_isa", DEVICE_ISA, 2, et4000_init, et4000_close, NULL, @@ -863,6 +866,7 @@ const device_t et4000k_isa_device = { const device_t et4000k_tg286_isa_device = { "Trigem Korean VGA (Trigem 286M)", + "et4000k_tg286_isa", DEVICE_ISA, 3, et4000_init, et4000_close, NULL, @@ -874,6 +878,7 @@ const device_t et4000k_tg286_isa_device = { const device_t et4000_kasan_isa_device = { "Kasan Hangulmadang-16 VGA (Tseng Labs ET4000AX Korean)", + "et4000_kasan_isa", DEVICE_ISA, 4, et4000_init, et4000_close, NULL, diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index 1c2ca794e..61b565ce6 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -2183,6 +2183,7 @@ static const device_config_t et4000w32p_config[] = const device_t et4000w32_device = { "Tseng Labs ET4000/w32 ISA", + "et4000w32", DEVICE_ISA | DEVICE_AT, ET4000W32, et4000w32p_init, et4000w32p_close, NULL, { et4000w32_available }, @@ -2194,6 +2195,7 @@ const device_t et4000w32_device = const device_t et4000w32_onboard_device = { "Tseng Labs ET4000/w32 (ISA) (On-Board)", + "et4000w32_onboard", DEVICE_ISA | DEVICE_AT, ET4000W32, et4000w32p_init, et4000w32p_close, NULL, { et4000w32_available }, @@ -2205,6 +2207,7 @@ const device_t et4000w32_onboard_device = const device_t et4000w32i_isa_device = { "Tseng Labs ET4000/w32i Rev. B ISA", + "et4000w32i_isa", DEVICE_ISA | DEVICE_AT, ET4000W32I, et4000w32p_init, et4000w32p_close, NULL, { et4000w32i_isa_available }, @@ -2216,6 +2219,7 @@ const device_t et4000w32i_isa_device = const device_t et4000w32i_vlb_device = { "Tseng Labs ET4000/w32i Rev. B VLB", + "et4000w32i_vlb", DEVICE_VLB, ET4000W32I, et4000w32p_init, et4000w32p_close, NULL, { et4000w32i_vlb_available }, @@ -2227,6 +2231,7 @@ const device_t et4000w32i_vlb_device = const device_t et4000w32p_revc_vlb_device = { "Tseng Labs ET4000/w32p Rev. C VLB (Cardex)", + "et4000w32p_revc_vlb", DEVICE_VLB, ET4000W32P_REVC, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_revc_available }, @@ -2238,6 +2243,7 @@ const device_t et4000w32p_revc_vlb_device = const device_t et4000w32p_revc_pci_device = { "Tseng Labs ET4000/w32p Rev. C PCI (Cardex)", + "et4000w32p_revc_pci", DEVICE_PCI, ET4000W32P_REVC, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_revc_available }, @@ -2249,6 +2255,7 @@ const device_t et4000w32p_revc_pci_device = const device_t et4000w32p_noncardex_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB", + "et4000w32p_noncardex_vlb", DEVICE_VLB, ET4000W32P, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_noncardex_available }, @@ -2260,6 +2267,7 @@ const device_t et4000w32p_noncardex_vlb_device = const device_t et4000w32p_noncardex_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI", + "et4000w32p_noncardex_pci", DEVICE_PCI, ET4000W32P, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_noncardex_available }, @@ -2271,6 +2279,7 @@ const device_t et4000w32p_noncardex_pci_device = const device_t et4000w32p_cardex_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB (Cardex)", + "et4000w32p_cardex_vlb", DEVICE_VLB, ET4000W32P_CARDEX, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_cardex_available }, @@ -2282,6 +2291,7 @@ const device_t et4000w32p_cardex_vlb_device = const device_t et4000w32p_cardex_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI (Cardex)", + "et4000w32p_cardex_pci", DEVICE_PCI, ET4000W32P_CARDEX, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_cardex_available }, @@ -2293,6 +2303,7 @@ const device_t et4000w32p_cardex_pci_device = const device_t et4000w32p_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB (Diamond Stealth32)", + "et4000w32p_vlb", DEVICE_VLB, ET4000W32P_DIAMOND, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_available }, @@ -2304,6 +2315,7 @@ const device_t et4000w32p_vlb_device = const device_t et4000w32p_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI (Diamond Stealth32)", + "et4000w32p_pci", DEVICE_PCI, ET4000W32P_DIAMOND, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_available }, diff --git a/src/video/vid_f82c425.c b/src/video/vid_f82c425.c index e2f2f0677..96263e306 100644 --- a/src/video/vid_f82c425.c +++ b/src/video/vid_f82c425.c @@ -663,6 +663,7 @@ static void f82c425_speed_changed(void *p) const device_t f82c425_video_device = { "82C425 CGA LCD/CRT Controller", + "f82c425_video", 0, 0, f82c425_init, f82c425_close, NULL, { NULL }, diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c index 57854a051..820331d8b 100644 --- a/src/video/vid_genius.c +++ b/src/video/vid_genius.c @@ -792,6 +792,7 @@ genius_speed_changed(void *p) const device_t genius_device = { "Genius VHR", + "genius", DEVICE_ISA, 0, genius_init, genius_close, NULL, { genius_available }, diff --git a/src/video/vid_hercules.c b/src/video/vid_hercules.c index 1dd60a3e4..293732908 100644 --- a/src/video/vid_hercules.c +++ b/src/video/vid_hercules.c @@ -640,6 +640,7 @@ static const device_config_t hercules_config[] = { const device_t hercules_device = { "Hercules", + "hercules", DEVICE_ISA, 0, hercules_init, hercules_close, NULL, diff --git a/src/video/vid_herculesplus.c b/src/video/vid_herculesplus.c index a03a147eb..56c22fea5 100644 --- a/src/video/vid_herculesplus.c +++ b/src/video/vid_herculesplus.c @@ -725,6 +725,7 @@ static const device_config_t herculesplus_config[] = { const device_t herculesplus_device = { "Hercules Plus", + "herculesplus", DEVICE_ISA, 0, herculesplus_init, herculesplus_close, NULL, diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c index 50bedb377..eda129ba2 100644 --- a/src/video/vid_ht216.c +++ b/src/video/vid_ht216.c @@ -1694,6 +1694,7 @@ static const device_config_t radius_svga_multiview_config[] = const device_t g2_gc205_device = { "G2 GC205", + "g2_gc205", DEVICE_ISA, 0x7070, g2_gc205_init, @@ -1707,6 +1708,7 @@ const device_t g2_gc205_device = const device_t v7_vga_1024i_device = { "Video 7 VGA 1024i (HT208)", + "v7_vga_1024i", DEVICE_ISA, 0x7140, v7_vga_1024i_init, @@ -1721,6 +1723,7 @@ const device_t v7_vga_1024i_device = const device_t ht216_32_pb410a_device = { "Headland HT216-32 (Packard Bell PB410A)", + "ht216_32_pb410a", DEVICE_VLB, 0x7861, /*HT216-32*/ ht216_pb410a_init, @@ -1734,6 +1737,7 @@ const device_t ht216_32_pb410a_device = const device_t ht216_32_standalone_device = { "Headland HT216-32", + "ht216_32_standalone", DEVICE_VLB, 0x7861, /*HT216-32*/ ht216_standalone_init, @@ -1748,6 +1752,7 @@ const device_t ht216_32_standalone_device = const device_t radius_svga_multiview_isa_device = { "Radius SVGA Multiview ISA (HT209)", + "radius_svga_multiview_isa", DEVICE_ISA | DEVICE_AT, 0x7152, /*HT209*/ radius_svga_multiview_init, @@ -1762,6 +1767,7 @@ const device_t radius_svga_multiview_isa_device = const device_t radius_svga_multiview_mca_device = { "Radius SVGA Multiview MCA (HT209)", + "radius_svga_multiview_mca", DEVICE_MCA, 0x7152, /*HT209*/ radius_svga_multiview_init, diff --git a/src/video/vid_ibm_rgb528_ramdac.c b/src/video/vid_ibm_rgb528_ramdac.c index 9a20b27f5..8b2e11621 100644 --- a/src/video/vid_ibm_rgb528_ramdac.c +++ b/src/video/vid_ibm_rgb528_ramdac.c @@ -957,6 +957,7 @@ ibm_rgb528_ramdac_close(void *priv) const device_t ibm_rgb528_ramdac_device = { "IBM RGB528 RAMDAC", + "ibm_rgb528_ramdac", 0, 0, ibm_rgb528_ramdac_init, ibm_rgb528_ramdac_close, NULL, { NULL }, NULL, NULL, NULL diff --git a/src/video/vid_icd2061.c b/src/video/vid_icd2061.c index 0ba5aedc0..eb7b4e61e 100644 --- a/src/video/vid_icd2061.c +++ b/src/video/vid_icd2061.c @@ -169,6 +169,7 @@ icd2061_close(void *priv) const device_t icd2061_device = { "ICD2061 Clock Generator", + "icd2061", 0, 0, icd2061_init, icd2061_close, NULL, { NULL }, NULL, NULL @@ -178,6 +179,7 @@ const device_t icd2061_device = const device_t ics9161_device = { "ICS9161 Clock Generator", + "ics9161", 0, 0, icd2061_init, icd2061_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_ics2494.c b/src/video/vid_ics2494.c index 0e6cdddb0..75fb38f8c 100644 --- a/src/video/vid_ics2494.c +++ b/src/video/vid_ics2494.c @@ -108,6 +108,7 @@ ics2494_close(void *priv) const device_t ics2494an_305_device = { "ICS2494AN-305 Clock Generator", + "ics2494an_305", 0, 305, ics2494_init, ics2494_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_ics2595.c b/src/video/vid_ics2595.c index 900b9539e..dde720d6f 100644 --- a/src/video/vid_ics2595.c +++ b/src/video/vid_ics2595.c @@ -127,6 +127,7 @@ ics2595_setclock(void *p, double clock) const device_t ics2595_device = { "ICS2595 clock chip", + "ics2595", 0, 0, ics2595_init, ics2595_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_im1024.c b/src/video/vid_im1024.c index aebc95a5d..870f0205f 100644 --- a/src/video/vid_im1024.c +++ b/src/video/vid_im1024.c @@ -1031,6 +1031,7 @@ im1024_speed_changed(void *priv) const device_t im1024_device = { "ImageManager 1024", + "im1024", DEVICE_ISA, 0, im1024_init, im1024_close, NULL, { im1024_available }, diff --git a/src/video/vid_incolor.c b/src/video/vid_incolor.c index 64d93a5c0..d1de4a8c3 100644 --- a/src/video/vid_incolor.c +++ b/src/video/vid_incolor.c @@ -1094,6 +1094,7 @@ speed_changed(void *priv) const device_t incolor_device = { "Hercules InColor", + "incolor", DEVICE_ISA, 0, incolor_init, incolor_close, NULL, diff --git a/src/video/vid_mda.c b/src/video/vid_mda.c index f2550f134..ba95c9b81 100644 --- a/src/video/vid_mda.c +++ b/src/video/vid_mda.c @@ -358,6 +358,7 @@ static const device_config_t mda_config[] = const device_t mda_device = { "MDA", + "mda", DEVICE_ISA, 0, mda_standalone_init, mda_close, NULL, { NULL }, diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index c3f1f3593..cf5b90c63 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -5118,6 +5118,7 @@ static const device_config_t mystique_config[] = const device_t mystique_device = { "Matrox Mystique", + "mystique", DEVICE_PCI, 0, mystique_init, @@ -5133,6 +5134,7 @@ const device_t mystique_device = const device_t mystique_220_device = { "Matrox Mystique 220", + "mystique_220", DEVICE_PCI, 1, mystique_init, diff --git a/src/video/vid_nga.c b/src/video/vid_nga.c index 1c34db342..298946639 100644 --- a/src/video/vid_nga.c +++ b/src/video/vid_nga.c @@ -670,6 +670,7 @@ const device_config_t nga_config[] = const device_t nga_device = { "NCR NGA", + "nga", DEVICE_ISA, 0, nga_init, nga_close, diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c index c0dbe6610..c9f6766cb 100644 --- a/src/video/vid_oak_oti.c +++ b/src/video/vid_oak_oti.c @@ -569,6 +569,7 @@ static const device_config_t oti077_config[] = const device_t oti037c_device = { "Oak OTI-037C", + "oti037c", DEVICE_ISA, 0, oti_init, oti_close, NULL, @@ -580,6 +581,7 @@ const device_t oti037c_device = const device_t oti067_device = { "Oak OTI-067", + "oti067", DEVICE_ISA, 2, oti_init, oti_close, NULL, @@ -592,6 +594,7 @@ const device_t oti067_device = const device_t oti067_m300_device = { "Oak OTI-067 (Olivetti M300-08/15)", + "oti067_m300", DEVICE_ISA, 4, oti_init, oti_close, NULL, @@ -604,6 +607,7 @@ const device_t oti067_m300_device = const device_t oti067_ama932j_device = { "Oak OTI-067 (AMA-932J)", + "oti067_ama932j", DEVICE_ISA, 3, oti_init, oti_close, NULL, @@ -616,6 +620,7 @@ const device_t oti067_ama932j_device = const device_t oti077_device = { "Oak OTI-077", + "oti077", DEVICE_ISA, 5, oti_init, oti_close, NULL, diff --git a/src/video/vid_ogc.c b/src/video/vid_ogc.c index c562c6f11..8b0f11d2a 100644 --- a/src/video/vid_ogc.c +++ b/src/video/vid_ogc.c @@ -670,6 +670,7 @@ const device_config_t ogc_m24_config[] = const device_t ogc_m24_device = { "Olivetti M21/M24/M28 (GO317/318/380/709) video card", + "ogc_m24", DEVICE_ISA, 0, ogc_init, ogc_close, @@ -683,6 +684,7 @@ const device_t ogc_m24_device = const device_t ogc_device = { "Olivetti OGC (GO708)", + "ogc", DEVICE_ISA, 0, ogc_init, ogc_close, diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c index 3c90d5751..1ea31c82e 100644 --- a/src/video/vid_paradise.c +++ b/src/video/vid_paradise.c @@ -720,6 +720,7 @@ void paradise_force_redraw(void *p) const device_t paradise_pvga1a_pc2086_device = { "Paradise PVGA1A (Amstrad PC2086)", + "paradise_pvga1a_pc2086", 0, PVGA1A, paradise_pvga1a_pc2086_init, @@ -734,6 +735,7 @@ const device_t paradise_pvga1a_pc2086_device = const device_t paradise_pvga1a_pc3086_device = { "Paradise PVGA1A (Amstrad PC3086)", + "paradise_pvga1a_pc3086", 0, PVGA1A, paradise_pvga1a_pc3086_init, @@ -769,6 +771,7 @@ static const device_config_t paradise_pvga1a_config[] = const device_t paradise_pvga1a_ncr3302_device = { "Paradise PVGA1A (NCR 3302)", + "paradise_pvga1a_ncr3302", 0, PVGA1A, paradise_pvga1a_ncr3302_init, @@ -783,6 +786,7 @@ const device_t paradise_pvga1a_ncr3302_device = const device_t paradise_pvga1a_device = { "Paradise PVGA1A", + "paradise_pvga1a", DEVICE_ISA, PVGA1A, paradise_pvga1a_standalone_init, @@ -796,6 +800,7 @@ const device_t paradise_pvga1a_device = const device_t paradise_wd90c11_megapc_device = { "Paradise WD90C11 (Amstrad MegaPC)", + "paradise_wd90c11_megapc", 0, WD90C11, paradise_wd90c11_megapc_init, @@ -809,6 +814,7 @@ const device_t paradise_wd90c11_megapc_device = const device_t paradise_wd90c11_device = { "Paradise WD90C11-LR", + "paradise_wd90c11", DEVICE_ISA, WD90C11, paradise_wd90c11_standalone_init, @@ -844,6 +850,7 @@ static const device_config_t paradise_wd90c30_config[] = const device_t paradise_wd90c30_device = { "Paradise WD90C30-LR", + "paradise_wd90c30", DEVICE_ISA, WD90C30, paradise_wd90c30_standalone_init, diff --git a/src/video/vid_pgc.c b/src/video/vid_pgc.c index 47b4a4541..6c23ab7df 100644 --- a/src/video/vid_pgc.c +++ b/src/video/vid_pgc.c @@ -2730,6 +2730,7 @@ pgc_standalone_init(const device_t *info) const device_t pgc_device = { "PGC", + "pgc", DEVICE_ISA, 0, pgc_standalone_init, pgc_close, diff --git a/src/video/vid_rtg310x.c b/src/video/vid_rtg310x.c index 4442af6ef..29ca10b14 100644 --- a/src/video/vid_rtg310x.c +++ b/src/video/vid_rtg310x.c @@ -384,6 +384,7 @@ static const device_config_t rtg_config[] = const device_t realtek_rtg3106_device = { "Realtek RTG3106 (ISA)", + "realtek_rtg3106", DEVICE_ISA | DEVICE_AT, 2, rtg_init, rtg_close, NULL, diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 029823bac..5b845148e 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -7731,6 +7731,7 @@ static const device_config_t s3_968_config[] = const device_t s3_orchid_86c911_isa_device = { "S3 86c911 ISA (Orchid Fahrenheit 1280)", + "s3_orchid_86c911_isa", DEVICE_AT | DEVICE_ISA, S3_ORCHID_86C911, s3_init, @@ -7745,6 +7746,7 @@ const device_t s3_orchid_86c911_isa_device = const device_t s3_diamond_stealth_vram_isa_device = { "S3 86c911 ISA (Diamond Stealth VRAM)", + "s3_diamond_stealth_vram_isa", DEVICE_AT | DEVICE_ISA, S3_DIAMOND_STEALTH_VRAM, s3_init, @@ -7759,6 +7761,7 @@ const device_t s3_diamond_stealth_vram_isa_device = const device_t s3_ami_86c924_isa_device = { "S3 86c924 ISA (AMI)", + "s3_ami_86c924_isa", DEVICE_AT | DEVICE_ISA, S3_AMI_86C924, s3_init, @@ -7773,6 +7776,7 @@ const device_t s3_ami_86c924_isa_device = const device_t s3_spea_mirage_86c801_isa_device = { "S3 86c801 ISA (SPEA Mirage ISA)", + "s3_spea_mirage_86c801_isa", DEVICE_AT | DEVICE_ISA, S3_SPEA_MIRAGE_86C801, s3_init, @@ -7787,6 +7791,7 @@ const device_t s3_spea_mirage_86c801_isa_device = const device_t s3_spea_mirage_86c805_vlb_device = { "S3 86c805 VLB (SPEA Mirage VL)", + "s3_spea_mirage_86c805_vlb", DEVICE_VLB, S3_SPEA_MIRAGE_86C805, s3_init, @@ -7801,6 +7806,7 @@ const device_t s3_spea_mirage_86c805_vlb_device = const device_t s3_mirocrystal_8s_805_vlb_device = { "S3 86c805 VLB (MiroCRYSTAL 8S)", + "s3_mirocrystal_8s_805_vlb", DEVICE_VLB, S3_MIROCRYSTAL8S_805, s3_init, @@ -7816,6 +7822,7 @@ const device_t s3_mirocrystal_8s_805_vlb_device = const device_t s3_mirocrystal_10sd_805_vlb_device = { "S3 86c805 VLB (MiroCRYSTAL 10SD)", + "s3_mirocrystal_10sd_805_vlb", DEVICE_VLB, S3_MIROCRYSTAL10SD_805, s3_init, @@ -7830,6 +7837,7 @@ const device_t s3_mirocrystal_10sd_805_vlb_device = const device_t s3_phoenix_86c801_isa_device = { "S3 86c801 ISA (Phoenix)", + "s3_phoenix_86c801_isa", DEVICE_AT | DEVICE_ISA, S3_PHOENIX_86C801, s3_init, @@ -7844,6 +7852,7 @@ const device_t s3_phoenix_86c801_isa_device = const device_t s3_phoenix_86c805_vlb_device = { "S3 86c805 VLB (Phoenix)", + "s3_phoenix_86c805_vlb", DEVICE_VLB, S3_PHOENIX_86C805, s3_init, @@ -7858,6 +7867,7 @@ const device_t s3_phoenix_86c805_vlb_device = const device_t s3_metheus_86c928_isa_device = { "S3 86c928 ISA (Metheus Premier 928)", + "s3_metheus_86c928_isa", DEVICE_AT | DEVICE_ISA, S3_METHEUS_86C928, s3_init, @@ -7872,6 +7882,7 @@ const device_t s3_metheus_86c928_isa_device = const device_t s3_metheus_86c928_vlb_device = { "S3 86c928 VLB (Metheus Premier 928)", + "s3_metheus_86c928_vlb", DEVICE_VLB, S3_METHEUS_86C928, s3_init, @@ -7900,6 +7911,7 @@ const device_t s3_spea_mercury_lite_86c928_pci_device = const device_t s3_mirocrystal_20sd_864_vlb_device = { "S3 Vision864 VLB (MiroCRYSTAL 20SD)", + "s3_mirocrystal_20sd_864_vlb", DEVICE_VLB, S3_MIROCRYSTAL20SD_864, s3_init, @@ -7914,6 +7926,7 @@ const device_t s3_mirocrystal_20sd_864_vlb_device = const device_t s3_bahamas64_vlb_device = { "S3 Vision864 VLB (Paradise Bahamas 64)", + "s3_bahamas64_vlb", DEVICE_VLB, S3_PARADISE_BAHAMAS64, s3_init, @@ -7928,6 +7941,7 @@ const device_t s3_bahamas64_vlb_device = const device_t s3_bahamas64_pci_device = { "S3 Vision864 PCI (Paradise Bahamas 64)", + "s3_bahamas64_pci", DEVICE_PCI, S3_PARADISE_BAHAMAS64, s3_init, @@ -7942,6 +7956,7 @@ const device_t s3_bahamas64_pci_device = const device_t s3_mirocrystal_20sv_964_vlb_device = { "S3 Vision964 VLB (MiroCRYSTAL 20SV)", + "s3_mirocrystal_20sv_964_vlb", DEVICE_VLB, S3_MIROCRYSTAL20SV_964, s3_init, @@ -7956,6 +7971,7 @@ const device_t s3_mirocrystal_20sv_964_vlb_device = const device_t s3_mirocrystal_20sv_964_pci_device = { "S3 Vision964 PCI (MiroCRYSTAL 20SV)", + "s3_mirocrystal_20sv_964_pci", DEVICE_PCI, S3_MIROCRYSTAL20SV_964, s3_init, @@ -7971,6 +7987,7 @@ const device_t s3_mirocrystal_20sv_964_pci_device = const device_t s3_diamond_stealth64_964_vlb_device = { "S3 Vision964 VLB (Diamond Stealth64 VRAM)", + "s3_diamond_stealth64_964_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH64_964, s3_init, @@ -7985,6 +8002,7 @@ const device_t s3_diamond_stealth64_964_vlb_device = const device_t s3_diamond_stealth64_964_pci_device = { "S3 Vision964 PCI (Diamond Stealth64 VRAM)", + "s3_diamond_stealth64_964_pci", DEVICE_PCI, S3_DIAMOND_STEALTH64_964, s3_init, @@ -7999,6 +8017,7 @@ const device_t s3_diamond_stealth64_964_pci_device = const device_t s3_9fx_771_pci_device = { "S3 Vision968 PCI (Number 9 9FX 771)", + "s3_9fx_771_pci", DEVICE_PCI, S3_NUMBER9_9FX_771, s3_init, @@ -8013,6 +8032,7 @@ const device_t s3_9fx_771_pci_device = const device_t s3_phoenix_vision968_pci_device = { "S3 Vision968 PCI (Phoenix)", + "s3_phoenix_vision968_pci", DEVICE_PCI, S3_PHOENIX_VISION968, s3_init, @@ -8027,6 +8047,7 @@ const device_t s3_phoenix_vision968_pci_device = const device_t s3_phoenix_vision968_vlb_device = { "S3 Vision968 VLB (Phoenix)", + "s3_phoenix_vision968_vlb", DEVICE_VLB, S3_PHOENIX_VISION968, s3_init, @@ -8041,6 +8062,7 @@ const device_t s3_phoenix_vision968_vlb_device = const device_t s3_mirovideo_40sv_ergo_968_pci_device = { "S3 Vision968 PCI (MiroVIDEO 40SV Ergo)", + "s3_mirovideo_40sv_ergo_968_pci", DEVICE_PCI, S3_MIROVIDEO40SV_ERGO_968, s3_init, @@ -8055,6 +8077,7 @@ const device_t s3_mirovideo_40sv_ergo_968_pci_device = const device_t s3_spea_mercury_p64v_pci_device = { "S3 Vision968 PCI (SPEA Mercury P64V)", + "s3_spea_mercury_p64v_pci", DEVICE_PCI, S3_SPEA_MERCURY_P64V, s3_init, @@ -8069,6 +8092,7 @@ const device_t s3_spea_mercury_p64v_pci_device = const device_t s3_9fx_vlb_device = { "S3 Trio64 VLB (Number 9 9FX 330)", + "s3_9fx_vlb", DEVICE_VLB, S3_NUMBER9_9FX, s3_init, @@ -8083,6 +8107,7 @@ const device_t s3_9fx_vlb_device = const device_t s3_9fx_pci_device = { "S3 Trio64 PCI (Number 9 9FX 330)", + "s3_9fx_pci", DEVICE_PCI, S3_NUMBER9_9FX, s3_init, @@ -8097,6 +8122,7 @@ const device_t s3_9fx_pci_device = const device_t s3_phoenix_trio32_vlb_device = { "S3 Trio32 VLB (Phoenix)", + "s3_phoenix_trio32_vlb", DEVICE_VLB, S3_PHOENIX_TRIO32, s3_init, @@ -8111,6 +8137,7 @@ const device_t s3_phoenix_trio32_vlb_device = const device_t s3_phoenix_trio32_pci_device = { "S3 Trio32 PCI (Phoenix)", + "s3_phoenix_trio32_pci", DEVICE_PCI, S3_PHOENIX_TRIO32, s3_init, @@ -8125,6 +8152,7 @@ const device_t s3_phoenix_trio32_pci_device = const device_t s3_diamond_stealth_se_vlb_device = { "S3 Trio32 VLB (Diamond Stealth SE)", + "s3_diamond_stealth_se_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH_SE, s3_init, @@ -8139,6 +8167,7 @@ const device_t s3_diamond_stealth_se_vlb_device = const device_t s3_diamond_stealth_se_pci_device = { "S3 Trio32 PCI (Diamond Stealth SE)", + "s3_diamond_stealth_se_pci", DEVICE_PCI, S3_DIAMOND_STEALTH_SE, s3_init, @@ -8154,6 +8183,7 @@ const device_t s3_diamond_stealth_se_pci_device = const device_t s3_phoenix_trio64_vlb_device = { "S3 Trio64 VLB (Phoenix)", + "s3_phoenix_trio64_vlb", DEVICE_VLB, S3_PHOENIX_TRIO64, s3_init, @@ -8168,6 +8198,7 @@ const device_t s3_phoenix_trio64_vlb_device = const device_t s3_phoenix_trio64_onboard_pci_device = { "S3 Trio64 PCI On-Board (Phoenix)", + "s3_phoenix_trio64_onboard_pci", DEVICE_PCI, S3_PHOENIX_TRIO64_ONBOARD, s3_init, @@ -8182,6 +8213,7 @@ const device_t s3_phoenix_trio64_onboard_pci_device = const device_t s3_phoenix_trio64_pci_device = { "S3 Trio64 PCI (Phoenix)", + "s3_phoenix_trio64_pci", DEVICE_PCI, S3_PHOENIX_TRIO64, s3_init, @@ -8196,6 +8228,7 @@ const device_t s3_phoenix_trio64_pci_device = const device_t s3_phoenix_trio64vplus_onboard_pci_device = { "S3 Trio64V+ PCI On-Board (Phoenix)", + "s3_phoenix_trio64vplus_onboard_pci", DEVICE_PCI, S3_PHOENIX_TRIO64VPLUS_ONBOARD, s3_init, @@ -8210,6 +8243,7 @@ const device_t s3_phoenix_trio64vplus_onboard_pci_device = const device_t s3_phoenix_trio64vplus_pci_device = { "S3 Trio64V+ PCI (Phoenix)", + "s3_phoenix_trio64vplus_pci", DEVICE_PCI, S3_PHOENIX_TRIO64VPLUS, s3_init, @@ -8224,6 +8258,7 @@ const device_t s3_phoenix_trio64vplus_pci_device = const device_t s3_phoenix_vision864_vlb_device = { "S3 Vision864 VLB (Phoenix)", + "s3_phoenix_vision864_vlb", DEVICE_VLB, S3_PHOENIX_VISION864, s3_init, @@ -8238,6 +8273,7 @@ const device_t s3_phoenix_vision864_vlb_device = const device_t s3_phoenix_vision864_pci_device = { "S3 Vision864 PCI (Phoenix)", + "s3_phoenix_vision864_pci", DEVICE_PCI, S3_PHOENIX_VISION864, s3_init, @@ -8252,6 +8288,7 @@ const device_t s3_phoenix_vision864_pci_device = const device_t s3_9fx_531_pci_device = { "S3 Vision868 PCI (Number 9 9FX 531)", + "s3_9fx_531_pci", DEVICE_PCI, S3_NUMBER9_9FX_531, s3_init, @@ -8266,6 +8303,7 @@ const device_t s3_9fx_531_pci_device = const device_t s3_phoenix_vision868_vlb_device = { "S3 Vision868 VLB (Phoenix)", + "s3_phoenix_vision868_vlb", DEVICE_VLB, S3_PHOENIX_VISION868, s3_init, @@ -8280,6 +8318,7 @@ const device_t s3_phoenix_vision868_vlb_device = const device_t s3_phoenix_vision868_pci_device = { "S3 Vision868 PCI (Phoenix)", + "s3_phoenix_vision868_pci", DEVICE_PCI, S3_PHOENIX_VISION868, s3_init, @@ -8294,6 +8333,7 @@ const device_t s3_phoenix_vision868_pci_device = const device_t s3_diamond_stealth64_vlb_device = { "S3 Trio64 VLB (Diamond Stealth64 DRAM)", + "s3_diamond_stealth64_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH64_764, s3_init, @@ -8308,6 +8348,7 @@ const device_t s3_diamond_stealth64_vlb_device = const device_t s3_diamond_stealth64_pci_device = { "S3 Trio64 PCI (Diamond Stealth64 DRAM)", + "s3_diamond_stealth64_pci", DEVICE_PCI, S3_DIAMOND_STEALTH64_764, s3_init, @@ -8322,6 +8363,7 @@ const device_t s3_diamond_stealth64_pci_device = const device_t s3_spea_mirage_p64_vlb_device = { "S3 Trio64 VLB (SPEA Mirage P64)", + "s3_spea_mirage_p64_vlb", DEVICE_VLB, S3_SPEA_MIRAGE_P64, s3_init, @@ -8336,6 +8378,7 @@ const device_t s3_spea_mirage_p64_vlb_device = const device_t s3_elsa_winner2000_pro_x_964_pci_device = { "S3 Vision964 PCI (ELSA Winner 2000 Pro/X)", + "s3_elsa_winner2000_pro_x_964_pci", DEVICE_PCI, S3_ELSAWIN2KPROX_964, s3_init, @@ -8350,6 +8393,7 @@ const device_t s3_elsa_winner2000_pro_x_964_pci_device = const device_t s3_elsa_winner2000_pro_x_pci_device = { "S3 Vision968 PCI (ELSA Winner 2000 Pro/X)", + "s3_elsa_winner2000_pro_x_pci", DEVICE_PCI, S3_ELSAWIN2KPROX, s3_init, @@ -8364,6 +8408,7 @@ const device_t s3_elsa_winner2000_pro_x_pci_device = const device_t s3_trio64v2_dx_pci_device = { "S3 Trio64V2/DX PCI", + "s3_trio64v2_dx_pci", DEVICE_PCI, S3_TRIO64V2_DX, s3_init, @@ -8379,6 +8424,7 @@ const device_t s3_trio64v2_dx_pci_device = const device_t s3_trio64v2_dx_onboard_pci_device = { "S3 Trio64V2/DX On-Board PCI", + "s3_trio64v2_dx_onboard_pci", DEVICE_PCI, S3_TRIO64V2_DX_ONBOARD, s3_init, diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index fb589677f..0cd89f5ab 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -4397,6 +4397,7 @@ static const device_config_t s3_virge_357_config[] = const device_t s3_virge_325_pci_device = { "S3 ViRGE (325) PCI", + "s3_virge_325_pci", DEVICE_PCI, S3_VIRGE_325, s3_virge_init, @@ -4411,6 +4412,7 @@ const device_t s3_virge_325_pci_device = const device_t s3_diamond_stealth_2000_pci_device = { "S3 ViRGE (Diamond Stealth 3D 2000) PCI", + "s3_diamond_stealth_2000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_2000, s3_virge_init, @@ -4425,6 +4427,7 @@ const device_t s3_diamond_stealth_2000_pci_device = const device_t s3_diamond_stealth_3000_pci_device = { "S3 ViRGE/VX (Diamond Stealth 3D 3000) PCI", + "s3_diamond_stealth_3000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_3000, s3_virge_init, @@ -4453,6 +4456,7 @@ const device_t s3_stb_velocity_3d_pci_device = const device_t s3_virge_375_pci_device = { "S3 ViRGE/DX (375) PCI", + "s3_virge_375_pci", DEVICE_PCI, S3_VIRGE_DX, s3_virge_init, @@ -4467,6 +4471,7 @@ const device_t s3_virge_375_pci_device = const device_t s3_diamond_stealth_2000pro_pci_device = { "S3 ViRGE/DX (Diamond Stealth 3D 2000 Pro) PCI", + "s3_diamond_stealth_2000pro_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_2000PRO, s3_virge_init, @@ -4481,6 +4486,7 @@ const device_t s3_diamond_stealth_2000pro_pci_device = const device_t s3_virge_385_pci_device = { "S3 ViRGE/GX (385) PCI", + "s3_virge_385_pci", DEVICE_PCI, S3_VIRGE_GX, s3_virge_init, @@ -4495,6 +4501,7 @@ const device_t s3_virge_385_pci_device = const device_t s3_virge_357_pci_device = { "S3 ViRGE/GX2 (357) PCI", + "s3_virge_357_pci", DEVICE_PCI, S3_VIRGE_GX2, s3_virge_init, @@ -4509,6 +4516,7 @@ const device_t s3_virge_357_pci_device = const device_t s3_virge_357_agp_device = { "S3 ViRGE/GX2 (357) AGP", + "s3_virge_357_agp", DEVICE_AGP, S3_VIRGE_GX2, s3_virge_init, @@ -4523,6 +4531,7 @@ const device_t s3_virge_357_agp_device = const device_t s3_diamond_stealth_4000_pci_device = { "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) PCI", + "s3_diamond_stealth_4000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_4000, s3_virge_init, @@ -4537,6 +4546,7 @@ const device_t s3_diamond_stealth_4000_pci_device = const device_t s3_diamond_stealth_4000_agp_device = { "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) AGP", + "s3_diamond_stealth_4000_agp", DEVICE_AGP, S3_DIAMOND_STEALTH3D_4000, s3_virge_init, @@ -4551,6 +4561,7 @@ const device_t s3_diamond_stealth_4000_agp_device = const device_t s3_trio3d2x_pci_device = { "S3 Trio3D/2X (362) PCI", + "s3_trio3d2x_pci", DEVICE_PCI, S3_TRIO_3D2X, s3_virge_init, @@ -4565,6 +4576,7 @@ const device_t s3_trio3d2x_pci_device = const device_t s3_trio3d2x_agp_device = { "S3 Trio3D/2X (362) AGP", + "s3_trio3d2x_agp", DEVICE_AGP, S3_TRIO_3D2X, s3_virge_init, diff --git a/src/video/vid_sc1148x_ramdac.c b/src/video/vid_sc1148x_ramdac.c index d23d00efa..0134c31d7 100644 --- a/src/video/vid_sc1148x_ramdac.c +++ b/src/video/vid_sc1148x_ramdac.c @@ -155,6 +155,7 @@ sc1148x_ramdac_close(void *priv) const device_t sc11483_ramdac_device = { "Sierra SC11483 RAMDAC", + "sc11483_ramdac", 0, 0, sc1148x_ramdac_init, sc1148x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -163,6 +164,7 @@ const device_t sc11483_ramdac_device = const device_t sc11487_ramdac_device = { "Sierra SC11487 RAMDAC", + "sc11487_ramdac", 0, 1, sc1148x_ramdac_init, sc1148x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -171,6 +173,7 @@ const device_t sc11487_ramdac_device = const device_t sc11484_nors2_ramdac_device = { "Sierra SC11484 RAMDAC (no RS2 signal)", + "sc11484_nors2_ramdac", 0, 2, sc1148x_ramdac_init, sc1148x_ramdac_close, NULL, { NULL }, NULL, NULL @@ -179,6 +182,7 @@ const device_t sc11484_nors2_ramdac_device = const device_t sc11486_ramdac_device = { "Sierra SC11486 RAMDAC", + "sc11486_ramdac", 0, 3, sc1148x_ramdac_init, sc1148x_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_sc1502x_ramdac.c b/src/video/vid_sc1502x_ramdac.c index 6dd4ad267..655524a58 100644 --- a/src/video/vid_sc1502x_ramdac.c +++ b/src/video/vid_sc1502x_ramdac.c @@ -157,6 +157,7 @@ sc1502x_ramdac_close(void *priv) const device_t sc1502x_ramdac_device = { "Sierra SC1502x RAMDAC", + "sc1502x_ramdac", 0, 0, sc1502x_ramdac_init, sc1502x_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_sdac_ramdac.c b/src/video/vid_sdac_ramdac.c index 221cee342..e1026bf25 100644 --- a/src/video/vid_sdac_ramdac.c +++ b/src/video/vid_sdac_ramdac.c @@ -307,6 +307,7 @@ sdac_ramdac_close(void *priv) const device_t gendac_ramdac_device = { "S3 GENDAC 86c708 RAMDAC", + "gendac_ramdac", 0, S3_86C708, sdac_ramdac_init, sdac_ramdac_close, NULL, { NULL }, NULL, NULL @@ -315,6 +316,7 @@ const device_t gendac_ramdac_device = const device_t tseng_ics5301_ramdac_device = { "Tseng ICS5301 GENDAC RAMDAC", + "tseng_ics5301_ramdac", 0, ICS_5301, sdac_ramdac_init, sdac_ramdac_close, NULL, { NULL }, NULL, NULL @@ -323,6 +325,7 @@ const device_t tseng_ics5301_ramdac_device = const device_t tseng_ics5341_ramdac_device = { "Tseng ICS5341 GENDAC RAMDAC", + "tseng_ics5341_ramdac", 0, ICS_5341, sdac_ramdac_init, sdac_ramdac_close, NULL, { NULL }, NULL, NULL @@ -331,6 +334,7 @@ const device_t tseng_ics5341_ramdac_device = const device_t sdac_ramdac_device = { "S3 SDAC 86c716 RAMDAC", + "sdac_ramdac", 0, S3_86C716, sdac_ramdac_init, sdac_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c index eee3eb09a..0ed0c09cc 100644 --- a/src/video/vid_sigma.c +++ b/src/video/vid_sigma.c @@ -958,6 +958,7 @@ device_config_t sigma_config[] = const device_t sigma_device = { "Sigma Color 400", + "sigma", DEVICE_ISA, 0, sigma_init, sigma_close, diff --git a/src/video/vid_stg_ramdac.c b/src/video/vid_stg_ramdac.c index 828fc29b6..9f216056b 100644 --- a/src/video/vid_stg_ramdac.c +++ b/src/video/vid_stg_ramdac.c @@ -250,6 +250,7 @@ stg_ramdac_close(void *priv) const device_t stg_ramdac_device = { "SGS-Thompson STG170x RAMDAC", + "stg_ramdac", 0, 0, stg_ramdac_init, stg_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c index bd05fea46..7326c1925 100644 --- a/src/video/vid_tgui9440.c +++ b/src/video/vid_tgui9440.c @@ -3233,6 +3233,7 @@ static const device_config_t tgui96xx_config[] = const device_t tgui9400cxi_device = { "Trident TGUI 9400CXi", + "tgui9400cxi", DEVICE_VLB, TGUI_9400CXI, tgui_init, @@ -3247,6 +3248,7 @@ const device_t tgui9400cxi_device = const device_t tgui9440_vlb_device = { "Trident TGUI 9440AGi VLB", + "tgui9440_vlb", DEVICE_VLB, TGUI_9440, tgui_init, @@ -3261,6 +3263,7 @@ const device_t tgui9440_vlb_device = const device_t tgui9440_pci_device = { "Trident TGUI 9440AGi PCI", + "tgui9440_pci", DEVICE_PCI, TGUI_9440, tgui_init, @@ -3275,6 +3278,7 @@ const device_t tgui9440_pci_device = const device_t tgui9440_onboard_pci_device = { "Trident TGUI 9440AGi On-Board PCI", + "tgui9440_onboard_pci", DEVICE_PCI, TGUI_9440 | ONBOARD, tgui_init, @@ -3289,6 +3293,7 @@ const device_t tgui9440_onboard_pci_device = const device_t tgui9660_pci_device = { "Trident TGUI 9660XGi PCI", + "tgui9660_pci", DEVICE_PCI, TGUI_9660, tgui_init, @@ -3303,6 +3308,7 @@ const device_t tgui9660_pci_device = const device_t tgui9680_pci_device = { "Trident TGUI 9680XGi PCI", + "tgui9680_pci", DEVICE_PCI, TGUI_9680, tgui_init, diff --git a/src/video/vid_ti_cf62011.c b/src/video/vid_ti_cf62011.c index 85fc22305..f9f499ce1 100644 --- a/src/video/vid_ti_cf62011.c +++ b/src/video/vid_ti_cf62011.c @@ -265,6 +265,7 @@ vid_init(const device_t *info) const device_t ibm_ps1_2121_device = { "IBM PS/1 Model 2121 SVGA", + "ibm_ps1_2121", DEVICE_ISA, 512, vid_init, vid_close, NULL, diff --git a/src/video/vid_tkd8001_ramdac.c b/src/video/vid_tkd8001_ramdac.c index 6dc4cd1a9..f11319eeb 100644 --- a/src/video/vid_tkd8001_ramdac.c +++ b/src/video/vid_tkd8001_ramdac.c @@ -121,6 +121,7 @@ tkd8001_ramdac_close(void *priv) const device_t tkd8001_ramdac_device = { "Trident TKD8001 RAMDAC", + "tkd8001_ramdac", 0, 0, tkd8001_ramdac_init, tkd8001_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_tvga.c b/src/video/vid_tvga.c index 58836275a..55dccf9c6 100644 --- a/src/video/vid_tvga.c +++ b/src/video/vid_tvga.c @@ -471,6 +471,7 @@ static const device_config_t tvga_config[] = const device_t tvga8900b_device = { "Trident TVGA 8900B", + "tvga8900b", DEVICE_ISA, TVGA8900B_ID, tvga_init, @@ -485,6 +486,7 @@ const device_t tvga8900b_device = const device_t tvga8900d_device = { "Trident TVGA 8900D", + "tvga8900d", DEVICE_ISA, TVGA8900CLD_ID, tvga_init, @@ -499,6 +501,7 @@ const device_t tvga8900d_device = const device_t tvga9000b_device = { "Trident TVGA 9000B", + "tvga9000b", DEVICE_ISA, TVGA9000B_ID, tvga_init, diff --git a/src/video/vid_tvp3026_ramdac.c b/src/video/vid_tvp3026_ramdac.c index c3fc85655..ace0792e0 100644 --- a/src/video/vid_tvp3026_ramdac.c +++ b/src/video/vid_tvp3026_ramdac.c @@ -594,6 +594,7 @@ tvp3026_ramdac_close(void *priv) const device_t tvp3026_ramdac_device = { "TI TVP3026 RAMDAC", + "tvp3026_ramdac", 0, 0, tvp3026_ramdac_init, tvp3026_ramdac_close, NULL, { NULL }, NULL, NULL diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c index b9f18348b..c4cffef03 100644 --- a/src/video/vid_vga.c +++ b/src/video/vid_vga.c @@ -184,6 +184,7 @@ void vga_force_redraw(void *p) const device_t vga_device = { "VGA", + "vga", DEVICE_ISA, 0, vga_init, @@ -198,6 +199,7 @@ const device_t vga_device = const device_t ps1vga_device = { "PS/1 VGA", + "ps1vga", DEVICE_ISA, 0, ps1vga_init, @@ -212,6 +214,7 @@ const device_t ps1vga_device = const device_t ps1vga_mca_device = { "PS/1 VGA", + "ps1vga_mca", DEVICE_MCA, 0, ps1vga_init, diff --git a/src/video/vid_voodoo.c b/src/video/vid_voodoo.c index a8697f0e8..d9c5dc437 100644 --- a/src/video/vid_voodoo.c +++ b/src/video/vid_voodoo.c @@ -1429,6 +1429,7 @@ static const device_config_t voodoo_config[] = const device_t voodoo_device = { "3DFX Voodoo Graphics", + "voodoo", DEVICE_PCI, 0, voodoo_init, diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index c77b2368e..a0fa9565a 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -2959,6 +2959,7 @@ static void banshee_force_redraw(void *p) const device_t voodoo_banshee_device = { "3dfx Voodoo Banshee", + "voodoo_banshee", DEVICE_PCI, 0, banshee_init, @@ -2973,6 +2974,7 @@ const device_t voodoo_banshee_device = const device_t creative_voodoo_banshee_device = { "Creative 3D Blaster Banshee", + "creative_voodoo_banshee", DEVICE_PCI, 0, creative_banshee_init, @@ -2987,6 +2989,7 @@ const device_t creative_voodoo_banshee_device = const device_t voodoo_3_2000_device = { "3dfx Voodoo3 2000", + "voodoo_3_2000", DEVICE_PCI, 0, v3_2000_init, @@ -3001,6 +3004,7 @@ const device_t voodoo_3_2000_device = const device_t voodoo_3_2000_agp_device = { "3dfx Voodoo3 2000", + "voodoo_3_2000_agp", DEVICE_AGP, 0, v3_2000_agp_init, @@ -3015,6 +3019,7 @@ const device_t voodoo_3_2000_agp_device = const device_t voodoo_3_2000_agp_onboard_8m_device = { "3dfx Voodoo3 2000 (On-Board 8MB SGRAM)", + "voodoo_3_2000_agp_onboard_8m", DEVICE_AGP, 8, v3_2000_agp_onboard_init, @@ -3029,6 +3034,7 @@ const device_t voodoo_3_2000_agp_onboard_8m_device = const device_t voodoo_3_3000_device = { "3dfx Voodoo3 3000", + "voodoo_3_3000", DEVICE_PCI, 0, v3_3000_init, @@ -3043,6 +3049,7 @@ const device_t voodoo_3_3000_device = const device_t voodoo_3_3000_agp_device = { "3dfx Voodoo3 3000", + "voodoo_3_3000_agp", DEVICE_AGP, 0, v3_3000_agp_init, @@ -3057,6 +3064,7 @@ const device_t voodoo_3_3000_agp_device = const device_t velocity_100_agp_device = { "3dfx Velocity 100", + "velocity_100_agp", DEVICE_AGP, 0, velocity_100_agp_init, diff --git a/src/video/vid_wy700.c b/src/video/vid_wy700.c index 57faf5fdc..0b5f1dd83 100644 --- a/src/video/vid_wy700.c +++ b/src/video/vid_wy700.c @@ -1010,6 +1010,7 @@ void wy700_speed_changed(void *p) const device_t wy700_device = { "Wyse 700", + "wy700", DEVICE_ISA, 0, wy700_init, wy700_close, From 723d5ac984b23c8163d7cadf4d95d1a3fcf427fa Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:20:51 -0500 Subject: [PATCH 02/23] continued cleanup --- src/disk/hdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/disk/hdc.c b/src/disk/hdc.c index f6b6fc2e0..e5d26309c 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -67,7 +67,7 @@ null_close(void *priv) static const device_t null_device = { - "Null HDC", 0, 0, + "Null HDC", "null", 0, 0, null_init, null_close, NULL, { NULL }, NULL, NULL, NULL }; From 4402607ce552a4dd1fd02e2b16332d4a2c08284d Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:26:14 -0500 Subject: [PATCH 03/23] cleanup --- src/disk/hdc_esdi_mca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c index 7d43edafb..2aa32fe23 100644 --- a/src/disk/hdc_esdi_mca.c +++ b/src/disk/hdc_esdi_mca.c @@ -1181,7 +1181,7 @@ esdi_available(void) const device_t esdi_ps2_device = { "IBM PS/2 ESDI Fixed Disk Adapter (MCA)", - "esdi_ps2" + "esdi_ps2", DEVICE_MCA, 0, esdi_init, esdi_close, NULL, { esdi_available }, NULL, NULL, NULL From c3b8818550062fd0496152f9df2447d032159e46 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:32:25 -0500 Subject: [PATCH 04/23] more fix --- src/sio/sio_fdc37c6xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sio/sio_fdc37c6xx.c b/src/sio/sio_fdc37c6xx.c index 6de33a820..89b90d332 100644 --- a/src/sio/sio_fdc37c6xx.c +++ b/src/sio/sio_fdc37c6xx.c @@ -338,6 +338,7 @@ fdc37c6xx_init(const device_t *info) understood their datasheets correctly. */ const device_t fdc37c651_device = { "SMC FDC37C651 Super I/O", + "fdc37c651", 0, 0x51, fdc37c6xx_init, fdc37c6xx_close, NULL, From d0c1a986a8be69d50626dc5f0b9068b047edb1da Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:39:58 -0500 Subject: [PATCH 05/23] continued fixing --- src/sound/snd_ac97_via.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_ac97_via.c b/src/sound/snd_ac97_via.c index 876701bc7..f1feaa99b 100644 --- a/src/sound/snd_ac97_via.c +++ b/src/sound/snd_ac97_via.c @@ -829,8 +829,8 @@ ac97_via_close(void *priv) } -{ const device_t ac97_via_device = +{ "VIA VT82C686 Integrated AC97 Controller", "ac97_via", DEVICE_PCI, From 8d962bef15ccf04f8db27ec4bfa737e07e12c872 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:48:11 -0500 Subject: [PATCH 06/23] yet another fix commit --- src/video/vid_cl54xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index 317b32071..a8ace8026 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -4572,8 +4572,8 @@ const device_t gd5420_isa_device = const device_t gd5422_isa_device = { "Cirrus Logic GD5422 (ISA)", - DEVICE_AT | DEVICE_ISA, "gd5422_isa", + DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5422, gd54xx_init, gd54xx_close, gd54xx_reset, @@ -4585,8 +4585,8 @@ const device_t gd5422_isa_device = { const device_t gd5424_vlb_device = { "Cirrus Logic GD5424 (VLB)", - DEVICE_VLB, "gd5424_vlb", + DEVICE_VLB, CIRRUS_ID_CLGD5424, gd54xx_init, gd54xx_close, gd54xx_reset, From 9abd72264fec1c54daef449fad5757851d329312 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 26 Jan 2022 18:52:47 -0500 Subject: [PATCH 07/23] fix to indev machine --- src/video/vid_ati18800.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c index 550e3c088..d2228c5df 100644 --- a/src/video/vid_ati18800.c +++ b/src/video/vid_ati18800.c @@ -284,6 +284,7 @@ static void ati18800_force_redraw(void *p) const device_t ati18800_wonder_device = { "ATI-18800", + "ati18800_wonder", DEVICE_ISA, ATI18800_WONDER, ati18800_init, ati18800_close, From 5398143f423e4444d64f87d53a0b840c19aba8ca Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Mon, 31 Jan 2022 16:14:36 -0500 Subject: [PATCH 08/23] obsoleting tables for internal names --- src/acpi.c | 2 +- src/device/isamem.c | 6 +++--- src/device/isartc.c | 6 +++--- src/device/mouse.c | 6 +++--- src/disk/hdc.c | 6 +++--- src/floppy/fdc.c | 6 +++--- src/lpt.c | 10 +++++----- src/network/network.c | 6 +++--- src/scsi/scsi.c | 6 +++--- src/sound/midi.c | 12 ++++++------ src/sound/sound.c | 6 +++--- src/video/vid_table.c | 6 +++--- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 02d97ebf8..6932bf1e4 100644 --- a/src/acpi.c +++ b/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(machine), "ficva503a") || !strcmp(machine_get_internal_name(machine), "6via90ap")) dev->regs.gpi_val |= 0x00000004; } diff --git a/src/device/isamem.c b/src/device/isamem.c index e26b51035..3ec41103b 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -1342,7 +1342,7 @@ isamem_get_name(int board) const char * isamem_get_internal_name(int board) { - return(boards[board].internal_name); + return(boards[board].dev->internal_name); } @@ -1352,8 +1352,8 @@ isamem_get_from_internal_name(const char *s) { int c = 0; - while (boards[c].internal_name != NULL) { - if (! strcmp(boards[c].internal_name, s)) + while (boards[c].dev->internal_name != NULL) { + if (! strcmp(boards[c].dev->internal_name, s)) return(c); c++; } diff --git a/src/device/isartc.c b/src/device/isartc.c index efaaf65f5..c58448cef 100644 --- a/src/device/isartc.c +++ b/src/device/isartc.c @@ -771,7 +771,7 @@ isartc_reset(void) char * isartc_get_internal_name(int board) { - return((char *)boards[board].internal_name); + return((char *)boards[board].dev->internal_name); } @@ -780,8 +780,8 @@ isartc_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) boards[c].internal_name)) { - if (! strcmp(boards[c].internal_name, s)) + while (strlen((char *) boards[c].dev->internal_name)) { + if (! strcmp(boards[c].dev->internal_name, s)) return(c); c++; } diff --git a/src/device/mouse.c b/src/device/mouse.c index 6720ddabd..c75b82201 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -208,7 +208,7 @@ mouse_get_name(int mouse) char * mouse_get_internal_name(int mouse) { - return((char *)mouse_devices[mouse].internal_name); + return((char *)mouse_devices[mouse].device->internal_name); } @@ -217,8 +217,8 @@ mouse_get_from_internal_name(char *s) { int c = 0; - while (mouse_devices[c].internal_name != NULL) { - if (! strcmp((char *)mouse_devices[c].internal_name, s)) + while (mouse_devices[c].device->internal_name != NULL) { + if (! strcmp((char *)mouse_devices[c].device->internal_name, s)) return(c); c++; } diff --git a/src/disk/hdc.c b/src/disk/hdc.c index e5d26309c..0b6c0679c 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -157,7 +157,7 @@ hdc_reset(void) char * hdc_get_internal_name(int hdc) { - return((char *) controllers[hdc].internal_name); + return((char *) controllers[hdc].device->internal_name); } @@ -166,9 +166,9 @@ hdc_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) controllers[c].internal_name)) + while (strlen((char *) controllers[c].device->internal_name)) { - if (!strcmp((char *) controllers[c].internal_name, s)) + if (!strcmp((char *) controllers[c].device->internal_name, s)) return c; c++; } diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index 4860897af..5d87d833b 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -145,7 +145,7 @@ fdc_card_has_config(int card) char * fdc_card_get_internal_name(int card) { - return((char *) fdc_cards[card].internal_name); + return((char *) fdc_cards[card].device->internal_name); } @@ -154,8 +154,8 @@ fdc_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) fdc_cards[c].internal_name)) { - if (!strcmp((char *) fdc_cards[c].internal_name, s)) + while (strlen((char *) fdc_cards[c].device->internal_name)) { + if (!strcmp((char *) fdc_cards[c].device->internal_name, s)) return(c); c++; } diff --git a/src/lpt.c b/src/lpt.c index e2cb6ad5e..c619cf55d 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -37,7 +37,7 @@ static const struct { char * lpt_device_get_name(int id) { - if (strlen((char *) lpt_devices[id].internal_name) == 0) + if (strlen((char *) lpt_devices[id].device->internal_name) == 0) return NULL; if (!lpt_devices[id].device) return "None"; @@ -48,9 +48,9 @@ lpt_device_get_name(int id) char * lpt_device_get_internal_name(int id) { - if (strlen((char *) lpt_devices[id].internal_name) == 0) + if (strlen((char *) lpt_devices[id].device->internal_name) == 0) return NULL; - return (char *) lpt_devices[id].internal_name; + return (char *) lpt_devices[id].device->internal_name; } @@ -59,8 +59,8 @@ lpt_device_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) lpt_devices[c].internal_name) != 0) { - if (strcmp(lpt_devices[c].internal_name, s) == 0) + while (strlen((char *) lpt_devices[c].device->internal_name) != 0) { + if (strcmp(lpt_devices[c].device->internal_name, s) == 0) return c; c++; } diff --git a/src/network/network.c b/src/network/network.c index 0e7f16bac..fea6b5c93 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -649,7 +649,7 @@ network_card_has_config(int card) char * network_card_get_internal_name(int card) { - return((char *)net_cards[card].internal_name); + return((char *)net_cards[card].device->internal_name); } @@ -659,8 +659,8 @@ network_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *)net_cards[c].internal_name)) { - if (! strcmp((char *)net_cards[c].internal_name, s)) + while (strlen((char *)net_cards[c].device->internal_name)) { + if (! strcmp((char *)net_cards[c].device->internal_name, s)) return(c); c++; } diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c index d3b0a91e6..22a85f1eb 100644 --- a/src/scsi/scsi.c +++ b/src/scsi/scsi.c @@ -143,7 +143,7 @@ scsi_card_has_config(int card) char * scsi_card_get_internal_name(int card) { - return((char *) scsi_cards[card].internal_name); + return((char *) scsi_cards[card].device->internal_name); } @@ -152,8 +152,8 @@ scsi_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) scsi_cards[c].internal_name)) { - if (!strcmp((char *) scsi_cards[c].internal_name, s)) + while (strlen((char *) scsi_cards[c].device->internal_name)) { + if (!strcmp((char *) scsi_cards[c].device->internal_name, s)) return(c); c++; } diff --git a/src/sound/midi.c b/src/sound/midi.c index b09e75e78..9e0824b25 100644 --- a/src/sound/midi.c +++ b/src/sound/midi.c @@ -123,7 +123,7 @@ midi_device_has_config(int card) char * midi_device_get_internal_name(int card) { - return (char *) devices[card].internal_name; + return (char *) devices[card].device->internal_name; } @@ -132,8 +132,8 @@ midi_device_get_from_internal_name(char *s) { int c = 0; - while (strlen(devices[c].internal_name)) { - if (!strcmp(devices[c].internal_name, s)) + while (strlen(devices[c].device->internal_name)) { + if (!strcmp(devices[c].device->internal_name, s)) return c; c++; } @@ -252,7 +252,7 @@ midi_in_device_has_config(int card) char * midi_in_device_get_internal_name(int card) { - return (char *) midi_in_devices[card].internal_name; + return (char *) midi_in_devices[card].device->internal_name; } @@ -261,8 +261,8 @@ midi_in_device_get_from_internal_name(char *s) { int c = 0; - while (strlen(midi_in_devices[c].internal_name)) { - if (!strcmp(midi_in_devices[c].internal_name, s)) + while (strlen(midi_in_devices[c].device->internal_name)) { + if (!strcmp(midi_in_devices[c].device->internal_name, s)) return c; c++; } diff --git a/src/sound/sound.c b/src/sound/sound.c index 9ba4fb3df..cf62c587a 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -166,7 +166,7 @@ sound_card_has_config(int card) char * sound_card_get_internal_name(int card) { - return (char *) sound_cards[card].internal_name; + return (char *) sound_cards[card].device->internal_name; } @@ -175,8 +175,8 @@ sound_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) sound_cards[c].internal_name)) { - if (!strcmp((char *) sound_cards[c].internal_name, s)) + while (strlen((char *) sound_cards[c].device->internal_name)) { + if (!strcmp((char *) sound_cards[c].device->internal_name, s)) return c; c++; } diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 4cccea754..9399f1614 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -341,7 +341,7 @@ video_card_has_config(int card) char * video_get_internal_name(int card) { - return((char *) video_cards[card].internal_name); + return((char *) video_cards[card].device->internal_name); } @@ -350,8 +350,8 @@ video_get_video_from_internal_name(char *s) { int c = 0; - while (strcmp(video_cards[c].internal_name, "") != 0) { - if (!strcmp((char *) video_cards[c].internal_name, s)) + while (strcmp(video_cards[c].device->internal_name, "") != 0) { + if (!strcmp((char *) video_cards[c].device->internal_name, s)) return(c); c++; } From 4b6e1034b3d7a3a80bc57f2f416193fc13b103fa Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 15:50:30 -0500 Subject: [PATCH 09/23] refactored upstream devices --- src/device/isamem.c | 5 +++++ src/device/isartc.c | 1 + src/sound/snd_ps1.c | 1 + src/sound/snd_pssj.c | 1 + 4 files changed, 8 insertions(+) diff --git a/src/device/isamem.c b/src/device/isamem.c index 3ec41103b..331004094 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -722,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, @@ -777,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, @@ -832,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, @@ -1072,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, @@ -1277,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, diff --git a/src/device/isartc.c b/src/device/isartc.c index c58448cef..e35f1ad9b 100644 --- a/src/device/isartc.c +++ b/src/device/isartc.c @@ -737,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, diff --git a/src/sound/snd_ps1.c b/src/sound/snd_ps1.c index e9455a327..dbca48e79 100644 --- a/src/sound/snd_ps1.c +++ b/src/sound/snd_ps1.c @@ -191,6 +191,7 @@ ps1snd_close(void *priv) const device_t ps1snd_device = { "IBM PS/1 Audio Card", + "ps1snd", 0, 0, ps1snd_init, ps1snd_close, NULL, diff --git a/src/sound/snd_pssj.c b/src/sound/snd_pssj.c index b6b86705d..703c19341 100644 --- a/src/sound/snd_pssj.c +++ b/src/sound/snd_pssj.c @@ -293,6 +293,7 @@ const device_t pssj_1e0_device = const device_t pssj_isa_device = { "Tandy PSSJ Clone", + "pssj_isa", DEVICE_ISA, 0, pssj_isa_init, From 4ae82d3c935239e3d722e5629a08a746b79fd555 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 15:56:41 -0500 Subject: [PATCH 10/23] fixed overzealous refactoring --- src/lpt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lpt.c b/src/lpt.c index c619cf55d..e2cb6ad5e 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -37,7 +37,7 @@ static const struct { char * lpt_device_get_name(int id) { - if (strlen((char *) lpt_devices[id].device->internal_name) == 0) + if (strlen((char *) lpt_devices[id].internal_name) == 0) return NULL; if (!lpt_devices[id].device) return "None"; @@ -48,9 +48,9 @@ lpt_device_get_name(int id) char * lpt_device_get_internal_name(int id) { - if (strlen((char *) lpt_devices[id].device->internal_name) == 0) + if (strlen((char *) lpt_devices[id].internal_name) == 0) return NULL; - return (char *) lpt_devices[id].device->internal_name; + return (char *) lpt_devices[id].internal_name; } @@ -59,8 +59,8 @@ lpt_device_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) lpt_devices[c].device->internal_name) != 0) { - if (strcmp(lpt_devices[c].device->internal_name, s) == 0) + while (strlen((char *) lpt_devices[c].internal_name) != 0) { + if (strcmp(lpt_devices[c].internal_name, s) == 0) return c; c++; } From 15c03bdd8b6fd5994cbadd1c1651be14168664de Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 16:03:32 -0500 Subject: [PATCH 11/23] more machines from upstream --- src/scsi/scsi_buslogic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index 8ef468544..dcb50b533 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -1920,6 +1920,7 @@ const device_t buslogic_542b_device = { const device_t buslogic_545s_device = { "BusLogic BT-545S ISA", + "buslogic_545s", DEVICE_ISA | DEVICE_AT, CHIP_BUSLOGIC_ISA_545S_1992_10_05, buslogic_init, x54x_close, NULL, @@ -1969,6 +1970,7 @@ const device_t buslogic_445s_device = { const device_t buslogic_445c_device = { "BusLogic BT-445C VLB", + "buslogic_445c", DEVICE_VLB, CHIP_BUSLOGIC_VLB_445C_1994_12_01, buslogic_init, x54x_close, NULL, From c96a2681095f1c3644e9887e9ba2c4cdd10880d7 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 16:10:48 -0500 Subject: [PATCH 12/23] fixed misnamed device_t instance --- src/scsi/scsi_buslogic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index dcb50b533..74f920d0b 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -1938,7 +1938,7 @@ const device_t buslogic_542bh_device = { BT_ISA_Config }; -const device_t buslogic_545s_device = { +const device_t buslogic_545c_device = { "BusLogic BT-545C ISA", "buslogic_545c", DEVICE_ISA | DEVICE_AT, From 5ed5d73cee40745dcee22921bf507b1774df1a32 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 16:16:33 -0500 Subject: [PATCH 13/23] more upstream devices --- src/video/vid_s3.c | 1 + src/video/vid_s3_virge.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 5b845148e..77ae510fd 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -7897,6 +7897,7 @@ const device_t s3_metheus_86c928_vlb_device = const device_t s3_spea_mercury_lite_86c928_pci_device = { "S3 86c928 PCI (SPEA Mercury Lite)", + "s3_spea_mercury_lite_86c928_pci", DEVICE_PCI, S3_SPEA_MERCURY_LITE_PCI, s3_init, diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index 0cd89f5ab..04b4d40ab 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -4442,6 +4442,7 @@ const device_t s3_diamond_stealth_3000_pci_device = const device_t s3_stb_velocity_3d_pci_device = { "S3 ViRGE/VX (STB Velocity 3D) PCI", + "s3_stb_velocity_3d_pci", DEVICE_PCI, S3_STB_VELOCITY_3D, s3_virge_init, From a69033fc9eedb88d178bd1cd3fc0c9c37872656f Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 16:53:26 -0500 Subject: [PATCH 14/23] fixed small issue --- src/acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/acpi.c b/src/acpi.c index 6932bf1e4..af02aa692 100644 --- a/src/acpi.c +++ b/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(machine_get_internal_name(machine), "ficva503a") || !strcmp(machine_get_internal_name(machine), "6via90ap")) + if (!strcmp(machine_get_internal_name(), "ficva503a") || !strcmp(machine_get_internal_name(), "6via90ap")) dev->regs.gpi_val |= 0x00000004; } From 4849deb156365521ef9de469764274d05ca22d6f Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 17:48:04 -0500 Subject: [PATCH 15/23] added null devices and refactored tables --- src/device/isamem.c | 37 ++-- src/device/isartc.c | 23 ++- src/device/mouse.c | 17 +- src/disk/hdc.c | 56 +++--- src/floppy/fdc.c | 32 +++- src/game/gameport.c | 24 +-- src/include/86box/network.h | 1 - src/lpt.c | 31 ++-- src/network/network.c | 50 +++--- src/scsi/scsi.c | 71 ++++---- src/sound/sound.c | 77 ++++---- src/video/vid_table.c | 342 +++++++++++++++++++----------------- 12 files changed, 429 insertions(+), 332 deletions(-) diff --git a/src/device/isamem.c b/src/device/isamem.c index 331004094..938b0cfb2 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -1291,29 +1291,38 @@ static const device_t iab_device = { #endif +static const device_t isa_none_device = { + "None", + "isa_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + static const struct { - const char *internal_name; const device_t *dev; } boards[] = { - { "none", NULL }, - { "ibmxt", &ibmxt_device }, - { "genericxt", &genericxt_device }, - { "ibmat", &ibmat_device }, - { "genericat", &genericat_device }, - { "p5pak", &p5pak_device }, - { "a6pak", &a6pak_device }, - { "ems5150", &ems5150_device }, - { "ev159", &ev159_device }, + { &isa_none_device }, + { &ibmxt_device }, + { &genericxt_device }, + { &ibmat_device }, + { &genericat_device }, + { &p5pak_device }, + { &a6pak_device }, + { &ems5150_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 } }; diff --git a/src/device/isartc.c b/src/device/isartc.c index e35f1ad9b..598fe6ba0 100644 --- a/src/device/isartc.c +++ b/src/device/isartc.c @@ -746,16 +746,25 @@ static const device_t a6pak_device = { }; +static const device_t isartc_none_device = { + "None", + "isartc_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + static const struct { - const char *internal_name; const device_t *dev; } boards[] = { - { "none", NULL }, - { "ev170", &ev170_device }, - { "pii147", &pii147_device }, - { "p5pak", &p5pak_device }, - { "a6pak", &a6pak_device }, - { "", NULL }, + { &isartc_none_device }, + { &ev170_device }, + { &pii147_device }, + { &p5pak_device }, + { &a6pak_device }, + { NULL }, }; diff --git a/src/device/mouse.c b/src/device/mouse.c index c75b82201..3d019f4cb 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -31,7 +31,6 @@ typedef struct { - const char *internal_name; const device_t *device; } mouse_t; @@ -62,17 +61,17 @@ static const device_t mouse_internal_device = { static mouse_t mouse_devices[] = { - { "none", &mouse_none_device }, - { "internal", &mouse_internal_device }, - { "logibus", &mouse_logibus_device }, - { "msbus", &mouse_msinport_device }, + { &mouse_none_device }, + { &mouse_internal_device }, + { &mouse_logibus_device }, + { &mouse_msinport_device }, #if 0 { "genibus", &mouse_genibus_device }, #endif - { "mssystems", &mouse_mssystems_device }, - { "msserial", &mouse_msserial_device }, - { "ltserial", &mouse_ltserial_device }, - { "ps2", &mouse_ps2_device }, + { &mouse_mssystems_device }, + { &mouse_msserial_device }, + { &mouse_ltserial_device }, + { &mouse_ps2_device }, { NULL, NULL } }; diff --git a/src/disk/hdc.c b/src/disk/hdc.c index 0b6c0679c..0e9eb8139 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -66,8 +66,8 @@ null_close(void *priv) } -static const device_t null_device = { - "Null HDC", "null", 0, 0, +static const device_t hdc_none_device = { + "None", "hdc_none", 0, 0, null_init, null_close, NULL, { NULL }, NULL, NULL, NULL }; @@ -86,8 +86,8 @@ inthdc_close(void *priv) } -static const device_t inthdc_device = { - "Internal controller", "inthdc", 0, 0, +static const device_t hdc_internal_device = { + "Internal", "hdc_internal", 0, 0, inthdc_init, inthdc_close, NULL, { NULL }, NULL, NULL, NULL }; @@ -97,30 +97,30 @@ static const struct { const char *internal_name; const device_t *device; } controllers[] = { - { "none", &null_device }, - { "internal", &inthdc_device }, - { "st506_xt", &st506_xt_xebec_device }, - { "st506_xt_dtc5150x", &st506_xt_dtc5150x_device }, - { "st506_xt_st11_m", &st506_xt_st11_m_device }, - { "st506_xt_wd1002a_wx1", &st506_xt_wd1002a_wx1_device }, - { "st506_at", &st506_at_wd1003_device }, - { "st506_xt_st11_r", &st506_xt_st11_r_device }, - { "st506_xt_wd1002a_27x", &st506_xt_wd1002a_27x_device }, - { "esdi_at", &esdi_at_wd1007vse1_device }, - { "ide_isa", &ide_isa_device }, - { "ide_isa_2ch", &ide_isa_2ch_device }, - { "xtide_at", &xtide_at_device }, - { "xtide_at_386", &xtide_at_386_device }, - { "xtide_at_ps2", &xtide_at_ps2_device }, - { "xta_wdxt150", &xta_wdxt150_device }, - { "xtide_acculogic", &xtide_acculogic_device }, - { "xtide", &xtide_device }, - { "esdi_mca", &esdi_ps2_device }, - { "ide_pci", &ide_pci_device }, - { "ide_pci_2ch", &ide_pci_2ch_device }, - { "ide_vlb", &ide_vlb_device }, - { "ide_vlb_2ch", &ide_vlb_2ch_device }, - { "", NULL } + { &hdc_null_device }, + { &hdc_internal_device }, + { &st506_xt_xebec_device }, + { &st506_xt_dtc5150x_device }, + { &st506_xt_st11_m_device }, + { &st506_xt_wd1002a_wx1_device }, + { &st506_at_wd1003_device }, + { &st506_xt_st11_r_device }, + { &st506_xt_wd1002a_27x_device }, + { &esdi_at_wd1007vse1_device }, + { &ide_isa_device }, + { &ide_isa_2ch_device }, + { &xtide_at_device }, + { &xtide_at_386_device }, + { &xtide_at_ps2_device }, + { &xta_wdxt150_device }, + { &xtide_acculogic_device }, + { &xtide_device }, + { &esdi_ps2_device }, + { &ide_pci_device }, + { &ide_pci_2ch_device }, + { &ide_vlb_device }, + { &ide_vlb_2ch_device }, + { NULL } }; diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index 5d87d833b..a73e039b8 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -102,17 +102,17 @@ fdc_log(const char *fmt, ...) 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 }, - { "b215", &fdc_b215_device }, - { "dtk_pii151b", &fdc_pii151b_device }, - { "dtk_pii158b", &fdc_pii158b_device }, - { "", NULL }, + { &fdc_null_device }, + { &fdc_internal_device }, + { &fdc_b215_device }, + { &fdc_pii151b_device }, + { &fdc_pii158b_device }, + { NULL } }; @@ -2373,6 +2373,26 @@ fdc_3f1_enable(fdc_t *fdc, int enable) } +const device_t fdc_none_device = { + "None", + "fdc_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + +const device_t fdc_internal_device = { + "None", + "fdc_internal", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + +const device_t fdc_internal_device = {}; + const device_t fdc_xt_device = { "PC/XT Floppy Drive Controller", "fdc_xt", diff --git a/src/game/gameport.c b/src/game/gameport.c index a4a48cbea..0aac6f94c 100644 --- a/src/game/gameport.c +++ b/src/game/gameport.c @@ -80,18 +80,18 @@ static const struct { const char *internal_name; const joystick_if_t *joystick; } joysticks[] = { - { "none", &joystick_none }, - { "2axis_2button", &joystick_2axis_2button }, - { "2axis_4button", &joystick_2axis_4button }, - { "2axis_6button", &joystick_2axis_6button }, - { "2axis_8button", &joystick_2axis_8button }, - { "3axis_2button", &joystick_3axis_2button }, - { "3axis_4button", &joystick_3axis_4button }, - { "4axis_4button", &joystick_4axis_4button }, - { "ch_flighstick_pro", &joystick_ch_flightstick_pro }, - { "sidewinder_pad", &joystick_sw_pad }, - { "thrustmaster_fcs", &joystick_tm_fcs }, - { "", NULL } + { &joystick_none }, + { &joystick_2axis_2button }, + { &joystick_2axis_4button }, + { &joystick_2axis_6button }, + { &joystick_2axis_8button }, + { &joystick_3axis_2button }, + { &joystick_3axis_4button }, + { &joystick_4axis_4button }, + { &joystick_ch_flightstick_pro }, + { &joystick_sw_pad }, + { &joystick_tm_fcs }, + { NULL } }; static joystick_instance_t *joystick_instance = NULL; diff --git a/src/include/86box/network.h b/src/include/86box/network.h index d256209d0..015eb6a34 100644 --- a/src/include/86box/network.h +++ b/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 *); diff --git a/src/lpt.c b/src/lpt.c index e2cb6ad5e..16c115fe2 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -17,20 +17,29 @@ lpt_port_t lpt_ports[PARALLEL_MAX]; +static const device_t lpt_none_device = { + "None", + "lpt_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + static const struct { - const char *internal_name; const lpt_device_t *device; } lpt_devices[] = { - {"none", NULL}, - {"dss", &dss_device}, - {"lpt_dac", &lpt_dac_device}, - {"lpt_dac_stereo", &lpt_dac_stereo_device}, - {"text_prt", &lpt_prt_text_device}, - {"dot_matrix", &lpt_prt_escp_device}, - {"postscript", &lpt_prt_ps_device}, - {"plip", &lpt_plip_device}, - {"dongle_savquest", &lpt_hasp_savquest_device}, - {"", NULL} + {&lpt_none_device}, + {&dss_device}, + {&lpt_dac_device}, + {&lpt_dac_stereo_device}, + {&lpt_prt_text_device}, + {&lpt_prt_escp_device}, + {&lpt_prt_ps_device}, + {&lpt_plip_device}, + {&lpt_hasp_savquest_device}, + {NULL} }; diff --git a/src/network/network.c b/src/network/network.c index fea6b5c93..14023bfb4 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -70,27 +70,37 @@ #include <86box/net_wd8003.h> +static const device_t net_none_device = { + "None", + "net_none", + 0, NET_TYPE_NONE, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + static netcard_t net_cards[] = { - { "none", NULL, NULL }, - { "3c503", &threec503_device, NULL }, - { "pcnetisa", &pcnet_am79c960_device, NULL }, - { "pcnetisaplus", &pcnet_am79c961_device, NULL }, - { "ne1k", &ne1000_device, NULL }, - { "ne2k", &ne2000_device, NULL }, - { "pcnetracal", &pcnet_am79c960_eb_device, NULL }, - { "ne2kpnp", &rtl8019as_device, NULL }, - { "wd8003e", &wd8003e_device, NULL }, - { "wd8003eb", &wd8003eb_device, NULL }, - { "wd8013ebt", &wd8013ebt_device, NULL }, - { "plip", &plip_device, NULL }, - { "ethernextmc", ðernext_mc_device, NULL }, - { "wd8003eta", &wd8003eta_device, NULL }, - { "wd8003ea", &wd8003ea_device, NULL }, - { "pcnetfast", &pcnet_am79c973_device, NULL }, - { "pcnetpci", &pcnet_am79c970a_device, NULL }, - { "ne2kpci", &rtl8029as_device, NULL }, - { "pcnetvlb", &pcnet_am79c960_vlb_device, NULL }, - { "", NULL, NULL } + { &net_none_device, NULL }, + { &threec503_device, NULL }, + { &pcnet_am79c960_device, NULL }, + { &pcnet_am79c961_device, NULL }, + { &ne1000_device, NULL }, + { &ne2000_device, NULL }, + { &pcnet_am79c960_eb_device, NULL }, + { &rtl8019as_device, NULL }, + { &wd8003e_device, NULL }, + { &wd8003eb_device, NULL }, + { &wd8013ebt_device, NULL }, + { &plip_device, NULL }, + { ðernext_mc_device, NULL }, + { &wd8003eta_device, NULL }, + { &wd8003ea_device, NULL }, + { &pcnet_am79c973_device, NULL }, + { &pcnet_am79c970a_device, NULL }, + { &rtl8029as_device, NULL }, + { &pcnet_am79c960_vlb_device, NULL }, + { NULL, NULL } }; diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c index 22a85f1eb..a60314842 100644 --- a/src/scsi/scsi.c +++ b/src/scsi/scsi.c @@ -51,45 +51,54 @@ int scsi_card_current[SCSI_BUS_MAX] = { 0, 0 }; static uint8_t next_scsi_bus = 0; +static const device_t scsi_none_device = { + "None", + "scsi_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + typedef const struct { - const char *internal_name; const device_t *device; } SCSI_CARD; static SCSI_CARD scsi_cards[] = { - { "none", NULL, }, - { "aha154xa", &aha154xa_device, }, - { "aha154xb", &aha154xb_device, }, - { "aha154xc", &aha154xc_device, }, - { "aha154xcf", &aha154xcf_device, }, - { "aha154xcp", &aha154xcp_device, }, - { "bt542b", &buslogic_542b_device, }, - { "bt542bh", &buslogic_542bh_device, }, - { "bt545s", &buslogic_545s_device, }, - { "bt545c", &buslogic_545c_device, }, - { "lcs6821n", &scsi_lcs6821n_device, }, - { "rt1000b", &scsi_rt1000b_device, }, - { "t128", &scsi_t128_device, }, - { "t130b", &scsi_t130b_device, }, + { &scsi_none_device, }, + { &aha154xa_device, }, + { &aha154xb_device, }, + { &aha154xc_device, }, + { &aha154xcf_device, }, + { &aha154xcp_device, }, + { &buslogic_542b_device, }, + { &buslogic_542bh_device, }, + { &buslogic_545s_device, }, + { &buslogic_545c_device, }, + { &scsi_lcs6821n_device, }, + { &scsi_rt1000b_device, }, + { &scsi_t128_device, }, + { &scsi_t130b_device, }, #ifdef WALTJE - { "wd33c93", &scsi_wd33c93_device, }, + { &scsi_wd33c93_device, }, #endif - { "aha1640", &aha1640_device, }, - { "bt640a", &buslogic_640a_device, }, - { "ncr53c90", &ncr53c90_mca_device, }, - { "spock", &spock_device, }, - { "bt958d", &buslogic_958d_pci_device, }, - { "ncr53c810", &ncr53c810_pci_device, }, - { "ncr53c815", &ncr53c815_pci_device, }, - { "ncr53c820", &ncr53c820_pci_device, }, - { "ncr53c825a", &ncr53c825a_pci_device, }, - { "ncr53c860", &ncr53c860_pci_device, }, - { "ncr53c875", &ncr53c875_pci_device, }, - { "dc390", &dc390_pci_device, }, - { "bt445s", &buslogic_445s_device, }, - { "bt445c", &buslogic_445c_device, }, - { "", NULL, }, + { &aha1640_device, }, + { &buslogic_640a_device, }, + { &ncr53c90_mca_device, }, + { &spock_device, }, + { &buslogic_958d_pci_device, }, + { &ncr53c810_pci_device, }, + { &ncr53c815_pci_device, }, + { &ncr53c820_pci_device, }, + { &ncr53c825a_pci_device, }, + { &ncr53c860_pci_device, }, + { &ncr53c875_pci_device, }, + { &dc390_pci_device, }, + { &buslogic_445s_device, }, + { &buslogic_445c_device, }, + { NULL, }, }; diff --git a/src/sound/sound.c b/src/sound/sound.c index cf62c587a..51f475f8e 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -42,7 +42,6 @@ typedef struct { - const char *internal_name; const device_t *device; } SOUND_CARD; @@ -81,39 +80,57 @@ static void (*filter_cd_audio)(int channel, double *buffer, void *p) = NULL; static void *filter_cd_audio_p = NULL; +static const device_t sound_none_device = { + "None", + "sound_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; +static const device_t sound_internal_device = { + "Internal Sound Card", + "sound_internal", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + static const SOUND_CARD sound_cards[] = { - { "none", NULL }, - { "internal", NULL }, - { "adlib", &adlib_device }, - { "adlibgold", &adgold_device }, - { "azt2316a", &azt2316a_device }, - { "azt1605", &azt1605_device }, - { "cs4236b", &cs4236b_device }, - { "sb", &sb_1_device }, - { "sb1.5", &sb_15_device }, - { "sb2.0", &sb_2_device }, - { "sbprov1", &sb_pro_v1_device }, - { "sbprov2", &sb_pro_v2_device }, - { "sb16", &sb_16_device }, - { "sb16_pnp", &sb_16_pnp_device }, - { "sb32_pnp", &sb_32_pnp_device }, - { "sbawe32", &sb_awe32_device }, - { "sbawe32_pnp", &sb_awe32_pnp_device }, - { "sbawe64_gold", &sb_awe64_gold_device }, + { &sound_none_device }, + { &sound_internal_device }, + { &adlib_device }, + { &adgold_device }, + { &azt2316a_device }, + { &azt1605_device }, + { &cs4236b_device }, + { &sb_1_device }, + { &sb_15_device }, + { &sb_2_device }, + { &sb_pro_v1_device }, + { &sb_pro_v2_device }, + { &sb_16_device }, + { &sb_16_pnp_device }, + { &sb_32_pnp_device }, + { &sb_awe32_device }, + { &sb_awe32_pnp_device }, + { &sb_awe64_gold_device }, #if defined(DEV_BRANCH) && defined(USE_PAS16) - { "pas16", &pas16_device }, + { &pas16_device }, #endif - { "pssj_isa", &pssj_isa_device }, - { "wss", &wss_device }, - { "adlib_mca", &adlib_mca_device }, - { "ncraudio", &ncr_business_audio_device }, - { "sbmcv", &sb_mcv_device }, - { "sbpromcv", &sb_pro_mcv_device }, - { "es1371", &es1371_device }, - { "ad1881", &ad1881_device }, - { "cs4297a", &cs4297a_device }, - { "", NULL } + { &pssj_isa_device }, + { &wss_device }, + { &adlib_mca_device }, + { &ncr_business_audio_device }, + { &sb_mcv_device }, + { &sb_pro_mcv_device }, + { &es1371_device }, + { &ad1881_device }, + { &cs4297a_device }, + { NULL } }; diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 9399f1614..6c9873528 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -39,7 +39,6 @@ typedef struct { - const char *internal_name; const device_t *device; } VIDEO_CARD; @@ -49,176 +48,193 @@ static video_timings_t timing_default = {VIDEO_ISA, 8, 16, 32, 8, 16, 32}; static int was_reset = 0; +static const device_t vid_none_device = { + "None", + "vid_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; +static const device_t vid_internal_device = { + "Internal Video Card", + "vid_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + static const VIDEO_CARD video_cards[] = { - { "none", NULL }, - { "internal", NULL }, - { "egawonder800", &atiega_device }, - { "mach64gx_isa", &mach64gx_isa_device }, - { "ati28800k", &ati28800k_device }, - { "ati18800v", &ati18800_vga88_device }, - { "ati28800", &ati28800_device }, - { "compaq_ati28800", &compaq_ati28800_device }, + { &vid_none_device }, + { &vid_internal_device }, + { &atiega_device }, + { &mach64gx_isa_device }, + { &ati28800k_device }, + { &ati18800_vga88_device }, + { &ati28800_device }, + { compaq_ati28800_device }, #if defined(DEV_BRANCH) && defined(USE_XL24) - { "ati28800w", &ati28800_wonderxl24_device }, + { &ati28800_wonderxl24_device }, #endif - { "ati18800", &ati18800_device }, + { &ati18800_device }, #if defined(DEV_BRANCH) && defined(USE_VGAWONDER) - { "ati18800w", &ati18800_wonder_device }, + { &ati18800_wonder_device }, #endif - { "cga", &cga_device }, - { "superega", &sega_device }, - { "cl_gd5401_isa", &gd5401_isa_device }, - { "cl_gd5402_isa", &gd5402_isa_device }, - { "cl_gd5420_isa", &gd5420_isa_device }, - { "cl_gd5422_isa", &gd5422_isa_device }, - { "cl_gd5426_isa", &gd5426_isa_device }, - { "cl_gd5426_diamond_a1_isa", &gd5426_diamond_speedstar_pro_a1_isa_device }, - { "cl_gd5428_isa", &gd5428_isa_device }, - { "cl_gd5429_isa", &gd5429_isa_device }, - { "cl_gd5434_isa", &gd5434_isa_device }, - { "cl_gd5434_diamond_a3_isa", &gd5434_diamond_speedstar_64_a3_isa_device }, - { "compaq_cga", &compaq_cga_device }, - { "compaq_cga_2", &compaq_cga_2_device }, - { "compaq_ega", &cpqega_device }, - { "ega", &ega_device }, - { "g2_gc205", &g2_gc205_device }, - { "hercules", &hercules_device }, - { "hercules_plus", &herculesplus_device }, - { "incolor", &incolor_device }, - { "im1024", &im1024_device }, - { "iskra_ega", &iskra_ega_device }, - { "kasan16vga", &et4000_kasan_isa_device }, - { "mda", &mda_device }, - { "genius", &genius_device }, - { "nga", &nga_device }, - { "ogc", &ogc_device }, - { "oti037c", &oti037c_device }, - { "oti067", &oti067_device }, - { "oti077", &oti077_device }, - { "pvga1a", ¶dise_pvga1a_device }, - { "wd90c11", ¶dise_wd90c11_device }, - { "wd90c30", ¶dise_wd90c30_device }, - { "plantronics", &colorplus_device }, - { "pgc", &pgc_device }, - { "radius_isa", &radius_svga_multiview_isa_device }, - { "rtg3106", &realtek_rtg3106_device }, - { "stealthvram_isa", &s3_diamond_stealth_vram_isa_device }, - { "orchid_s3_911", &s3_orchid_86c911_isa_device }, - { "ami_s3_924", &s3_ami_86c924_isa_device }, - { "metheus928_isa", &s3_metheus_86c928_isa_device }, - { "px_86c801_isa", &s3_phoenix_86c801_isa_device }, - { "px_s3_v7_801_isa", &s3_spea_mirage_86c801_isa_device }, - { "sigma400", &sigma_device }, - { "tvga8900b", &tvga8900b_device }, - { "tvga8900d", &tvga8900d_device }, - { "tvga9000b", &tvga9000b_device }, - { "tgkorvga", &et4000k_isa_device }, - { "et2000", &et2000_device }, - { "et4000ax", &et4000_isa_device }, - { "et4000w32", &et4000w32_device }, - { "et4000w32i", &et4000w32i_isa_device }, - { "vga", &vga_device }, - { "v7_vga_1024i", &v7_vga_1024i_device }, - { "wy700", &wy700_device }, - { "ibm1mbsvga", &gd5428_mca_device }, - { "et4000mca", &et4000_mca_device }, - { "radius_mc", &radius_svga_multiview_mca_device }, - { "mach64gx_pci", &mach64gx_pci_device }, - { "mach64vt2", &mach64vt2_device }, - { "et4000w32p_revc_pci", &et4000w32p_revc_pci_device }, - { "et4000w32p_pci", &et4000w32p_cardex_pci_device }, - { "et4000w32p_nc_pci", &et4000w32p_noncardex_pci_device }, - { "cl_gd5430_pci", &gd5430_pci_device, }, - { "cl_gd5434_pci", &gd5434_pci_device }, - { "cl_gd5436_pci", &gd5436_pci_device }, - { "cl_gd5440_pci", &gd5440_pci_device }, - { "cl_gd5446_pci", &gd5446_pci_device }, - { "cl_gd5446_stb_pci", &gd5446_stb_pci_device }, - { "cl_gd5480_pci", &gd5480_pci_device }, - { "ctl3d_banshee_pci", &creative_voodoo_banshee_device }, - { "stealth32_pci", &et4000w32p_pci_device }, - { "spea_mercurylite_pci", &s3_spea_mercury_lite_86c928_pci_device }, - { "stealth64v_pci", &s3_diamond_stealth64_964_pci_device }, - { "elsawin2kprox_964_pci", &s3_elsa_winner2000_pro_x_964_pci_device }, - { "mirocrystal20sv_pci", &s3_mirocrystal_20sv_964_pci_device }, - { "bahamas64_pci", &s3_bahamas64_pci_device }, - { "px_vision864_pci", &s3_phoenix_vision864_pci_device }, - { "stealthse_pci", &s3_diamond_stealth_se_pci_device }, - { "px_trio32_pci", &s3_phoenix_trio32_pci_device }, - { "stealth64d_pci", &s3_diamond_stealth64_pci_device }, - { "n9_9fx_pci", &s3_9fx_pci_device }, - { "px_trio64_pci", &s3_phoenix_trio64_pci_device }, - { "elsawin2kprox_pci", &s3_elsa_winner2000_pro_x_pci_device }, - { "mirovideo40sv_pci", &s3_mirovideo_40sv_ergo_968_pci_device }, - { "n9_9fx_771_pci", &s3_9fx_771_pci_device }, - { "px_vision968_pci", &s3_phoenix_vision968_pci_device }, - { "spea_mercury64p_pci", &s3_spea_mercury_p64v_pci_device }, - { "n9_9fx_531_pci", &s3_9fx_531_pci_device }, - { "px_vision868_pci", &s3_phoenix_vision868_pci_device }, - { "px_trio64vplus_pci", &s3_phoenix_trio64vplus_pci_device }, - { "trio64v2dx_pci", &s3_trio64v2_dx_pci_device }, - { "virge325_pci", &s3_virge_325_pci_device }, - { "stealth3d_2000_pci", &s3_diamond_stealth_2000_pci_device }, - { "stealth3d_3000_pci", &s3_diamond_stealth_3000_pci_device }, - { "stb_velocity3d_pci", &s3_stb_velocity_3d_pci_device }, - { "virge375_pci", &s3_virge_375_pci_device }, - { "stealth3d_2000pro_pci", &s3_diamond_stealth_2000pro_pci_device }, - { "virge385_pci", &s3_virge_385_pci_device }, - { "virge357_pci", &s3_virge_357_pci_device }, - { "stealth3d_4000_pci", &s3_diamond_stealth_4000_pci_device }, - { "trio3d2x", &s3_trio3d2x_pci_device }, + { &cga_device }, + { &sega_device }, + { &gd5401_isa_device }, + { &gd5402_isa_device }, + { &gd5420_isa_device }, + { &gd5422_isa_device }, + { &gd5426_isa_device }, + { gd5426_diamond_speedstar_pro_a1_isa_device }, + { &gd5428_isa_device }, + { &gd5429_isa_device }, + { &gd5434_isa_device }, + { gd5434_diamond_speedstar_64_a3_isa_device }, + { &compaq_cga_device }, + { &compaq_cga_2_device }, + { &cpqega_device }, + { &ega_device }, + { &g2_gc205_device }, + { &hercules_device }, + { &herculesplus_device }, + { &incolor_device }, + { &im1024_device }, + { &iskra_ega_device }, + { &et4000_kasan_isa_device }, + { &mda_device }, + { &genius_device }, + { &nga_device }, + { &ogc_device }, + { &oti037c_device }, + { &oti067_device }, + { &oti077_device }, + { ¶dise_pvga1a_device }, + { ¶dise_wd90c11_device }, + { ¶dise_wd90c30_device }, + { &colorplus_device }, + { &pgc_device }, + { &radius_svga_multiview_isa_device }, + { &realtek_rtg3106_device }, + { s3_diamond_stealth_vram_isa_device }, + { &s3_orchid_86c911_isa_device }, + { &s3_ami_86c924_isa_device }, + { &s3_metheus_86c928_isa_device }, + { &s3_phoenix_86c801_isa_device }, + { s3_spea_mirage_86c801_isa_device }, + { &sigma_device }, + { &tvga8900b_device }, + { &tvga8900d_device }, + { &tvga9000b_device }, + { &et4000k_isa_device }, + { &et2000_device }, + { &et4000_isa_device }, + { &et4000w32_device }, + { &et4000w32i_isa_device }, + { &vga_device }, + { &v7_vga_1024i_device }, + { &wy700_device }, + { &gd5428_mca_device }, + { &et4000_mca_device }, + { &radius_svga_multiview_mca_device }, + { &mach64gx_pci_device }, + { &mach64vt2_device }, + { et4000w32p_revc_pci_device }, + { &et4000w32p_cardex_pci_device }, + { et4000w32p_noncardex_pci_device }, + { &gd5430_pci_device, }, + { &gd5434_pci_device }, + { &gd5436_pci_device }, + { &gd5440_pci_device }, + { &gd5446_pci_device }, + { gd5446_stb_pci_device }, + { &gd5480_pci_device }, + { creative_voodoo_banshee_device }, + { &et4000w32p_pci_device }, + { s3_spea_mercury_lite_86c928_pci_device }, + { &s3_diamond_stealth64_964_pci_device }, + { s3_elsa_winner2000_pro_x_964_pci_device }, + { s3_mirocrystal_20sv_964_pci_device }, + { &s3_bahamas64_pci_device }, + { s3_phoenix_vision864_pci_device }, + { &s3_diamond_stealth_se_pci_device }, + { &s3_phoenix_trio32_pci_device }, + { &s3_diamond_stealth64_pci_device }, + { &s3_9fx_pci_device }, + { &s3_phoenix_trio64_pci_device }, + { s3_elsa_winner2000_pro_x_pci_device }, + { s3_mirovideo_40sv_ergo_968_pci_device }, + { &s3_9fx_771_pci_device }, + { s3_phoenix_vision968_pci_device }, + { s3_spea_mercury_p64v_pci_device }, + { &s3_9fx_531_pci_device }, + { s3_phoenix_vision868_pci_device }, + { s3_phoenix_trio64vplus_pci_device }, + { &s3_trio64v2_dx_pci_device }, + { &s3_virge_325_pci_device }, + { s3_diamond_stealth_2000_pci_device }, + { s3_diamond_stealth_3000_pci_device }, + { s3_stb_velocity_3d_pci_device }, + { &s3_virge_375_pci_device }, + { s3_diamond_stealth_2000pro_pci_device }, + { &s3_virge_385_pci_device }, + { &s3_virge_357_pci_device }, + { s3_diamond_stealth_4000_pci_device }, + { &s3_trio3d2x_pci_device }, #if defined(DEV_BRANCH) && defined(USE_MGA) - { "mystique", &mystique_device }, - { "mystique_220", &mystique_220_device }, + { &mystique_device }, + { &mystique_220_device }, #endif - { "tgui9440_pci", &tgui9440_pci_device }, - { "tgui9660_pci", &tgui9660_pci_device }, - { "tgui9680_pci", &tgui9680_pci_device }, - { "voodoo_banshee_pci", &voodoo_banshee_device }, - { "voodoo3_2k_pci", &voodoo_3_2000_device }, - { "voodoo3_3k_pci", &voodoo_3_3000_device }, - { "mach64gx_vlb", &mach64gx_vlb_device }, - { "et4000w32i_vlb", &et4000w32i_vlb_device }, - { "et4000w32p_revc_vlb", &et4000w32p_revc_vlb_device }, - { "et4000w32p_vlb", &et4000w32p_cardex_vlb_device }, - { "stealth32_vlb", &et4000w32p_vlb_device }, - { "et4000w32p_nc_vlb", &et4000w32p_noncardex_vlb_device }, - { "cl_gd5424_vlb", &gd5424_vlb_device }, - { "cl_gd5426_vlb", &gd5426_vlb_device }, - { "cl_gd5428_vlb", &gd5428_vlb_device }, - { "cl_gd5428_diamond_b1_vlb", &gd5428_diamond_speedstar_pro_b1_vlb_device }, - { "cl_gd5429_vlb", &gd5429_vlb_device }, - { "cl_gd5430_vlb", &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, - { "cl_gd5434_vlb", &gd5434_vlb_device }, - { "metheus928_vlb", &s3_metheus_86c928_vlb_device }, - { "mirocrystal8s_vlb", &s3_mirocrystal_8s_805_vlb_device }, - { "mirocrystal10sd_vlb", &s3_mirocrystal_10sd_805_vlb_device }, - { "px_86c805_vlb", &s3_phoenix_86c805_vlb_device }, - { "px_s3_v7_805_vlb", &s3_spea_mirage_86c805_vlb_device }, - { "stealth64v_vlb", &s3_diamond_stealth64_964_vlb_device }, - { "mirocrystal20sv_vlb", &s3_mirocrystal_20sv_964_vlb_device }, - { "mirocrystal20sd_vlb", &s3_mirocrystal_20sd_864_vlb_device }, - { "bahamas64_vlb", &s3_bahamas64_vlb_device }, - { "px_vision864_vlb", &s3_phoenix_vision864_vlb_device }, - { "stealthse_vlb", &s3_diamond_stealth_se_vlb_device }, - { "px_trio32_vlb", &s3_phoenix_trio32_vlb_device }, - { "stealth64d_vlb", &s3_diamond_stealth64_vlb_device }, - { "n9_9fx_vlb", &s3_9fx_vlb_device }, - { "px_trio64_vlb", &s3_phoenix_trio64_vlb_device }, - { "spea_miragep64_vlb", &s3_spea_mirage_p64_vlb_device }, - { "px_vision968_vlb", &s3_phoenix_vision968_vlb_device }, - { "px_vision868_vlb", &s3_phoenix_vision868_vlb_device }, - { "ht216_32", &ht216_32_standalone_device }, - { "tgui9400cxi_vlb", &tgui9400cxi_device }, - { "tgui9440_vlb", &tgui9440_vlb_device }, - { "virge357_agp", &s3_virge_357_agp_device }, - { "stealth3d_4000_agp", &s3_diamond_stealth_4000_agp_device }, - { "trio3d2x_agp", &s3_trio3d2x_agp_device }, - { "velocity100_agp", &velocity_100_agp_device }, - { "voodoo3_2k_agp", &voodoo_3_2000_agp_device }, - { "voodoo3_3k_agp", &voodoo_3_3000_agp_device }, - { "", NULL } + { &tgui9440_pci_device }, + { &tgui9660_pci_device }, + { &tgui9680_pci_device }, + { voodoo_banshee_device }, + { &voodoo_3_2000_device }, + { &voodoo_3_3000_device }, + { &mach64gx_vlb_device }, + { &et4000w32i_vlb_device }, + { et4000w32p_revc_vlb_device }, + { &et4000w32p_cardex_vlb_device }, + { &et4000w32p_vlb_device }, + { et4000w32p_noncardex_vlb_device }, + { &gd5424_vlb_device }, + { &gd5426_vlb_device }, + { &gd5428_vlb_device }, + { gd5428_diamond_speedstar_pro_b1_vlb_device }, + { &gd5429_vlb_device }, + { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, + { &gd5434_vlb_device }, + { &s3_metheus_86c928_vlb_device }, + { s3_mirocrystal_8s_805_vlb_device }, + { s3_mirocrystal_10sd_805_vlb_device }, + { &s3_phoenix_86c805_vlb_device }, + { s3_spea_mirage_86c805_vlb_device }, + { &s3_diamond_stealth64_964_vlb_device }, + { s3_mirocrystal_20sv_964_vlb_device }, + { s3_mirocrystal_20sd_864_vlb_device }, + { &s3_bahamas64_vlb_device }, + { s3_phoenix_vision864_vlb_device }, + { &s3_diamond_stealth_se_vlb_device }, + { &s3_phoenix_trio32_vlb_device }, + { &s3_diamond_stealth64_vlb_device }, + { &s3_9fx_vlb_device }, + { &s3_phoenix_trio64_vlb_device }, + { s3_spea_mirage_p64_vlb_device }, + { s3_phoenix_vision968_vlb_device }, + { s3_phoenix_vision868_vlb_device }, + { &ht216_32_standalone_device }, + { tgui9400cxi_device }, + { &tgui9440_vlb_device }, + { &s3_virge_357_agp_device }, + { s3_diamond_stealth_4000_agp_device }, + { &s3_trio3d2x_agp_device }, + { velocity_100_agp_device }, + { &voodoo_3_2000_agp_device }, + { &voodoo_3_3000_agp_device }, + { NULL } }; From 062414d13cd9cc9aa376a884863819ff44f49057 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 17:51:23 -0500 Subject: [PATCH 16/23] missed some funcs, refactored --- src/lpt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lpt.c b/src/lpt.c index 16c115fe2..e601320e3 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -46,7 +46,7 @@ static const struct { char * lpt_device_get_name(int id) { - if (strlen((char *) lpt_devices[id].internal_name) == 0) + if (strlen((char *) lpt_devices[id].device->internal_name) == 0) return NULL; if (!lpt_devices[id].device) return "None"; @@ -57,9 +57,9 @@ lpt_device_get_name(int id) char * lpt_device_get_internal_name(int id) { - if (strlen((char *) lpt_devices[id].internal_name) == 0) + if (strlen((char *) lpt_devices[id].device->internal_name) == 0) return NULL; - return (char *) lpt_devices[id].internal_name; + return (char *) lpt_devices[id].device->internal_name; } @@ -68,8 +68,8 @@ lpt_device_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) lpt_devices[c].internal_name) != 0) { - if (strcmp(lpt_devices[c].internal_name, s) == 0) + while (strlen((char *) lpt_devices[c].device->internal_name) != 0) { + if (strcmp(lpt_devices[c].device->internal_name, s) == 0) return c; c++; } From ccf566b9b0cd469ed185222a5a112a7c9860e500 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 17:54:24 -0500 Subject: [PATCH 17/23] more overzealous refactoring undone --- src/lpt.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/lpt.c b/src/lpt.c index e601320e3..e2cb6ad5e 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -17,36 +17,27 @@ lpt_port_t lpt_ports[PARALLEL_MAX]; -static const device_t lpt_none_device = { - "None", - "lpt_none", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, - NULL -}; - - static const struct { + const char *internal_name; const lpt_device_t *device; } lpt_devices[] = { - {&lpt_none_device}, - {&dss_device}, - {&lpt_dac_device}, - {&lpt_dac_stereo_device}, - {&lpt_prt_text_device}, - {&lpt_prt_escp_device}, - {&lpt_prt_ps_device}, - {&lpt_plip_device}, - {&lpt_hasp_savquest_device}, - {NULL} + {"none", NULL}, + {"dss", &dss_device}, + {"lpt_dac", &lpt_dac_device}, + {"lpt_dac_stereo", &lpt_dac_stereo_device}, + {"text_prt", &lpt_prt_text_device}, + {"dot_matrix", &lpt_prt_escp_device}, + {"postscript", &lpt_prt_ps_device}, + {"plip", &lpt_plip_device}, + {"dongle_savquest", &lpt_hasp_savquest_device}, + {"", NULL} }; char * lpt_device_get_name(int id) { - if (strlen((char *) lpt_devices[id].device->internal_name) == 0) + if (strlen((char *) lpt_devices[id].internal_name) == 0) return NULL; if (!lpt_devices[id].device) return "None"; @@ -57,9 +48,9 @@ lpt_device_get_name(int id) char * lpt_device_get_internal_name(int id) { - if (strlen((char *) lpt_devices[id].device->internal_name) == 0) + if (strlen((char *) lpt_devices[id].internal_name) == 0) return NULL; - return (char *) lpt_devices[id].device->internal_name; + return (char *) lpt_devices[id].internal_name; } @@ -68,8 +59,8 @@ lpt_device_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) lpt_devices[c].device->internal_name) != 0) { - if (strcmp(lpt_devices[c].device->internal_name, s) == 0) + while (strlen((char *) lpt_devices[c].internal_name) != 0) { + if (strcmp(lpt_devices[c].internal_name, s) == 0) return c; c++; } From d12d6146323c2d7f71259e8bb02ca253bd1b5c4b Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 17:57:11 -0500 Subject: [PATCH 18/23] forgot to refactor hdc table def --- src/disk/hdc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/disk/hdc.c b/src/disk/hdc.c index 0e9eb8139..2a69e4b23 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -94,7 +94,6 @@ static const device_t hdc_internal_device = { static const struct { - const char *internal_name; const device_t *device; } controllers[] = { { &hdc_null_device }, From e77b9a88ab7123254712b6c56952deab2bc67541 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 18:00:06 -0500 Subject: [PATCH 19/23] typo fixed --- src/disk/hdc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/disk/hdc.c b/src/disk/hdc.c index 2a69e4b23..a96e7893a 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -66,13 +66,6 @@ null_close(void *priv) } -static const device_t hdc_none_device = { - "None", "hdc_none", 0, 0, - null_init, null_close, NULL, - { NULL }, NULL, NULL, NULL -}; - - static void * inthdc_init(const device_t *info) { @@ -86,6 +79,11 @@ inthdc_close(void *priv) } +static const device_t hdc_none_device = { + "None", "hdc_none", 0, 0, + null_init, null_close, NULL, + { NULL }, NULL, NULL, NULL +}; static const device_t hdc_internal_device = { "Internal", "hdc_internal", 0, 0, inthdc_init, inthdc_close, NULL, @@ -96,7 +94,7 @@ static const device_t hdc_internal_device = { static const struct { const device_t *device; } controllers[] = { - { &hdc_null_device }, + { &hdc_none_device }, { &hdc_internal_device }, { &st506_xt_xebec_device }, { &st506_xt_dtc5150x_device }, From 6c6c6287ea51c73a457b6d67328c31e51e10515a Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 18:08:43 -0500 Subject: [PATCH 20/23] more fix --- src/floppy/fdc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index a73e039b8..01e94eb2e 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -101,6 +101,24 @@ fdc_log(const char *fmt, ...) #endif +const device_t fdc_none_device = { + "None", + "fdc_none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; +const device_t fdc_internal_device = { + "None", + "fdc_internal", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + + typedef const struct { const device_t *device; } fdc_cards_t; @@ -2373,25 +2391,7 @@ fdc_3f1_enable(fdc_t *fdc, int enable) } -const device_t fdc_none_device = { - "None", - "fdc_none", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, - NULL -}; -const device_t fdc_internal_device = { - "None", - "fdc_internal", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, - NULL -}; - -const device_t fdc_internal_device = {}; const device_t fdc_xt_device = { "PC/XT Floppy Drive Controller", From f91654d301388849d0887a831fe4292e9aa81950 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 18:11:11 -0500 Subject: [PATCH 21/23] another typo --- src/floppy/fdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index 01e94eb2e..d1b3032ec 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -125,7 +125,7 @@ typedef const struct { /* All emulated machines have at least one integrated FDC controller */ static fdc_cards_t fdc_cards[] = { - { &fdc_null_device }, + { &fdc_none_device }, { &fdc_internal_device }, { &fdc_b215_device }, { &fdc_pii151b_device }, From 296e25c685c863313640ad357fdb035df71c3a70 Mon Sep 17 00:00:00 2001 From: Jess Lovelace Date: Wed, 2 Feb 2022 18:18:37 -0500 Subject: [PATCH 22/23] more typos still --- src/video/vid_table.c | 80 +++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 6c9873528..99dbec45f 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -74,7 +74,7 @@ video_cards[] = { { &ati28800k_device }, { &ati18800_vga88_device }, { &ati28800_device }, - { compaq_ati28800_device }, + { &compaq_ati28800_device }, #if defined(DEV_BRANCH) && defined(USE_XL24) { &ati28800_wonderxl24_device }, #endif @@ -89,11 +89,11 @@ video_cards[] = { { &gd5420_isa_device }, { &gd5422_isa_device }, { &gd5426_isa_device }, - { gd5426_diamond_speedstar_pro_a1_isa_device }, + { &gd5426_diamond_speedstar_pro_a1_isa_device }, { &gd5428_isa_device }, { &gd5429_isa_device }, { &gd5434_isa_device }, - { gd5434_diamond_speedstar_64_a3_isa_device }, + { &gd5434_diamond_speedstar_64_a3_isa_device }, { &compaq_cga_device }, { &compaq_cga_2_device }, { &cpqega_device }, @@ -119,12 +119,12 @@ video_cards[] = { { &pgc_device }, { &radius_svga_multiview_isa_device }, { &realtek_rtg3106_device }, - { s3_diamond_stealth_vram_isa_device }, + { &s3_diamond_stealth_vram_isa_device }, { &s3_orchid_86c911_isa_device }, { &s3_ami_86c924_isa_device }, { &s3_metheus_86c928_isa_device }, { &s3_phoenix_86c801_isa_device }, - { s3_spea_mirage_86c801_isa_device }, + { &s3_spea_mirage_86c801_isa_device }, { &sigma_device }, { &tvga8900b_device }, { &tvga8900d_device }, @@ -142,47 +142,47 @@ video_cards[] = { { &radius_svga_multiview_mca_device }, { &mach64gx_pci_device }, { &mach64vt2_device }, - { et4000w32p_revc_pci_device }, + { &et4000w32p_revc_pci_device }, { &et4000w32p_cardex_pci_device }, - { et4000w32p_noncardex_pci_device }, + { &et4000w32p_noncardex_pci_device }, { &gd5430_pci_device, }, { &gd5434_pci_device }, { &gd5436_pci_device }, { &gd5440_pci_device }, { &gd5446_pci_device }, - { gd5446_stb_pci_device }, + { &gd5446_stb_pci_device }, { &gd5480_pci_device }, - { creative_voodoo_banshee_device }, + { &creative_voodoo_banshee_device }, { &et4000w32p_pci_device }, - { s3_spea_mercury_lite_86c928_pci_device }, + { &s3_spea_mercury_lite_86c928_pci_device }, { &s3_diamond_stealth64_964_pci_device }, - { s3_elsa_winner2000_pro_x_964_pci_device }, - { s3_mirocrystal_20sv_964_pci_device }, + { &s3_elsa_winner2000_pro_x_964_pci_device }, + { &s3_mirocrystal_20sv_964_pci_device }, { &s3_bahamas64_pci_device }, - { s3_phoenix_vision864_pci_device }, + { &s3_phoenix_vision864_pci_device }, { &s3_diamond_stealth_se_pci_device }, { &s3_phoenix_trio32_pci_device }, { &s3_diamond_stealth64_pci_device }, { &s3_9fx_pci_device }, { &s3_phoenix_trio64_pci_device }, - { s3_elsa_winner2000_pro_x_pci_device }, - { s3_mirovideo_40sv_ergo_968_pci_device }, + { &s3_elsa_winner2000_pro_x_pci_device }, + { &s3_mirovideo_40sv_ergo_968_pci_device }, { &s3_9fx_771_pci_device }, - { s3_phoenix_vision968_pci_device }, - { s3_spea_mercury_p64v_pci_device }, + { &s3_phoenix_vision968_pci_device }, + { &s3_spea_mercury_p64v_pci_device }, { &s3_9fx_531_pci_device }, - { s3_phoenix_vision868_pci_device }, - { s3_phoenix_trio64vplus_pci_device }, + { &s3_phoenix_vision868_pci_device }, + { &s3_phoenix_trio64vplus_pci_device }, { &s3_trio64v2_dx_pci_device }, { &s3_virge_325_pci_device }, - { s3_diamond_stealth_2000_pci_device }, - { s3_diamond_stealth_3000_pci_device }, - { s3_stb_velocity_3d_pci_device }, + { &s3_diamond_stealth_2000_pci_device }, + { &s3_diamond_stealth_3000_pci_device }, + { &s3_stb_velocity_3d_pci_device }, { &s3_virge_375_pci_device }, - { s3_diamond_stealth_2000pro_pci_device }, + { &s3_diamond_stealth_2000pro_pci_device }, { &s3_virge_385_pci_device }, { &s3_virge_357_pci_device }, - { s3_diamond_stealth_4000_pci_device }, + { &s3_diamond_stealth_4000_pci_device }, { &s3_trio3d2x_pci_device }, #if defined(DEV_BRANCH) && defined(USE_MGA) { &mystique_device }, @@ -191,47 +191,47 @@ video_cards[] = { { &tgui9440_pci_device }, { &tgui9660_pci_device }, { &tgui9680_pci_device }, - { voodoo_banshee_device }, + { &voodoo_banshee_device }, { &voodoo_3_2000_device }, { &voodoo_3_3000_device }, { &mach64gx_vlb_device }, { &et4000w32i_vlb_device }, - { et4000w32p_revc_vlb_device }, + { &et4000w32p_revc_vlb_device }, { &et4000w32p_cardex_vlb_device }, { &et4000w32p_vlb_device }, - { et4000w32p_noncardex_vlb_device }, + { &et4000w32p_noncardex_vlb_device }, { &gd5424_vlb_device }, { &gd5426_vlb_device }, { &gd5428_vlb_device }, - { gd5428_diamond_speedstar_pro_b1_vlb_device }, + { &gd5428_diamond_speedstar_pro_b1_vlb_device }, { &gd5429_vlb_device }, { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, { &gd5434_vlb_device }, { &s3_metheus_86c928_vlb_device }, - { s3_mirocrystal_8s_805_vlb_device }, - { s3_mirocrystal_10sd_805_vlb_device }, + { &s3_mirocrystal_8s_805_vlb_device }, + { &s3_mirocrystal_10sd_805_vlb_device }, { &s3_phoenix_86c805_vlb_device }, - { s3_spea_mirage_86c805_vlb_device }, + { &s3_spea_mirage_86c805_vlb_device }, { &s3_diamond_stealth64_964_vlb_device }, - { s3_mirocrystal_20sv_964_vlb_device }, - { s3_mirocrystal_20sd_864_vlb_device }, + { &s3_mirocrystal_20sv_964_vlb_device }, + { &s3_mirocrystal_20sd_864_vlb_device }, { &s3_bahamas64_vlb_device }, - { s3_phoenix_vision864_vlb_device }, + { &s3_phoenix_vision864_vlb_device }, { &s3_diamond_stealth_se_vlb_device }, { &s3_phoenix_trio32_vlb_device }, { &s3_diamond_stealth64_vlb_device }, { &s3_9fx_vlb_device }, { &s3_phoenix_trio64_vlb_device }, - { s3_spea_mirage_p64_vlb_device }, - { s3_phoenix_vision968_vlb_device }, - { s3_phoenix_vision868_vlb_device }, + { &s3_spea_mirage_p64_vlb_device }, + { &s3_phoenix_vision968_vlb_device }, + { &s3_phoenix_vision868_vlb_device }, { &ht216_32_standalone_device }, - { tgui9400cxi_device }, + { &tgui9400cxi_device }, { &tgui9440_vlb_device }, { &s3_virge_357_agp_device }, - { s3_diamond_stealth_4000_agp_device }, + { &s3_diamond_stealth_4000_agp_device }, { &s3_trio3d2x_agp_device }, - { velocity_100_agp_device }, + { &velocity_100_agp_device }, { &voodoo_3_2000_agp_device }, { &voodoo_3_3000_agp_device }, { NULL } From 6f2b93923cc00408e285b55a46a27784ec93c796 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 3 Feb 2022 03:10:06 +0100 Subject: [PATCH 23/23] A lot of fixes - everything now seems to work properly. --- src/device.c | 10 + src/device/isamem.c | 18 +- src/device/isartc.c | 16 +- src/device/mouse.c | 16 +- src/device/mouse_bus.c | 6 +- src/device/mouse_ps2.c | 2 +- src/device/mouse_serial.c | 6 +- src/disk/hdc.c | 33 ++- src/disk/hdc_esdi_at.c | 2 +- src/disk/hdc_esdi_mca.c | 2 +- src/disk/hdc_st506_at.c | 2 +- src/disk/hdc_st506_xt.c | 2 +- src/floppy/fdc.c | 25 +- src/floppy/fdc_magitronic.c | 2 +- src/floppy/fdc_pii15xb.c | 4 +- src/game/gameport.c | 31 +-- src/game/joystick_ch_flightstick_pro.c | 1 + src/game/joystick_standard.c | 7 + src/game/joystick_sw_pad.c | 1 + src/game/joystick_tm_fcs.c | 1 + src/include/86box/device.h | 2 + src/include/86box/gameport.h | 1 + src/network/net_3c503.c | 2 +- src/network/net_ne2000.c | 10 +- src/network/net_pcnet.c | 14 +- src/network/network.c | 24 +- src/scsi/scsi.c | 64 ++--- src/scsi/scsi_buslogic.c | 16 +- src/scsi/scsi_ncr5380.c | 8 +- src/scsi/scsi_ncr53c8xx.c | 14 +- src/scsi/scsi_pcscsi.c | 4 +- src/scsi/scsi_spock.c | 2 +- src/sio/sio_pc87332.c | 1 - src/sound/midi.c | 45 ++-- src/sound/midi_rtmidi.cpp | 4 +- src/sound/snd_adlibgold.c | 2 +- src/sound/snd_sb.c | 28 +-- src/sound/snd_wss.c | 2 +- src/sound/sound.c | 30 +-- src/video/vid_ati18800.c | 4 +- src/video/vid_ati28800.c | 2 +- src/video/vid_cl54xx.c | 60 ++--- src/video/vid_colorplus.c | 2 +- src/video/vid_ega.c | 7 +- src/video/vid_et4000.c | 8 +- src/video/vid_et4000w32.c | 14 +- src/video/vid_herculesplus.c | 2 +- src/video/vid_ht216.c | 8 +- src/video/vid_nga.c | 2 +- src/video/vid_oak_oti.c | 10 +- src/video/vid_ogc.c | 2 +- src/video/vid_paradise.c | 14 +- src/video/vid_rtg310x.c | 2 +- src/video/vid_s3.c | 95 ++++--- src/video/vid_s3_virge.c | 28 +-- src/video/vid_sigma.c | 2 +- src/video/vid_table.c | 332 ++++++++++++------------- src/video/vid_tgui9440.c | 2 +- src/video/vid_voodoo_banshee.c | 16 +- 59 files changed, 551 insertions(+), 521 deletions(-) diff --git a/src/device.c b/src/device.c index fba365260..136c11446 100644 --- a/src/device.c +++ b/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) { diff --git a/src/device/isamem.c b/src/device/isamem.c index 938b0cfb2..7ef72215f 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -1178,7 +1178,7 @@ static const device_config_t rampage_config[] = static const device_t rampage_device = { "AST RAMpage/XT", - "isamem_rampage", + "rampage", DEVICE_ISA, ISAMEM_RAMPAGEXT_CARD, isamem_init, isamem_close, NULL, @@ -1293,7 +1293,7 @@ static const device_t iab_device = { static const device_t isa_none_device = { "None", - "isa_none", + "none", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -1304,11 +1304,11 @@ static const device_t isa_none_device = { static const struct { const device_t *dev; } boards[] = { - { &isa_none_device }, + { &isa_none_device }, { &ibmxt_device }, - { &genericxt_device }, + { &genericxt_device }, { &ibmat_device }, - { &genericat_device }, + { &genericat_device }, { &p5pak_device }, { &a6pak_device }, { &ems5150_device }, @@ -1320,9 +1320,9 @@ static const struct { { &rampage_device }, #endif #ifdef USE_ISAMEM_IAB - { &iab_device }, + { &iab_device }, #endif - { NULL } + { NULL } }; @@ -1356,7 +1356,7 @@ isamem_get_name(int board) const char * isamem_get_internal_name(int board) { - return(boards[board].dev->internal_name); + return device_get_internal_name(boards[board].dev); } @@ -1366,7 +1366,7 @@ isamem_get_from_internal_name(const char *s) { int c = 0; - while (boards[c].dev->internal_name != NULL) { + while (boards[c].dev != NULL) { if (! strcmp(boards[c].dev->internal_name, s)) return(c); c++; diff --git a/src/device/isartc.c b/src/device/isartc.c index 598fe6ba0..d53919647 100644 --- a/src/device/isartc.c +++ b/src/device/isartc.c @@ -748,7 +748,7 @@ static const device_t a6pak_device = { static const device_t isartc_none_device = { "None", - "isartc_none", + "none", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -760,11 +760,11 @@ static const struct { const device_t *dev; } boards[] = { { &isartc_none_device }, - { &ev170_device }, - { &pii147_device }, - { &p5pak_device }, - { &a6pak_device }, - { NULL }, + { &ev170_device }, + { &pii147_device }, + { &p5pak_device }, + { &a6pak_device }, + { NULL }, }; @@ -781,7 +781,7 @@ isartc_reset(void) char * isartc_get_internal_name(int board) { - return((char *)boards[board].dev->internal_name); + return device_get_internal_name(boards[board].dev); } @@ -790,7 +790,7 @@ isartc_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) boards[c].dev->internal_name)) { + while (boards[c].dev != NULL) { if (! strcmp(boards[c].dev->internal_name, s)) return(c); c++; diff --git a/src/device/mouse.c b/src/device/mouse.c index 3d019f4cb..662d5e76e 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -44,15 +44,15 @@ int mouse_x, static const device_t mouse_none_device = { "None", - "mouse_none", + "none", 0, MOUSE_TYPE_NONE, NULL, NULL, NULL, { NULL }, NULL, NULL, NULL }; static const device_t mouse_internal_device = { - "Internal Mouse", - "mouse_internal", + "Internal", + "internal", 0, MOUSE_TYPE_INTERNAL, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -66,13 +66,13 @@ static mouse_t mouse_devices[] = { { &mouse_logibus_device }, { &mouse_msinport_device }, #if 0 - { "genibus", &mouse_genibus_device }, + { &mouse_genibus_device }, #endif { &mouse_mssystems_device }, { &mouse_msserial_device }, { &mouse_ltserial_device }, - { &mouse_ps2_device }, - { NULL, NULL } + { &mouse_ps2_device }, + { NULL } }; @@ -207,7 +207,7 @@ mouse_get_name(int mouse) char * mouse_get_internal_name(int mouse) { - return((char *)mouse_devices[mouse].device->internal_name); + return device_get_internal_name(mouse_devices[mouse].device); } @@ -216,7 +216,7 @@ mouse_get_from_internal_name(char *s) { int c = 0; - while (mouse_devices[c].device->internal_name != NULL) { + while (mouse_devices[c].device != NULL) { if (! strcmp((char *)mouse_devices[c].device->internal_name, s)) return(c); c++; diff --git a/src/device/mouse_bus.c b/src/device/mouse_bus.c index 901abc7aa..d627db75f 100644 --- a/src/device/mouse_bus.c +++ b/src/device/mouse_bus.c @@ -833,7 +833,7 @@ static const device_config_t ms_config[] = { const device_t mouse_logibus_device = { "Logitech/Microsoft Bus Mouse", - "mouse_logibus", + "logibus", DEVICE_ISA, MOUSE_TYPE_LOGIBUS, bm_init, bm_close, NULL, @@ -843,7 +843,7 @@ const device_t mouse_logibus_device = { const device_t mouse_logibus_onboard_device = { "Logitech Bus Mouse (On-Board)", - "mouse_logibus_onboard", + "logibus_onboard", DEVICE_ISA, MOUSE_TYPE_LOGIBUS | MOUSE_TYPE_ONBOARD, bm_init, bm_close, NULL, @@ -852,7 +852,7 @@ const device_t mouse_logibus_onboard_device = { const device_t mouse_msinport_device = { "Microsoft Bus Mouse (InPort)", - "mouse_msinport", + "msbus", DEVICE_ISA, MOUSE_TYPE_INPORT, bm_init, bm_close, NULL, diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c index 6086b40c6..b1b1ba3ca 100644 --- a/src/device/mouse_ps2.c +++ b/src/device/mouse_ps2.c @@ -355,7 +355,7 @@ static const device_config_t ps2_config[] = { const device_t mouse_ps2_device = { "Standard PS/2 Mouse", - "mouse_ps2", + "ps2", DEVICE_PS2, MOUSE_TYPE_PS2, mouse_ps2_init, ps2_close, NULL, diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c index be5e7d638..3cb49439a 100644 --- a/src/device/mouse_serial.c +++ b/src/device/mouse_serial.c @@ -900,7 +900,7 @@ static const device_config_t ltsermouse_config[] = { const device_t mouse_mssystems_device = { "Mouse Systems Serial Mouse", - "mouse_mssystems", + "mssystems", 0, MOUSE_TYPE_MSYSTEMS, sermouse_init, sermouse_close, NULL, @@ -910,7 +910,7 @@ const device_t mouse_mssystems_device = { const device_t mouse_msserial_device = { "Microsoft Serial Mouse", - "mouse_msserial", + "msserial", 0, 0, sermouse_init, sermouse_close, NULL, @@ -920,7 +920,7 @@ const device_t mouse_msserial_device = { const device_t mouse_ltserial_device = { "Logitech Serial Mouse", - "mouse_ltserial", + "ltserial", 0, 1, sermouse_init, sermouse_close, NULL, diff --git a/src/disk/hdc.c b/src/disk/hdc.c index a96e7893a..a6e09b732 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -80,12 +80,12 @@ inthdc_close(void *priv) static const device_t hdc_none_device = { - "None", "hdc_none", 0, 0, + "None", "none", 0, 0, null_init, null_close, NULL, { NULL }, NULL, NULL, NULL }; static const device_t hdc_internal_device = { - "Internal", "hdc_internal", 0, 0, + "Internal", "internal", 0, 0, inthdc_init, inthdc_close, NULL, { NULL }, NULL, NULL, NULL }; @@ -95,9 +95,9 @@ static const struct { const device_t *device; } controllers[] = { { &hdc_none_device }, - { &hdc_internal_device }, + { &hdc_internal_device }, { &st506_xt_xebec_device }, - { &st506_xt_dtc5150x_device }, + { &st506_xt_dtc5150x_device }, { &st506_xt_st11_m_device }, { &st506_xt_wd1002a_wx1_device }, { &st506_at_wd1003_device }, @@ -106,13 +106,13 @@ static const struct { { &esdi_at_wd1007vse1_device }, { &ide_isa_device }, { &ide_isa_2ch_device }, - { &xtide_at_device }, + { &xtide_at_device }, { &xtide_at_386_device }, { &xtide_at_ps2_device }, { &xta_wdxt150_device }, { &xtide_acculogic_device }, { &xtide_device }, - { &esdi_ps2_device }, + { &esdi_ps2_device }, { &ide_pci_device }, { &ide_pci_2ch_device }, { &ide_vlb_device }, @@ -154,23 +154,22 @@ hdc_reset(void) char * hdc_get_internal_name(int hdc) { - return((char *) controllers[hdc].device->internal_name); + return device_get_internal_name(controllers[hdc].device); } int hdc_get_from_internal_name(char *s) { - int c = 0; - - while (strlen((char *) controllers[c].device->internal_name)) - { - if (!strcmp((char *) controllers[c].device->internal_name, s)) - return c; - c++; - } - - return 0; + int c = 0; + + while (controllers[c].device != NULL) { + if (!strcmp((char *) controllers[c].device->internal_name, s)) + return c; + c++; + } + + return 0; } diff --git a/src/disk/hdc_esdi_at.c b/src/disk/hdc_esdi_at.c index 36b6d9b64..e6d2729fa 100644 --- a/src/disk/hdc_esdi_at.c +++ b/src/disk/hdc_esdi_at.c @@ -846,7 +846,7 @@ wd1007vse1_available(void) const device_t esdi_at_wd1007vse1_device = { "Western Digital WD1007V-SE1 (ESDI)", - "esdi_at_wd1007vse1", + "esdi_at", DEVICE_ISA | DEVICE_AT, 0, wd1007vse1_init, wd1007vse1_close, NULL, diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c index 2aa32fe23..f50a128f6 100644 --- a/src/disk/hdc_esdi_mca.c +++ b/src/disk/hdc_esdi_mca.c @@ -1181,7 +1181,7 @@ esdi_available(void) const device_t esdi_ps2_device = { "IBM PS/2 ESDI Fixed Disk Adapter (MCA)", - "esdi_ps2", + "esdi_mca", DEVICE_MCA, 0, esdi_init, esdi_close, NULL, { esdi_available }, NULL, NULL, NULL diff --git a/src/disk/hdc_st506_at.c b/src/disk/hdc_st506_at.c index dafa34c43..e78871103 100644 --- a/src/disk/hdc_st506_at.c +++ b/src/disk/hdc_st506_at.c @@ -770,7 +770,7 @@ mfm_close(void *priv) const device_t st506_at_wd1003_device = { "WD1003 AT MFM/RLL Controller", - "st506_at_wd1003", + "st506_at", DEVICE_ISA | DEVICE_AT, 0, mfm_init, mfm_close, NULL, diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c index f5666ed50..7d1f4ee20 100644 --- a/src/disk/hdc_st506_xt.c +++ b/src/disk/hdc_st506_xt.c @@ -1834,7 +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_xebec", + "st506_xt", DEVICE_ISA, (HDD_BUS_MFM << 8) | 0, st506_init, st506_close, NULL, diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index d1b3032ec..0a8ecafc4 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -101,17 +101,9 @@ fdc_log(const char *fmt, ...) #endif -const device_t fdc_none_device = { - "None", - "fdc_none", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, - NULL -}; const device_t fdc_internal_device = { - "None", - "fdc_internal", + "Internal", + "internal", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -125,12 +117,11 @@ typedef const struct { /* All emulated machines have at least one integrated FDC controller */ static fdc_cards_t fdc_cards[] = { - { &fdc_none_device }, { &fdc_internal_device }, - { &fdc_b215_device }, - { &fdc_pii151b_device }, - { &fdc_pii158b_device }, - { NULL } + { &fdc_b215_device }, + { &fdc_pii151b_device }, + { &fdc_pii158b_device }, + { NULL } }; @@ -163,7 +154,7 @@ fdc_card_has_config(int card) char * fdc_card_get_internal_name(int card) { - return((char *) fdc_cards[card].device->internal_name); + return device_get_internal_name(fdc_cards[card].device); } @@ -172,7 +163,7 @@ fdc_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) fdc_cards[c].device->internal_name)) { + while (fdc_cards[c].device != NULL) { if (!strcmp((char *) fdc_cards[c].device->internal_name, s)) return(c); c++; diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c index 915ce36d4..e0845ae7d 100644 --- a/src/floppy/fdc_magitronic.c +++ b/src/floppy/fdc_magitronic.c @@ -133,7 +133,7 @@ static const device_config_t b215_config[] = { const device_t fdc_b215_device = { "Magitronic B215", - "fdc_b215", + "b215", DEVICE_ISA, 0, b215_init, diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c index 18ae0f2cb..3339aa6a1 100644 --- a/src/floppy/fdc_pii15xb.c +++ b/src/floppy/fdc_pii15xb.c @@ -149,7 +149,7 @@ static const device_config_t pii_config[] = { const device_t fdc_pii151b_device = { "DTK PII-151B (MiniMicro) Floppy Drive Controller", - "fdc_pii151b", + "dtk_pii151b", DEVICE_ISA, 151, pii_init, @@ -162,7 +162,7 @@ const device_t fdc_pii151b_device = { const device_t fdc_pii158b_device = { "DTK PII-158B (MiniMicro4) Floppy Drive Controller", - "fdc_pii158b", + "dtk_pii158b", DEVICE_ISA, 158, pii_init, diff --git a/src/game/gameport.c b/src/game/gameport.c index 0aac6f94c..cbd4ec4ba 100644 --- a/src/game/gameport.c +++ b/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[] = { { &joystick_none }, - { &joystick_2axis_2button }, - { &joystick_2axis_4button }, - { &joystick_2axis_6button }, - { &joystick_2axis_8button }, - { &joystick_3axis_2button }, - { &joystick_3axis_4button }, - { &joystick_4axis_4button }, + { &joystick_2axis_2button }, + { &joystick_2axis_4button }, + { &joystick_2axis_6button }, + { &joystick_2axis_8button }, + { &joystick_3axis_2button }, + { &joystick_3axis_4button }, + { &joystick_4axis_4button }, { &joystick_ch_flightstick_pro }, - { &joystick_sw_pad }, - { &joystick_tm_fcs }, - { NULL } + { &joystick_sw_pad }, + { &joystick_tm_fcs }, + { 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)) { - if (!strcmp((char *) joysticks[c].internal_name, s)) + while (joysticks[c].joystick != NULL) { + if (!strcmp((char *) joysticks[c].joystick->internal_name, s)) return c; c++; } diff --git a/src/game/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c index 0faffa7c0..14bdee7a5 100644 --- a/src/game/joystick_ch_flightstick_pro.c +++ b/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, diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c index 75e2ecdf3..c06540b15 100644 --- a/src/game/joystick_standard.c +++ b/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, diff --git a/src/game/joystick_sw_pad.c b/src/game/joystick_sw_pad.c index 172b6826d..31e0c8624 100644 --- a/src/game/joystick_sw_pad.c +++ b/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, diff --git a/src/game/joystick_tm_fcs.c b/src/game/joystick_tm_fcs.c index 9d949f3c3..2c6a7d90f 100644 --- a/src/game/joystick_tm_fcs.c +++ b/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, diff --git a/src/include/86box/device.h b/src/include/86box/device.h index 33336ba93..eaae682f4 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -160,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); diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h index 49a6980de..4bd409d3d 100644 --- a/src/include/86box/gameport.h +++ b/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); diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c index 747bcae6b..a79699b31 100644 --- a/src/network/net_3c503.c +++ b/src/network/net_3c503.c @@ -743,7 +743,7 @@ static const device_config_t threec503_config[] = const device_t threec503_device = { "3Com EtherLink II", - "threec503", + "3c503", DEVICE_ISA, 0, threec503_nic_init, threec503_nic_close, NULL, diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index 5157823eb..db2a08bf1 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -1330,7 +1330,7 @@ static const device_config_t mca_mac_config[] = const device_t ne1000_device = { "Novell NE1000", - "ne1000", + "ne1k", DEVICE_ISA, NE2K_NE1000, nic_init, nic_close, NULL, @@ -1340,7 +1340,7 @@ const device_t ne1000_device = { const device_t ne2000_device = { "Novell NE2000", - "ne2000", + "ne2k", DEVICE_ISA | DEVICE_AT, NE2K_NE2000, nic_init, nic_close, NULL, @@ -1350,7 +1350,7 @@ const device_t ne2000_device = { const device_t ethernext_mc_device = { "NetWorth EtherNext/MC", - "ethernext_mc", + "ethernextmc", DEVICE_MCA, NE2K_ETHERNEXT_MC, nic_init, nic_close, NULL, @@ -1360,7 +1360,7 @@ const device_t ethernext_mc_device = { const device_t rtl8019as_device = { "Realtek RTL8019AS", - "rtl8019as", + "ne2kpnp", DEVICE_ISA | DEVICE_AT, NE2K_RTL8019AS, nic_init, nic_close, NULL, @@ -1370,7 +1370,7 @@ const device_t rtl8019as_device = { const device_t rtl8029as_device = { "Realtek RTL8029AS", - "rtl8029as", + "ne2kpci", DEVICE_PCI, NE2K_RTL8029AS, nic_init, nic_close, NULL, diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c index e17893bb4..373299732 100644 --- a/src/network/net_pcnet.c +++ b/src/network/net_pcnet.c @@ -3218,8 +3218,8 @@ static const device_config_t pcnet_vlb_config[] = }; const device_t pcnet_am79c960_device = { - "AMD PCnet-ISA ", - "pcnet_am79c960", + "AMD PCnet-ISA", + "pcnetisa", DEVICE_AT | DEVICE_ISA, DEV_AM79C960, pcnet_init, pcnet_close, NULL, @@ -3229,7 +3229,7 @@ const device_t pcnet_am79c960_device = { const device_t pcnet_am79c960_eb_device = { "Racal Interlan EtherBlaster", - "pcnet_am79c960_eb", + "pcnetracal", DEVICE_AT | DEVICE_ISA, DEV_AM79C960_EB, pcnet_init, pcnet_close, NULL, @@ -3239,7 +3239,7 @@ const device_t pcnet_am79c960_eb_device = { const device_t pcnet_am79c960_vlb_device = { "AMD PCnet-VL", - "pcnet_am79c960_vlb", + "pcnetvlb", DEVICE_VLB, DEV_AM79C960_VLB, pcnet_init, pcnet_close, NULL, @@ -3249,7 +3249,7 @@ const device_t pcnet_am79c960_vlb_device = { const device_t pcnet_am79c961_device = { "AMD PCnet-ISA+", - "pcnet_am79c961", + "pcnetisaplus", DEVICE_AT | DEVICE_ISA, DEV_AM79C961, pcnet_init, pcnet_close, NULL, @@ -3259,7 +3259,7 @@ const device_t pcnet_am79c961_device = { const device_t pcnet_am79c970a_device = { "AMD PCnet-PCI II", - "pcnet_am79c970a", + "pcnetpci", DEVICE_PCI, DEV_AM79C970A, pcnet_init, pcnet_close, NULL, @@ -3269,7 +3269,7 @@ const device_t pcnet_am79c970a_device = { const device_t pcnet_am79c973_device = { "AMD PCnet-FAST III", - "pcnet_am79c973", + "pcnetfast", DEVICE_PCI, DEV_AM79C973, pcnet_init, pcnet_close, NULL, diff --git a/src/network/network.c b/src/network/network.c index 14023bfb4..1112d397e 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -72,7 +72,7 @@ static const device_t net_none_device = { "None", - "net_none", + "none", 0, NET_TYPE_NONE, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -81,23 +81,23 @@ static const device_t net_none_device = { static netcard_t net_cards[] = { - { &net_none_device, NULL }, + { &net_none_device, NULL }, { &threec503_device, NULL }, - { &pcnet_am79c960_device, NULL }, - { &pcnet_am79c961_device, NULL }, + { &pcnet_am79c960_device, NULL }, + { &pcnet_am79c961_device, NULL }, { &ne1000_device, NULL }, { &ne2000_device, NULL }, { &pcnet_am79c960_eb_device, NULL }, { &rtl8019as_device, NULL }, - { &wd8003e_device, NULL }, - { &wd8003eb_device, NULL }, + { &wd8003e_device, NULL }, + { &wd8003eb_device, NULL }, { &wd8013ebt_device, NULL }, { &plip_device, NULL }, { ðernext_mc_device, NULL }, { &wd8003eta_device, NULL }, - { &wd8003ea_device, NULL }, + { &wd8003ea_device, NULL }, { &pcnet_am79c973_device, NULL }, - { &pcnet_am79c970a_device, NULL }, + { &pcnet_am79c970a_device, NULL }, { &rtl8029as_device, NULL }, { &pcnet_am79c960_vlb_device, NULL }, { NULL, NULL } @@ -659,7 +659,7 @@ network_card_has_config(int card) char * network_card_get_internal_name(int card) { - return((char *)net_cards[card].device->internal_name); + return device_get_internal_name(net_cards[card].device); } @@ -669,13 +669,13 @@ network_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *)net_cards[c].device->internal_name)) { + while (net_cards[c].device != NULL) { if (! strcmp((char *)net_cards[c].device->internal_name, s)) - return(c); + return(c); c++; } - return(-1); + return 0; } diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c index a60314842..1eab6bf32 100644 --- a/src/scsi/scsi.c +++ b/src/scsi/scsi.c @@ -53,7 +53,7 @@ static uint8_t next_scsi_bus = 0; static const device_t scsi_none_device = { "None", - "scsi_none", + "none", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -67,38 +67,38 @@ typedef const struct { static SCSI_CARD scsi_cards[] = { - { &scsi_none_device, }, - { &aha154xa_device, }, - { &aha154xb_device, }, - { &aha154xc_device, }, - { &aha154xcf_device, }, - { &aha154xcp_device, }, - { &buslogic_542b_device, }, - { &buslogic_542bh_device, }, - { &buslogic_545s_device, }, - { &buslogic_545c_device, }, - { &scsi_lcs6821n_device, }, - { &scsi_rt1000b_device, }, - { &scsi_t128_device, }, - { &scsi_t130b_device, }, + { &scsi_none_device, }, + { &aha154xa_device, }, + { &aha154xb_device, }, + { &aha154xc_device, }, + { &aha154xcf_device, }, + { &aha154xcp_device, }, + { &buslogic_542b_device, }, + { &buslogic_542bh_device, }, + { &buslogic_545s_device, }, + { &buslogic_545c_device, }, + { &scsi_lcs6821n_device, }, + { &scsi_rt1000b_device, }, + { &scsi_t128_device, }, + { &scsi_t130b_device, }, #ifdef WALTJE - { &scsi_wd33c93_device, }, + { &scsi_wd33c93_device, }, #endif - { &aha1640_device, }, - { &buslogic_640a_device, }, - { &ncr53c90_mca_device, }, - { &spock_device, }, + { &aha1640_device, }, + { &buslogic_640a_device, }, + { &ncr53c90_mca_device, }, + { &spock_device, }, { &buslogic_958d_pci_device, }, - { &ncr53c810_pci_device, }, - { &ncr53c815_pci_device, }, - { &ncr53c820_pci_device, }, - { &ncr53c825a_pci_device, }, - { &ncr53c860_pci_device, }, - { &ncr53c875_pci_device, }, - { &dc390_pci_device, }, - { &buslogic_445s_device, }, - { &buslogic_445c_device, }, - { NULL, }, + { &ncr53c810_pci_device, }, + { &ncr53c815_pci_device, }, + { &ncr53c820_pci_device, }, + { &ncr53c825a_pci_device, }, + { &ncr53c860_pci_device, }, + { &ncr53c875_pci_device, }, + { &dc390_pci_device, }, + { &buslogic_445s_device, }, + { &buslogic_445c_device, }, + { NULL, }, }; @@ -152,7 +152,7 @@ scsi_card_has_config(int card) char * scsi_card_get_internal_name(int card) { - return((char *) scsi_cards[card].device->internal_name); + return device_get_internal_name(scsi_cards[card].device); } @@ -161,7 +161,7 @@ scsi_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) scsi_cards[c].device->internal_name)) { + while (scsi_cards[c].device != NULL) { if (!strcmp((char *) scsi_cards[c].device->internal_name, s)) return(c); c++; diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index 74f920d0b..5dd9003c1 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -1910,7 +1910,7 @@ static const device_config_t BT958D_Config[] = { const device_t buslogic_542b_device = { "BusLogic BT-542B ISA", - "buslogic_542b_1991", + "bt542b", DEVICE_ISA | DEVICE_AT, CHIP_BUSLOGIC_ISA_542B_1991_12_14, buslogic_init, x54x_close, NULL, @@ -1920,7 +1920,7 @@ const device_t buslogic_542b_device = { const device_t buslogic_545s_device = { "BusLogic BT-545S ISA", - "buslogic_545s", + "bt545s", DEVICE_ISA | DEVICE_AT, CHIP_BUSLOGIC_ISA_545S_1992_10_05, buslogic_init, x54x_close, NULL, @@ -1930,7 +1930,7 @@ const device_t buslogic_545s_device = { const device_t buslogic_542bh_device = { "BusLogic BT-542BH ISA", - "buslogic", + "bt542bh", DEVICE_ISA | DEVICE_AT, CHIP_BUSLOGIC_ISA_542BH_1993_05_23, buslogic_init, x54x_close, NULL, @@ -1940,7 +1940,7 @@ const device_t buslogic_542bh_device = { const device_t buslogic_545c_device = { "BusLogic BT-545C ISA", - "buslogic_545c", + "bt545c", DEVICE_ISA | DEVICE_AT, CHIP_BUSLOGIC_ISA_545C_1994_12_01, buslogic_init, x54x_close, NULL, @@ -1950,7 +1950,7 @@ const device_t buslogic_545c_device = { const device_t buslogic_640a_device = { "BusLogic BT-640A MCA", - "buslogic_640a", + "bt640a", DEVICE_MCA, CHIP_BUSLOGIC_MCA_640A_1993_05_23, buslogic_init, x54x_close, NULL, @@ -1960,7 +1960,7 @@ const device_t buslogic_640a_device = { const device_t buslogic_445s_device = { "BusLogic BT-445S VLB", - "buslogic_445s", + "bt445s", DEVICE_VLB, CHIP_BUSLOGIC_VLB_445S_1993_11_16, buslogic_init, x54x_close, NULL, @@ -1970,7 +1970,7 @@ const device_t buslogic_445s_device = { const device_t buslogic_445c_device = { "BusLogic BT-445C VLB", - "buslogic_445c", + "bt445c", DEVICE_VLB, CHIP_BUSLOGIC_VLB_445C_1994_12_01, buslogic_init, x54x_close, NULL, @@ -1980,7 +1980,7 @@ const device_t buslogic_445c_device = { const device_t buslogic_958d_pci_device = { "BusLogic BT-958D PCI", - "buslogic_pci", + "bt958d", DEVICE_PCI, CHIP_BUSLOGIC_PCI_958D_1995_12_30, buslogic_init, x54x_close, NULL, diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c index 95c6bcc48..abedb885c 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/src/scsi/scsi_ncr5380.c @@ -1786,7 +1786,7 @@ static const device_config_t t128_config[] = { const device_t scsi_lcs6821n_device = { "Longshine LCS-6821N", - "scsi_lcs6821n", + "lcs6821n", DEVICE_ISA, 0, ncr_init, ncr_close, NULL, @@ -1798,7 +1798,7 @@ const device_t scsi_lcs6821n_device = const device_t scsi_rt1000b_device = { "Rancho RT1000B", - "scsi_rt1000b", + "rt1000b", DEVICE_ISA, 1, ncr_init, ncr_close, NULL, @@ -1810,7 +1810,7 @@ const device_t scsi_rt1000b_device = const device_t scsi_t130b_device = { "Trantor T130B", - "scsi_t130b", + "t130b", DEVICE_ISA, 2, ncr_init, ncr_close, NULL, @@ -1822,7 +1822,7 @@ const device_t scsi_t130b_device = const device_t scsi_t128_device = { "Trantor T128", - "scsi_t128", + "t128", DEVICE_ISA, 3, ncr_init, ncr_close, NULL, diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c index 66d4dc1f8..fe7ebb558 100644 --- a/src/scsi/scsi_ncr53c8xx.c +++ b/src/scsi/scsi_ncr53c8xx.c @@ -2660,7 +2660,7 @@ static const device_config_t ncr53c8xx_pci_config[] = { const device_t ncr53c810_pci_device = { "NCR 53c810", - "ncr53c810_pci", + "ncr53c810", DEVICE_PCI, CHIP_810, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2671,7 +2671,7 @@ const device_t ncr53c810_pci_device = const device_t ncr53c810_onboard_pci_device = { "NCR 53c810 On-Board", - "ncr53c810_onboard_pci", + "ncr53c810_onboard", DEVICE_PCI, 0x8001, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2682,7 +2682,7 @@ const device_t ncr53c810_onboard_pci_device = const device_t ncr53c815_pci_device = { "NCR 53c815", - "ncr53c815_pci", + "ncr53c815", DEVICE_PCI, CHIP_815, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2693,7 +2693,7 @@ const device_t ncr53c815_pci_device = const device_t ncr53c820_pci_device = { "NCR 53c820", - "ncr53c820_pci", + "ncr53c820", DEVICE_PCI, CHIP_820, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2704,7 +2704,7 @@ const device_t ncr53c820_pci_device = const device_t ncr53c825a_pci_device = { "NCR 53c825A", - "ncr53c825a_pci", + "ncr53c825a", DEVICE_PCI, CHIP_825, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2715,7 +2715,7 @@ const device_t ncr53c825a_pci_device = const device_t ncr53c860_pci_device = { "NCR 53c860", - "ncr53c860_pci", + "ncr53c860", DEVICE_PCI, CHIP_860, ncr53c8xx_init, ncr53c8xx_close, NULL, @@ -2726,7 +2726,7 @@ const device_t ncr53c860_pci_device = const device_t ncr53c875_pci_device = { "NCR 53c875", - "ncr53c875_pci", + "ncr53c875", DEVICE_PCI, CHIP_875, ncr53c8xx_init, ncr53c8xx_close, NULL, diff --git a/src/scsi/scsi_pcscsi.c b/src/scsi/scsi_pcscsi.c index 044079337..cd0b7e426 100644 --- a/src/scsi/scsi_pcscsi.c +++ b/src/scsi/scsi_pcscsi.c @@ -2012,7 +2012,7 @@ static const device_config_t bios_enable_config[] = { const device_t dc390_pci_device = { "Tekram DC-390 PCI", - "dc390_pci", + "dc390", DEVICE_PCI, 0, dc390_init, esp_close, NULL, @@ -2023,7 +2023,7 @@ const device_t dc390_pci_device = const device_t ncr53c90_mca_device = { "NCR 53c90 MCA", - "ncr53c90_mca", + "ncr53c90", DEVICE_MCA, 0, ncr53c90_mca_init, esp_close, NULL, diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c index 7e1eb987f..548cacf96 100644 --- a/src/scsi/scsi_spock.c +++ b/src/scsi/scsi_spock.c @@ -1179,7 +1179,7 @@ static const device_config_t spock_rom_config[] = { const device_t spock_device = { "IBM PS/2 SCSI Adapter (Spock)", - "spock", + "spock", DEVICE_MCA, 0, spock_init, spock_close, NULL, diff --git a/src/sio/sio_pc87332.c b/src/sio/sio_pc87332.c index 131ccec3b..ea185abce 100644 --- a/src/sio/sio_pc87332.c +++ b/src/sio/sio_pc87332.c @@ -354,7 +354,6 @@ const device_t pc87332_398_device = { 0x01, pc87332_init, pc87332_close, NULL, { NULL }, NULL, NULL, - "pc87332", NULL }; diff --git a/src/sound/midi.c b/src/sound/midi.c index 9e0824b25..4ceb5fdb1 100644 --- a/src/sound/midi.c +++ b/src/sound/midi.c @@ -68,29 +68,46 @@ uint8_t MIDI_evt_len[256] = { typedef struct { - const char *internal_name; const device_t *device; } MIDI_DEVICE, MIDI_IN_DEVICE; +static const device_t midi_none_device = { + "None", + "none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL +}; + static const MIDI_DEVICE devices[] = { - { "none", NULL }, + { &midi_none_device }, #ifdef USE_FLUIDSYNTH - { "fluidsynth", &fluidsynth_device }, + { &fluidsynth_device }, #endif #ifdef USE_MUNT - { "mt32", &mt32_device }, - { "cm32l", &cm32l_device }, + { &mt32_device }, + { &cm32l_device }, #endif - { SYSTEM_MIDI_INTERNAL_NAME, &rtmidi_device }, - { "", NULL } + { &rtmidi_device }, + { NULL } +}; + +static const device_t midi_in_none_device = { + "None", + "none", + 0, 0, + NULL, NULL, NULL, + { NULL }, NULL, NULL, + NULL }; static const MIDI_IN_DEVICE midi_in_devices[] = { - { "none", NULL }, - { MIDI_INPUT_INTERNAL_NAME, &rtmidi_input_device }, - { "", NULL } + { &midi_in_none_device }, + { &rtmidi_input_device }, + { NULL } }; @@ -123,7 +140,7 @@ midi_device_has_config(int card) char * midi_device_get_internal_name(int card) { - return (char *) devices[card].device->internal_name; + return device_get_internal_name(devices[card].device); } @@ -132,7 +149,7 @@ midi_device_get_from_internal_name(char *s) { int c = 0; - while (strlen(devices[c].device->internal_name)) { + while (devices[c].device != NULL) { if (!strcmp(devices[c].device->internal_name, s)) return c; c++; @@ -252,7 +269,7 @@ midi_in_device_has_config(int card) char * midi_in_device_get_internal_name(int card) { - return (char *) midi_in_devices[card].device->internal_name; + return device_get_internal_name(midi_in_devices[card].device); } @@ -261,7 +278,7 @@ midi_in_device_get_from_internal_name(char *s) { int c = 0; - while (strlen(midi_in_devices[c].device->internal_name)) { + while (midi_in_devices[c].device != NULL) { if (!strcmp(midi_in_devices[c].device->internal_name, s)) return c; c++; diff --git a/src/sound/midi_rtmidi.cpp b/src/sound/midi_rtmidi.cpp index b2275fdf7..48877924c 100644 --- a/src/sound/midi_rtmidi.cpp +++ b/src/sound/midi_rtmidi.cpp @@ -264,7 +264,7 @@ static const device_config_t midi_input_config[] = const device_t rtmidi_device = { SYSTEM_MIDI_NAME, - "rtmidi", + SYSTEM_MIDI_INTERNAL_NAME, 0, 0, rtmidi_init, rtmidi_close, @@ -279,7 +279,7 @@ const device_t rtmidi_device = const device_t rtmidi_input_device = { MIDI_INPUT_NAME, - "rtmidi_input", + MIDI_INPUT_INTERNAL_NAME, 0, 0, rtmidi_input_init, rtmidi_input_close, diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c index 6cc3cba79..1c43adf0c 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/sound/snd_adlibgold.c @@ -1024,7 +1024,7 @@ static const device_config_t adgold_config[] = const device_t adgold_device = { "AdLib Gold", - "adgold", + "adlibgold", DEVICE_ISA, 0, adgold_init, adgold_close, diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index 5fbfa74ba..b66ca7720 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -2603,7 +2603,7 @@ static const device_config_t sb_awe64_gold_config[] = const device_t sb_1_device = { "Sound Blaster v1.0", - "sb_1", + "sb", DEVICE_ISA, 0, sb_1_init, sb_close, NULL, { NULL }, @@ -2615,7 +2615,7 @@ const device_t sb_1_device = const device_t sb_15_device = { "Sound Blaster v1.5", - "sb_15", + "sb1.5", DEVICE_ISA, 0, sb_15_init, sb_close, NULL, { NULL }, @@ -2627,7 +2627,7 @@ const device_t sb_15_device = const device_t sb_mcv_device = { "Sound Blaster MCV", - "sb_mcv", + "sbmcv", DEVICE_MCA, 0, sb_mcv_init, sb_close, NULL, { NULL }, @@ -2639,7 +2639,7 @@ const device_t sb_mcv_device = const device_t sb_2_device = { "Sound Blaster v2.0", - "sb_2", + "sb2.0", DEVICE_ISA, 0, sb_2_init, sb_close, NULL, { NULL }, @@ -2651,7 +2651,7 @@ const device_t sb_2_device = const device_t sb_pro_v1_device = { "Sound Blaster Pro v1", - "sb_pro_v1", + "sbprov1", DEVICE_ISA, 0, sb_pro_v1_init, sb_close, NULL, { NULL }, @@ -2663,7 +2663,7 @@ const device_t sb_pro_v1_device = const device_t sb_pro_v2_device = { "Sound Blaster Pro v2", - "sb_pro_v2", + "sbprov2", DEVICE_ISA, 0, sb_pro_v2_init, sb_close, NULL, { NULL }, @@ -2675,7 +2675,7 @@ const device_t sb_pro_v2_device = const device_t sb_pro_mcv_device = { "Sound Blaster Pro MCV", - "sb_pro_mcv", + "sbpromcv", DEVICE_MCA, 0, sb_pro_mcv_init, sb_close, NULL, { NULL }, @@ -2687,7 +2687,7 @@ const device_t sb_pro_mcv_device = const device_t sb_pro_compat_device = { "Sound Blaster Pro (Compatibility)", - "sb_pro_compat", + "sbpro_compat", DEVICE_ISA | DEVICE_AT, 0, sb_pro_compat_init, sb_close, NULL, { NULL }, @@ -2699,7 +2699,7 @@ const device_t sb_pro_compat_device = const device_t sb_16_device = { "Sound Blaster 16", - "sb_16", + "sb16", DEVICE_ISA | DEVICE_AT, 0, sb_16_init, sb_close, NULL, { NULL }, @@ -2711,7 +2711,7 @@ const device_t sb_16_device = const device_t sb_16_pnp_device = { "Sound Blaster 16 PnP", - "sb_16_pnp", + "sb16_pnp", DEVICE_ISA | DEVICE_AT, 0, sb_16_pnp_init, sb_close, NULL, { NULL }, @@ -2723,7 +2723,7 @@ const device_t sb_16_pnp_device = const device_t sb_32_pnp_device = { "Sound Blaster 32 PnP", - "sb_32_pnp", + "sb32_pnp", DEVICE_ISA | DEVICE_AT, 0, sb_awe32_pnp_init, sb_awe32_close, NULL, @@ -2737,7 +2737,7 @@ const device_t sb_32_pnp_device = const device_t sb_awe32_device = { "Sound Blaster AWE32", - "sb_awe32", + "sbawe32", DEVICE_ISA | DEVICE_AT, 0, sb_awe32_init, sb_awe32_close, NULL, @@ -2750,7 +2750,7 @@ const device_t sb_awe32_device = const device_t sb_awe32_pnp_device = { "Sound Blaster AWE32 PnP", - "sb_awe32_pnp", + "sbawe32_pnp", DEVICE_ISA | DEVICE_AT, 1, sb_awe32_pnp_init, sb_awe32_close, NULL, @@ -2763,7 +2763,7 @@ const device_t sb_awe32_pnp_device = const device_t sb_awe64_gold_device = { "Sound Blaster AWE64 Gold", - "sb_awe64_gold", + "sbawe64_gold", DEVICE_ISA | DEVICE_AT, 2, sb_awe32_pnp_init, sb_awe32_close, NULL, diff --git a/src/sound/snd_wss.c b/src/sound/snd_wss.c index 2f9639e1f..d9739958c 100644 --- a/src/sound/snd_wss.c +++ b/src/sound/snd_wss.c @@ -256,7 +256,7 @@ const device_t wss_device = const device_t ncr_business_audio_device = { "NCR Business Audio", - "ncr_business_audio", + "ncraudio", DEVICE_MCA, 0, ncr_audio_init, wss_close, NULL, { NULL }, diff --git a/src/sound/sound.c b/src/sound/sound.c index 51f475f8e..cb267f544 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -82,15 +82,15 @@ static void *filter_cd_audio_p = NULL; static const device_t sound_none_device = { "None", - "sound_none", + "none", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, NULL }; static const device_t sound_internal_device = { - "Internal Sound Card", - "sound_internal", + "Internal", + "internal", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -100,30 +100,30 @@ static const device_t sound_internal_device = { static const SOUND_CARD sound_cards[] = { - { &sound_none_device }, - { &sound_internal_device }, + { &sound_none_device }, + { &sound_internal_device }, { &adlib_device }, { &adgold_device }, - { &azt2316a_device }, + { &azt2316a_device }, { &azt1605_device }, { &cs4236b_device }, { &sb_1_device }, { &sb_15_device }, { &sb_2_device }, - { &sb_pro_v1_device }, - { &sb_pro_v2_device }, + { &sb_pro_v1_device }, + { &sb_pro_v2_device }, { &sb_16_device }, - { &sb_16_pnp_device }, - { &sb_32_pnp_device }, - { &sb_awe32_device }, + { &sb_16_pnp_device }, + { &sb_32_pnp_device }, + { &sb_awe32_device }, { &sb_awe32_pnp_device }, { &sb_awe64_gold_device }, #if defined(DEV_BRANCH) && defined(USE_PAS16) { &pas16_device }, #endif - { &pssj_isa_device }, + { &pssj_isa_device }, { &wss_device }, - { &adlib_mca_device }, + { &adlib_mca_device }, { &ncr_business_audio_device }, { &sb_mcv_device }, { &sb_pro_mcv_device }, @@ -183,7 +183,7 @@ sound_card_has_config(int card) char * sound_card_get_internal_name(int card) { - return (char *) sound_cards[card].device->internal_name; + return device_get_internal_name(sound_cards[card].device); } @@ -192,7 +192,7 @@ sound_card_get_from_internal_name(char *s) { int c = 0; - while (strlen((char *) sound_cards[c].device->internal_name)) { + while (sound_cards[c].device != NULL) { if (!strcmp((char *) sound_cards[c].device->internal_name, s)) return c; c++; diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c index d2228c5df..ec63b1dea 100644 --- a/src/video/vid_ati18800.c +++ b/src/video/vid_ati18800.c @@ -284,7 +284,7 @@ static void ati18800_force_redraw(void *p) const device_t ati18800_wonder_device = { "ATI-18800", - "ati18800_wonder", + "ati18800w", DEVICE_ISA, ATI18800_WONDER, ati18800_init, ati18800_close, @@ -299,7 +299,7 @@ const device_t ati18800_wonder_device = const device_t ati18800_vga88_device = { "ATI-18800-1", - "ati18800_vga88", + "ati18800v", DEVICE_ISA, ATI18800_VGA88, ati18800_init, ati18800_close, diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c index 67e683ed1..dcabd636a 100644 --- a/src/video/vid_ati28800.c +++ b/src/video/vid_ati28800.c @@ -823,7 +823,7 @@ const device_t compaq_ati28800_device = const device_t ati28800_wonderxl24_device = { "ATI-28800 (VGA Wonder XL24)", - "ati28800_wonderxl24", + "ati28800w", DEVICE_ISA, VGAWONDERXL24, ati28800_init, ati28800_close, NULL, diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index a8ace8026..ff543cfa0 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -4517,7 +4517,7 @@ static const device_config_t gd5480_config[] = const device_t gd5401_isa_device = { "Cirrus Logic GD5401 (ISA) (ACUMOS AVGA1)", - "gd5401_isa", + "cl_gd5401_isa", DEVICE_ISA, CIRRUS_ID_CLGD5401, gd54xx_init, gd54xx_close, @@ -4531,7 +4531,7 @@ const device_t gd5401_isa_device = const device_t gd5402_isa_device = { "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2)", - "gd5402_isa", + "cl_gd5402_isa", DEVICE_ISA, CIRRUS_ID_CLGD5402, gd54xx_init, gd54xx_close, @@ -4545,7 +4545,7 @@ const device_t gd5402_isa_device = const device_t gd5402_onboard_device = { "Cirrus Logic GD5402 (ISA) (ACUMOS AVGA2) (On-Board)", - "gd5402_onboard", + "cl_gd5402_onboard", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5402 | 0x200, gd54xx_init, gd54xx_close, @@ -4559,7 +4559,7 @@ const device_t gd5402_onboard_device = const device_t gd5420_isa_device = { "Cirrus Logic GD5420 (ISA)", - "gd5420_isa", + "cl_gd5420_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5420, gd54xx_init, gd54xx_close, @@ -4572,7 +4572,7 @@ const device_t gd5420_isa_device = const device_t gd5422_isa_device = { "Cirrus Logic GD5422 (ISA)", - "gd5422_isa", + "cl_gd5422_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5422, gd54xx_init, gd54xx_close, @@ -4585,7 +4585,7 @@ const device_t gd5422_isa_device = { const device_t gd5424_vlb_device = { "Cirrus Logic GD5424 (VLB)", - "gd5424_vlb", + "cl_gd5424_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5424, gd54xx_init, gd54xx_close, @@ -4599,7 +4599,7 @@ const device_t gd5424_vlb_device = { const device_t gd5426_isa_device = { "Cirrus Logic GD5426 (ISA)", - "gd5426_isa", + "cl_gd5426_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5426, gd54xx_init, @@ -4616,7 +4616,7 @@ const device_t gd5426_isa_device = const device_t gd5426_diamond_speedstar_pro_a1_isa_device = { "Cirrus Logic GD5426 (ISA) (Diamond SpeedStar Pro Rev. A1)", - "gd5426_diamond_speedstar_pro_a1_isa", + "cl_gd5426_diamond_a1_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5426 | 0x100, gd54xx_init, @@ -4631,7 +4631,7 @@ const device_t gd5426_diamond_speedstar_pro_a1_isa_device = const device_t gd5426_vlb_device = { "Cirrus Logic GD5426 (VLB)", - "gd5426_vlb", + "cl_gd5426_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5426, gd54xx_init, @@ -4647,7 +4647,7 @@ const device_t gd5426_vlb_device = const device_t gd5426_onboard_device = { "Cirrus Logic GD5426 (VLB) (On-Board)", - "gd5426_onboard", + "cl_gd5426_onboard", DEVICE_VLB, CIRRUS_ID_CLGD5426 | 0x200, gd54xx_init, @@ -4662,7 +4662,7 @@ const device_t gd5426_onboard_device = const device_t gd5428_isa_device = { "Cirrus Logic GD5428 (ISA)", - "gd5428_isa", + "cl_gd5428_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4677,7 +4677,7 @@ const device_t gd5428_isa_device = const device_t gd5428_vlb_device = { "Cirrus Logic GD5428 (VLB)", - "gd5428_vlb", + "cl_gd5428_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4693,7 +4693,7 @@ const device_t gd5428_vlb_device = const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = { "Cirrus Logic GD5428 (VLB) (Diamond SpeedStar Pro Rev. B1)", - "gd5428_diamond_speedstar_pro_b1_vlb", + "cl_gd5428_diamond_b1_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5428 | 0x100, gd54xx_init, @@ -4708,7 +4708,7 @@ const device_t gd5428_diamond_speedstar_pro_b1_vlb_device = const device_t gd5428_mca_device = { "Cirrus Logic GD5428 (MCA) (IBM SVGA Adapter/A)", - "gd5428_mca", + "ibm1mbsvga", DEVICE_MCA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4723,7 +4723,7 @@ const device_t gd5428_mca_device = const device_t gd5428_onboard_device = { "Cirrus Logic GD5428 (ISA) (On-Board)", - "gd5428_onboard", + "cl_gd5428_onboard", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5428, gd54xx_init, @@ -4738,7 +4738,7 @@ const device_t gd5428_onboard_device = const device_t gd5429_isa_device = { "Cirrus Logic GD5429 (ISA)", - "gd5429_isa", + "cl_gd5429_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5429, gd54xx_init, @@ -4753,7 +4753,7 @@ const device_t gd5429_isa_device = const device_t gd5429_vlb_device = { "Cirrus Logic GD5429 (VLB)", - "gd5429_vlb", + "cl_gd5429_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5429, gd54xx_init, @@ -4769,7 +4769,7 @@ const device_t gd5429_vlb_device = const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device = { "Cirrus Logic GD5430 (VLB) (Diamond SpeedStar Pro SE Rev. A8)", - "gd5430_diamond_speedstar_pro_se_a8_vlb", + "cl_gd5430_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5430, gd54xx_init, @@ -4784,7 +4784,7 @@ const device_t gd5430_diamond_speedstar_pro_se_a8_vlb_device = const device_t gd5430_pci_device = { "Cirrus Logic GD5430 (PCI)", - "gd5430_pci", + "cl_gd5430_pci", DEVICE_PCI, CIRRUS_ID_CLGD5430, gd54xx_init, @@ -4799,7 +4799,7 @@ const device_t gd5430_pci_device = const device_t gd5434_isa_device = { "Cirrus Logic GD5434 (ISA)", - "gd5434_isa", + "cl_gd5434_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4815,7 +4815,7 @@ const device_t gd5434_isa_device = const device_t gd5434_diamond_speedstar_64_a3_isa_device = { "Cirrus Logic GD5434 (ISA) (Diamond SpeedStar 64 Rev. A3)", - "gd5434_diamond_speedstar_64_a3_isa", + "cl_gd5434_diamond_a3_isa", DEVICE_AT | DEVICE_ISA, CIRRUS_ID_CLGD5434 | 0x100, gd54xx_init, @@ -4830,7 +4830,7 @@ const device_t gd5434_diamond_speedstar_64_a3_isa_device = const device_t gd5434_onboard_pci_device = { "Cirrus Logic GD5434-4 (PCI) (On-Board)", - "gd5434_onboard_pci", + "cl_gd5434_onboard_pci", DEVICE_PCI, CIRRUS_ID_CLGD5434 | 0x200, gd54xx_init, @@ -4845,7 +4845,7 @@ const device_t gd5434_onboard_pci_device = const device_t gd5434_vlb_device = { "Cirrus Logic GD5434 (VLB)", - "gd5434_vlb", + "cl_gd5434_vlb", DEVICE_VLB, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4860,7 +4860,7 @@ const device_t gd5434_vlb_device = const device_t gd5434_pci_device = { "Cirrus Logic GD5434 (PCI)", - "gd5434_pci", + "cl_gd5434_pci", DEVICE_PCI, CIRRUS_ID_CLGD5434, gd54xx_init, @@ -4875,7 +4875,7 @@ const device_t gd5434_pci_device = const device_t gd5436_pci_device = { "Cirrus Logic GD5436 (PCI)", - "gd5436_pci", + "cl_gd5436_pci", DEVICE_PCI, CIRRUS_ID_CLGD5436, gd54xx_init, @@ -4890,7 +4890,7 @@ const device_t gd5436_pci_device = const device_t gd5440_onboard_pci_device = { "Cirrus Logic GD5440 (PCI) (On-Board)", - "gd5440_onboard_pci", + "cl_gd5440_onboard_pci", DEVICE_PCI, CIRRUS_ID_CLGD5440 | 0x600, gd54xx_init, @@ -4905,7 +4905,7 @@ const device_t gd5440_onboard_pci_device = const device_t gd5440_pci_device = { "Cirrus Logic GD5440 (PCI)", - "gd5440_pci", + "cl_gd5440_pci", DEVICE_PCI, CIRRUS_ID_CLGD5440 | 0x400, gd54xx_init, @@ -4920,7 +4920,7 @@ const device_t gd5440_pci_device = const device_t gd5446_pci_device = { "Cirrus Logic GD5446 (PCI)", - "gd5446_pci", + "cl_gd5446_pci", DEVICE_PCI, CIRRUS_ID_CLGD5446, gd54xx_init, @@ -4935,7 +4935,7 @@ const device_t gd5446_pci_device = const device_t gd5446_stb_pci_device = { "Cirrus Logic GD5446 (PCI) (STB Nitro 64V)", - "gd5446_stb_pci", + "cl_gd5446_stb_pci", DEVICE_PCI, CIRRUS_ID_CLGD5446 | 0x100, gd54xx_init, @@ -4950,7 +4950,7 @@ const device_t gd5446_stb_pci_device = const device_t gd5480_pci_device = { "Cirrus Logic GD5480 (PCI)", - "gd5480_pci", + "cl_gd5480_pci", DEVICE_PCI, CIRRUS_ID_CLGD5480, gd54xx_init, diff --git a/src/video/vid_colorplus.c b/src/video/vid_colorplus.c index 08ffb87de..7f2a4e004 100644 --- a/src/video/vid_colorplus.c +++ b/src/video/vid_colorplus.c @@ -468,7 +468,7 @@ static const device_config_t colorplus_config[] = const device_t colorplus_device = { "Colorplus", - "colorplus", + "plantronics", DEVICE_ISA, 0, colorplus_standalone_init, colorplus_close, diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c index 366db73c6..a348667d1 100644 --- a/src/video/vid_ega.c +++ b/src/video/vid_ega.c @@ -249,7 +249,6 @@ ega_in(uint16_t addr, void *p) { ega_t *ega = (ega_t *)p; uint8_t ret = 0xff; - uint16_t port = addr; if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1)) addr ^= 0x60; @@ -1260,7 +1259,7 @@ const device_t ega_device = const device_t cpqega_device = { "Compaq EGA", - "cpqega", + "compaq_ega", DEVICE_ISA, EGA_COMPAQ, ega_standalone_init, ega_close, NULL, @@ -1273,7 +1272,7 @@ const device_t cpqega_device = const device_t sega_device = { "SuperEGA", - "sega", + "superega", DEVICE_ISA, EGA_SUPEREGA, ega_standalone_init, ega_close, NULL, @@ -1286,7 +1285,7 @@ const device_t sega_device = const device_t atiega_device = { "ATI EGA Wonder 800+", - "atiega", + "egawonder800", DEVICE_ISA, EGA_ATI, ega_standalone_init, ega_close, NULL, diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c index b8b494a28..529cca4bf 100644 --- a/src/video/vid_et4000.c +++ b/src/video/vid_et4000.c @@ -830,7 +830,7 @@ static const device_config_t et4000_config[] = const device_t et4000_isa_device = { "Tseng Labs ET4000AX (ISA)", - "et4000_isa", + "et4000ax", DEVICE_ISA, 0, et4000_init, et4000_close, NULL, @@ -842,7 +842,7 @@ const device_t et4000_isa_device = { const device_t et4000_mca_device = { "Tseng Labs ET4000AX (MCA)", - "et4000_mca", + "et4000mca", DEVICE_MCA, 1, et4000_init, et4000_close, NULL, @@ -854,7 +854,7 @@ const device_t et4000_mca_device = { const device_t et4000k_isa_device = { "Trigem Korean VGA (Tseng Labs ET4000AX Korean)", - "et4000k_isa", + "tgkorvga", DEVICE_ISA, 2, et4000_init, et4000_close, NULL, @@ -878,7 +878,7 @@ const device_t et4000k_tg286_isa_device = { const device_t et4000_kasan_isa_device = { "Kasan Hangulmadang-16 VGA (Tseng Labs ET4000AX Korean)", - "et4000_kasan_isa", + "kasan16vga", DEVICE_ISA, 4, et4000_init, et4000_close, NULL, diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index 61b565ce6..df2eab5a2 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -2207,7 +2207,7 @@ const device_t et4000w32_onboard_device = const device_t et4000w32i_isa_device = { "Tseng Labs ET4000/w32i Rev. B ISA", - "et4000w32i_isa", + "et4000w32i", DEVICE_ISA | DEVICE_AT, ET4000W32I, et4000w32p_init, et4000w32p_close, NULL, { et4000w32i_isa_available }, @@ -2255,7 +2255,7 @@ const device_t et4000w32p_revc_pci_device = const device_t et4000w32p_noncardex_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB", - "et4000w32p_noncardex_vlb", + "et4000w32p_nc_vlb", DEVICE_VLB, ET4000W32P, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_noncardex_available }, @@ -2267,7 +2267,7 @@ const device_t et4000w32p_noncardex_vlb_device = const device_t et4000w32p_noncardex_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI", - "et4000w32p_noncardex_pci", + "et4000w32p_nc_pci", DEVICE_PCI, ET4000W32P, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_noncardex_available }, @@ -2279,7 +2279,7 @@ const device_t et4000w32p_noncardex_pci_device = const device_t et4000w32p_cardex_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB (Cardex)", - "et4000w32p_cardex_vlb", + "et4000w32p_vlb", DEVICE_VLB, ET4000W32P_CARDEX, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_cardex_available }, @@ -2291,7 +2291,7 @@ const device_t et4000w32p_cardex_vlb_device = const device_t et4000w32p_cardex_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI (Cardex)", - "et4000w32p_cardex_pci", + "et4000w32p_pci", DEVICE_PCI, ET4000W32P_CARDEX, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_cardex_available }, @@ -2303,7 +2303,7 @@ const device_t et4000w32p_cardex_pci_device = const device_t et4000w32p_vlb_device = { "Tseng Labs ET4000/w32p Rev. D VLB (Diamond Stealth32)", - "et4000w32p_vlb", + "stealth32_vlb", DEVICE_VLB, ET4000W32P_DIAMOND, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_available }, @@ -2315,7 +2315,7 @@ const device_t et4000w32p_vlb_device = const device_t et4000w32p_pci_device = { "Tseng Labs ET4000/w32p Rev. D PCI (Diamond Stealth32)", - "et4000w32p_pci", + "stealth32_pci", DEVICE_PCI, ET4000W32P_DIAMOND, et4000w32p_init, et4000w32p_close, NULL, { et4000w32p_available }, diff --git a/src/video/vid_herculesplus.c b/src/video/vid_herculesplus.c index 56c22fea5..81f436441 100644 --- a/src/video/vid_herculesplus.c +++ b/src/video/vid_herculesplus.c @@ -725,7 +725,7 @@ static const device_config_t herculesplus_config[] = { const device_t herculesplus_device = { "Hercules Plus", - "herculesplus", + "hercules_plus", DEVICE_ISA, 0, herculesplus_init, herculesplus_close, NULL, diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c index eda129ba2..2b179ba7e 100644 --- a/src/video/vid_ht216.c +++ b/src/video/vid_ht216.c @@ -1737,7 +1737,7 @@ const device_t ht216_32_pb410a_device = const device_t ht216_32_standalone_device = { "Headland HT216-32", - "ht216_32_standalone", + "ht216_32", DEVICE_VLB, 0x7861, /*HT216-32*/ ht216_standalone_init, @@ -1752,7 +1752,7 @@ const device_t ht216_32_standalone_device = const device_t radius_svga_multiview_isa_device = { "Radius SVGA Multiview ISA (HT209)", - "radius_svga_multiview_isa", + "radius_isa", DEVICE_ISA | DEVICE_AT, 0x7152, /*HT209*/ radius_svga_multiview_init, @@ -1767,7 +1767,7 @@ const device_t radius_svga_multiview_isa_device = const device_t radius_svga_multiview_mca_device = { "Radius SVGA Multiview MCA (HT209)", - "radius_svga_multiview_mca", + "radius_mc", DEVICE_MCA, 0x7152, /*HT209*/ radius_svga_multiview_init, @@ -1777,4 +1777,4 @@ const device_t radius_svga_multiview_mca_device = ht216_speed_changed, ht216_force_redraw, NULL -}; \ No newline at end of file +}; diff --git a/src/video/vid_nga.c b/src/video/vid_nga.c index 298946639..9037d550a 100644 --- a/src/video/vid_nga.c +++ b/src/video/vid_nga.c @@ -679,4 +679,4 @@ const device_t nga_device = nga_speed_changed, NULL, nga_config -}; \ No newline at end of file +}; diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c index c9f6766cb..ed67d34aa 100644 --- a/src/video/vid_oak_oti.c +++ b/src/video/vid_oak_oti.c @@ -569,7 +569,7 @@ static const device_config_t oti077_config[] = const device_t oti037c_device = { "Oak OTI-037C", - "oti037c", + "oti037c", DEVICE_ISA, 0, oti_init, oti_close, NULL, @@ -581,7 +581,7 @@ const device_t oti037c_device = const device_t oti067_device = { "Oak OTI-067", - "oti067", + "oti067", DEVICE_ISA, 2, oti_init, oti_close, NULL, @@ -594,7 +594,7 @@ const device_t oti067_device = const device_t oti067_m300_device = { "Oak OTI-067 (Olivetti M300-08/15)", - "oti067_m300", + "oti067_m300", DEVICE_ISA, 4, oti_init, oti_close, NULL, @@ -607,7 +607,7 @@ const device_t oti067_m300_device = const device_t oti067_ama932j_device = { "Oak OTI-067 (AMA-932J)", - "oti067_ama932j", + "oti067_ama932j", DEVICE_ISA, 3, oti_init, oti_close, NULL, @@ -620,7 +620,7 @@ const device_t oti067_ama932j_device = const device_t oti077_device = { "Oak OTI-077", - "oti077", + "oti077", DEVICE_ISA, 5, oti_init, oti_close, NULL, diff --git a/src/video/vid_ogc.c b/src/video/vid_ogc.c index 8b0f11d2a..ca22f6d5f 100644 --- a/src/video/vid_ogc.c +++ b/src/video/vid_ogc.c @@ -693,4 +693,4 @@ const device_t ogc_device = ogc_speed_changed, NULL, cga_config -}; \ No newline at end of file +}; diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c index 1ea31c82e..bb8cd0394 100644 --- a/src/video/vid_paradise.c +++ b/src/video/vid_paradise.c @@ -720,7 +720,7 @@ void paradise_force_redraw(void *p) const device_t paradise_pvga1a_pc2086_device = { "Paradise PVGA1A (Amstrad PC2086)", - "paradise_pvga1a_pc2086", + "pvga1a_pc2086", 0, PVGA1A, paradise_pvga1a_pc2086_init, @@ -735,7 +735,7 @@ const device_t paradise_pvga1a_pc2086_device = const device_t paradise_pvga1a_pc3086_device = { "Paradise PVGA1A (Amstrad PC3086)", - "paradise_pvga1a_pc3086", + "pvga1a_pc3086", 0, PVGA1A, paradise_pvga1a_pc3086_init, @@ -771,7 +771,7 @@ static const device_config_t paradise_pvga1a_config[] = const device_t paradise_pvga1a_ncr3302_device = { "Paradise PVGA1A (NCR 3302)", - "paradise_pvga1a_ncr3302", + "pvga1a_ncr3302", 0, PVGA1A, paradise_pvga1a_ncr3302_init, @@ -786,7 +786,7 @@ const device_t paradise_pvga1a_ncr3302_device = const device_t paradise_pvga1a_device = { "Paradise PVGA1A", - "paradise_pvga1a", + "pvga1a", DEVICE_ISA, PVGA1A, paradise_pvga1a_standalone_init, @@ -800,7 +800,7 @@ const device_t paradise_pvga1a_device = const device_t paradise_wd90c11_megapc_device = { "Paradise WD90C11 (Amstrad MegaPC)", - "paradise_wd90c11_megapc", + "wd90c11_megapc", 0, WD90C11, paradise_wd90c11_megapc_init, @@ -814,7 +814,7 @@ const device_t paradise_wd90c11_megapc_device = const device_t paradise_wd90c11_device = { "Paradise WD90C11-LR", - "paradise_wd90c11", + "wd90c11", DEVICE_ISA, WD90C11, paradise_wd90c11_standalone_init, @@ -850,7 +850,7 @@ static const device_config_t paradise_wd90c30_config[] = const device_t paradise_wd90c30_device = { "Paradise WD90C30-LR", - "paradise_wd90c30", + "wd90c30", DEVICE_ISA, WD90C30, paradise_wd90c30_standalone_init, diff --git a/src/video/vid_rtg310x.c b/src/video/vid_rtg310x.c index 29ca10b14..4ab0a2d8b 100644 --- a/src/video/vid_rtg310x.c +++ b/src/video/vid_rtg310x.c @@ -384,7 +384,7 @@ static const device_config_t rtg_config[] = const device_t realtek_rtg3106_device = { "Realtek RTG3106 (ISA)", - "realtek_rtg3106", + "rtg3106", DEVICE_ISA | DEVICE_AT, 2, rtg_init, rtg_close, NULL, diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 77ae510fd..13eb1ad1e 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -7731,7 +7731,7 @@ static const device_config_t s3_968_config[] = const device_t s3_orchid_86c911_isa_device = { "S3 86c911 ISA (Orchid Fahrenheit 1280)", - "s3_orchid_86c911_isa", + "orchid_s3_911", DEVICE_AT | DEVICE_ISA, S3_ORCHID_86C911, s3_init, @@ -7746,7 +7746,7 @@ const device_t s3_orchid_86c911_isa_device = const device_t s3_diamond_stealth_vram_isa_device = { "S3 86c911 ISA (Diamond Stealth VRAM)", - "s3_diamond_stealth_vram_isa", + "stealthvram_isa", DEVICE_AT | DEVICE_ISA, S3_DIAMOND_STEALTH_VRAM, s3_init, @@ -7761,7 +7761,7 @@ const device_t s3_diamond_stealth_vram_isa_device = const device_t s3_ami_86c924_isa_device = { "S3 86c924 ISA (AMI)", - "s3_ami_86c924_isa", + "ami_s3_924", DEVICE_AT | DEVICE_ISA, S3_AMI_86C924, s3_init, @@ -7776,7 +7776,7 @@ const device_t s3_ami_86c924_isa_device = const device_t s3_spea_mirage_86c801_isa_device = { "S3 86c801 ISA (SPEA Mirage ISA)", - "s3_spea_mirage_86c801_isa", + "px_s3_v7_801_isa", DEVICE_AT | DEVICE_ISA, S3_SPEA_MIRAGE_86C801, s3_init, @@ -7791,7 +7791,7 @@ const device_t s3_spea_mirage_86c801_isa_device = const device_t s3_spea_mirage_86c805_vlb_device = { "S3 86c805 VLB (SPEA Mirage VL)", - "s3_spea_mirage_86c805_vlb", + "px_s3_v7_805_vlb", DEVICE_VLB, S3_SPEA_MIRAGE_86C805, s3_init, @@ -7806,7 +7806,7 @@ const device_t s3_spea_mirage_86c805_vlb_device = const device_t s3_mirocrystal_8s_805_vlb_device = { "S3 86c805 VLB (MiroCRYSTAL 8S)", - "s3_mirocrystal_8s_805_vlb", + "mirocrystal8s_vlb", DEVICE_VLB, S3_MIROCRYSTAL8S_805, s3_init, @@ -7822,7 +7822,7 @@ const device_t s3_mirocrystal_8s_805_vlb_device = const device_t s3_mirocrystal_10sd_805_vlb_device = { "S3 86c805 VLB (MiroCRYSTAL 10SD)", - "s3_mirocrystal_10sd_805_vlb", + "mirocrystal10sd_vlb", DEVICE_VLB, S3_MIROCRYSTAL10SD_805, s3_init, @@ -7837,7 +7837,7 @@ const device_t s3_mirocrystal_10sd_805_vlb_device = const device_t s3_phoenix_86c801_isa_device = { "S3 86c801 ISA (Phoenix)", - "s3_phoenix_86c801_isa", + "px_86c801_isa", DEVICE_AT | DEVICE_ISA, S3_PHOENIX_86C801, s3_init, @@ -7852,7 +7852,7 @@ const device_t s3_phoenix_86c801_isa_device = const device_t s3_phoenix_86c805_vlb_device = { "S3 86c805 VLB (Phoenix)", - "s3_phoenix_86c805_vlb", + "px_86c805_vlb", DEVICE_VLB, S3_PHOENIX_86C805, s3_init, @@ -7867,7 +7867,7 @@ const device_t s3_phoenix_86c805_vlb_device = const device_t s3_metheus_86c928_isa_device = { "S3 86c928 ISA (Metheus Premier 928)", - "s3_metheus_86c928_isa", + "metheus928_isa", DEVICE_AT | DEVICE_ISA, S3_METHEUS_86C928, s3_init, @@ -7882,7 +7882,7 @@ const device_t s3_metheus_86c928_isa_device = const device_t s3_metheus_86c928_vlb_device = { "S3 86c928 VLB (Metheus Premier 928)", - "s3_metheus_86c928_vlb", + "metheus928_vlb", DEVICE_VLB, S3_METHEUS_86C928, s3_init, @@ -7897,7 +7897,7 @@ const device_t s3_metheus_86c928_vlb_device = const device_t s3_spea_mercury_lite_86c928_pci_device = { "S3 86c928 PCI (SPEA Mercury Lite)", - "s3_spea_mercury_lite_86c928_pci", + "spea_mercurylite_pci", DEVICE_PCI, S3_SPEA_MERCURY_LITE_PCI, s3_init, @@ -7912,7 +7912,7 @@ const device_t s3_spea_mercury_lite_86c928_pci_device = const device_t s3_mirocrystal_20sd_864_vlb_device = { "S3 Vision864 VLB (MiroCRYSTAL 20SD)", - "s3_mirocrystal_20sd_864_vlb", + "mirocrystal20sd_vlb", DEVICE_VLB, S3_MIROCRYSTAL20SD_864, s3_init, @@ -7927,7 +7927,7 @@ const device_t s3_mirocrystal_20sd_864_vlb_device = const device_t s3_bahamas64_vlb_device = { "S3 Vision864 VLB (Paradise Bahamas 64)", - "s3_bahamas64_vlb", + "bahamas64_vlb", DEVICE_VLB, S3_PARADISE_BAHAMAS64, s3_init, @@ -7942,7 +7942,7 @@ const device_t s3_bahamas64_vlb_device = const device_t s3_bahamas64_pci_device = { "S3 Vision864 PCI (Paradise Bahamas 64)", - "s3_bahamas64_pci", + "bahamas64_pci", DEVICE_PCI, S3_PARADISE_BAHAMAS64, s3_init, @@ -7957,7 +7957,7 @@ const device_t s3_bahamas64_pci_device = const device_t s3_mirocrystal_20sv_964_vlb_device = { "S3 Vision964 VLB (MiroCRYSTAL 20SV)", - "s3_mirocrystal_20sv_964_vlb", + "mirocrystal20sv_vlb", DEVICE_VLB, S3_MIROCRYSTAL20SV_964, s3_init, @@ -7972,7 +7972,7 @@ const device_t s3_mirocrystal_20sv_964_vlb_device = const device_t s3_mirocrystal_20sv_964_pci_device = { "S3 Vision964 PCI (MiroCRYSTAL 20SV)", - "s3_mirocrystal_20sv_964_pci", + "mirocrystal20sv_pci", DEVICE_PCI, S3_MIROCRYSTAL20SV_964, s3_init, @@ -7988,7 +7988,7 @@ const device_t s3_mirocrystal_20sv_964_pci_device = const device_t s3_diamond_stealth64_964_vlb_device = { "S3 Vision964 VLB (Diamond Stealth64 VRAM)", - "s3_diamond_stealth64_964_vlb", + "stealth64v_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH64_964, s3_init, @@ -8003,7 +8003,7 @@ const device_t s3_diamond_stealth64_964_vlb_device = const device_t s3_diamond_stealth64_964_pci_device = { "S3 Vision964 PCI (Diamond Stealth64 VRAM)", - "s3_diamond_stealth64_964_pci", + "stealth64v_pci", DEVICE_PCI, S3_DIAMOND_STEALTH64_964, s3_init, @@ -8018,7 +8018,7 @@ const device_t s3_diamond_stealth64_964_pci_device = const device_t s3_9fx_771_pci_device = { "S3 Vision968 PCI (Number 9 9FX 771)", - "s3_9fx_771_pci", + "n9_9fx_771_pci", DEVICE_PCI, S3_NUMBER9_9FX_771, s3_init, @@ -8033,7 +8033,7 @@ const device_t s3_9fx_771_pci_device = const device_t s3_phoenix_vision968_pci_device = { "S3 Vision968 PCI (Phoenix)", - "s3_phoenix_vision968_pci", + "px_vision968_pci", DEVICE_PCI, S3_PHOENIX_VISION968, s3_init, @@ -8048,7 +8048,7 @@ const device_t s3_phoenix_vision968_pci_device = const device_t s3_phoenix_vision968_vlb_device = { "S3 Vision968 VLB (Phoenix)", - "s3_phoenix_vision968_vlb", + "px_vision968_vlb", DEVICE_VLB, S3_PHOENIX_VISION968, s3_init, @@ -8063,7 +8063,7 @@ const device_t s3_phoenix_vision968_vlb_device = const device_t s3_mirovideo_40sv_ergo_968_pci_device = { "S3 Vision968 PCI (MiroVIDEO 40SV Ergo)", - "s3_mirovideo_40sv_ergo_968_pci", + "mirovideo40sv_pci", DEVICE_PCI, S3_MIROVIDEO40SV_ERGO_968, s3_init, @@ -8078,7 +8078,7 @@ const device_t s3_mirovideo_40sv_ergo_968_pci_device = const device_t s3_spea_mercury_p64v_pci_device = { "S3 Vision968 PCI (SPEA Mercury P64V)", - "s3_spea_mercury_p64v_pci", + "spea_mercury64p_pci", DEVICE_PCI, S3_SPEA_MERCURY_P64V, s3_init, @@ -8093,7 +8093,7 @@ const device_t s3_spea_mercury_p64v_pci_device = const device_t s3_9fx_vlb_device = { "S3 Trio64 VLB (Number 9 9FX 330)", - "s3_9fx_vlb", + "n9_9fx_vlb", DEVICE_VLB, S3_NUMBER9_9FX, s3_init, @@ -8108,7 +8108,7 @@ const device_t s3_9fx_vlb_device = const device_t s3_9fx_pci_device = { "S3 Trio64 PCI (Number 9 9FX 330)", - "s3_9fx_pci", + "n9_9fx_pci", DEVICE_PCI, S3_NUMBER9_9FX, s3_init, @@ -8123,7 +8123,7 @@ const device_t s3_9fx_pci_device = const device_t s3_phoenix_trio32_vlb_device = { "S3 Trio32 VLB (Phoenix)", - "s3_phoenix_trio32_vlb", + "px_trio32_vlb", DEVICE_VLB, S3_PHOENIX_TRIO32, s3_init, @@ -8138,7 +8138,7 @@ const device_t s3_phoenix_trio32_vlb_device = const device_t s3_phoenix_trio32_pci_device = { "S3 Trio32 PCI (Phoenix)", - "s3_phoenix_trio32_pci", + "px_trio32_pci", DEVICE_PCI, S3_PHOENIX_TRIO32, s3_init, @@ -8153,7 +8153,7 @@ const device_t s3_phoenix_trio32_pci_device = const device_t s3_diamond_stealth_se_vlb_device = { "S3 Trio32 VLB (Diamond Stealth SE)", - "s3_diamond_stealth_se_vlb", + "stealthse_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH_SE, s3_init, @@ -8168,7 +8168,7 @@ const device_t s3_diamond_stealth_se_vlb_device = const device_t s3_diamond_stealth_se_pci_device = { "S3 Trio32 PCI (Diamond Stealth SE)", - "s3_diamond_stealth_se_pci", + "stealthse_pci", DEVICE_PCI, S3_DIAMOND_STEALTH_SE, s3_init, @@ -8184,7 +8184,7 @@ const device_t s3_diamond_stealth_se_pci_device = const device_t s3_phoenix_trio64_vlb_device = { "S3 Trio64 VLB (Phoenix)", - "s3_phoenix_trio64_vlb", + "px_trio64_vlb", DEVICE_VLB, S3_PHOENIX_TRIO64, s3_init, @@ -8199,7 +8199,7 @@ const device_t s3_phoenix_trio64_vlb_device = const device_t s3_phoenix_trio64_onboard_pci_device = { "S3 Trio64 PCI On-Board (Phoenix)", - "s3_phoenix_trio64_onboard_pci", + "px_trio64_onboard_pci", DEVICE_PCI, S3_PHOENIX_TRIO64_ONBOARD, s3_init, @@ -8214,7 +8214,7 @@ const device_t s3_phoenix_trio64_onboard_pci_device = const device_t s3_phoenix_trio64_pci_device = { "S3 Trio64 PCI (Phoenix)", - "s3_phoenix_trio64_pci", + "px_trio64_pci", DEVICE_PCI, S3_PHOENIX_TRIO64, s3_init, @@ -8229,7 +8229,7 @@ const device_t s3_phoenix_trio64_pci_device = const device_t s3_phoenix_trio64vplus_onboard_pci_device = { "S3 Trio64V+ PCI On-Board (Phoenix)", - "s3_phoenix_trio64vplus_onboard_pci", + "px_trio64vplus_onboard_pci", DEVICE_PCI, S3_PHOENIX_TRIO64VPLUS_ONBOARD, s3_init, @@ -8244,7 +8244,7 @@ const device_t s3_phoenix_trio64vplus_onboard_pci_device = const device_t s3_phoenix_trio64vplus_pci_device = { "S3 Trio64V+ PCI (Phoenix)", - "s3_phoenix_trio64vplus_pci", + "px_trio64vplus_pci", DEVICE_PCI, S3_PHOENIX_TRIO64VPLUS, s3_init, @@ -8259,7 +8259,7 @@ const device_t s3_phoenix_trio64vplus_pci_device = const device_t s3_phoenix_vision864_vlb_device = { "S3 Vision864 VLB (Phoenix)", - "s3_phoenix_vision864_vlb", + "px_vision864_vlb", DEVICE_VLB, S3_PHOENIX_VISION864, s3_init, @@ -8274,7 +8274,7 @@ const device_t s3_phoenix_vision864_vlb_device = const device_t s3_phoenix_vision864_pci_device = { "S3 Vision864 PCI (Phoenix)", - "s3_phoenix_vision864_pci", + "px_vision864_pci", DEVICE_PCI, S3_PHOENIX_VISION864, s3_init, @@ -8289,7 +8289,7 @@ const device_t s3_phoenix_vision864_pci_device = const device_t s3_9fx_531_pci_device = { "S3 Vision868 PCI (Number 9 9FX 531)", - "s3_9fx_531_pci", + "n9_9fx_531_pci", DEVICE_PCI, S3_NUMBER9_9FX_531, s3_init, @@ -8304,7 +8304,7 @@ const device_t s3_9fx_531_pci_device = const device_t s3_phoenix_vision868_vlb_device = { "S3 Vision868 VLB (Phoenix)", - "s3_phoenix_vision868_vlb", + "px_vision868_vlb", DEVICE_VLB, S3_PHOENIX_VISION868, s3_init, @@ -8319,7 +8319,7 @@ const device_t s3_phoenix_vision868_vlb_device = const device_t s3_phoenix_vision868_pci_device = { "S3 Vision868 PCI (Phoenix)", - "s3_phoenix_vision868_pci", + "px_vision868_pci", DEVICE_PCI, S3_PHOENIX_VISION868, s3_init, @@ -8334,7 +8334,7 @@ const device_t s3_phoenix_vision868_pci_device = const device_t s3_diamond_stealth64_vlb_device = { "S3 Trio64 VLB (Diamond Stealth64 DRAM)", - "s3_diamond_stealth64_vlb", + "stealth64d_vlb", DEVICE_VLB, S3_DIAMOND_STEALTH64_764, s3_init, @@ -8349,7 +8349,7 @@ const device_t s3_diamond_stealth64_vlb_device = const device_t s3_diamond_stealth64_pci_device = { "S3 Trio64 PCI (Diamond Stealth64 DRAM)", - "s3_diamond_stealth64_pci", + "stealth64d_pci", DEVICE_PCI, S3_DIAMOND_STEALTH64_764, s3_init, @@ -8364,7 +8364,7 @@ const device_t s3_diamond_stealth64_pci_device = const device_t s3_spea_mirage_p64_vlb_device = { "S3 Trio64 VLB (SPEA Mirage P64)", - "s3_spea_mirage_p64_vlb", + "spea_miragep64_vlb", DEVICE_VLB, S3_SPEA_MIRAGE_P64, s3_init, @@ -8379,7 +8379,7 @@ const device_t s3_spea_mirage_p64_vlb_device = const device_t s3_elsa_winner2000_pro_x_964_pci_device = { "S3 Vision964 PCI (ELSA Winner 2000 Pro/X)", - "s3_elsa_winner2000_pro_x_964_pci", + "elsawin2kprox_964_pci", DEVICE_PCI, S3_ELSAWIN2KPROX_964, s3_init, @@ -8394,7 +8394,7 @@ const device_t s3_elsa_winner2000_pro_x_964_pci_device = const device_t s3_elsa_winner2000_pro_x_pci_device = { "S3 Vision968 PCI (ELSA Winner 2000 Pro/X)", - "s3_elsa_winner2000_pro_x_pci", + "elsawin2kprox_pci", DEVICE_PCI, S3_ELSAWIN2KPROX, s3_init, @@ -8409,7 +8409,7 @@ const device_t s3_elsa_winner2000_pro_x_pci_device = const device_t s3_trio64v2_dx_pci_device = { "S3 Trio64V2/DX PCI", - "s3_trio64v2_dx_pci", + "trio64v2dx_pci", DEVICE_PCI, S3_TRIO64V2_DX, s3_init, @@ -8425,7 +8425,7 @@ const device_t s3_trio64v2_dx_pci_device = const device_t s3_trio64v2_dx_onboard_pci_device = { "S3 Trio64V2/DX On-Board PCI", - "s3_trio64v2_dx_onboard_pci", + "trio64v2dx_onboard_pci", DEVICE_PCI, S3_TRIO64V2_DX_ONBOARD, s3_init, @@ -8436,4 +8436,3 @@ const device_t s3_trio64v2_dx_onboard_pci_device = s3_force_redraw, s3_standard_config }; - diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index 04b4d40ab..256f1591b 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -4397,7 +4397,7 @@ static const device_config_t s3_virge_357_config[] = const device_t s3_virge_325_pci_device = { "S3 ViRGE (325) PCI", - "s3_virge_325_pci", + "virge325_pci", DEVICE_PCI, S3_VIRGE_325, s3_virge_init, @@ -4412,7 +4412,7 @@ const device_t s3_virge_325_pci_device = const device_t s3_diamond_stealth_2000_pci_device = { "S3 ViRGE (Diamond Stealth 3D 2000) PCI", - "s3_diamond_stealth_2000_pci", + "stealth3d_2000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_2000, s3_virge_init, @@ -4427,7 +4427,7 @@ const device_t s3_diamond_stealth_2000_pci_device = const device_t s3_diamond_stealth_3000_pci_device = { "S3 ViRGE/VX (Diamond Stealth 3D 3000) PCI", - "s3_diamond_stealth_3000_pci", + "stealth3d_3000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_3000, s3_virge_init, @@ -4442,7 +4442,7 @@ const device_t s3_diamond_stealth_3000_pci_device = const device_t s3_stb_velocity_3d_pci_device = { "S3 ViRGE/VX (STB Velocity 3D) PCI", - "s3_stb_velocity_3d_pci", + "stb_velocity3d_pci", DEVICE_PCI, S3_STB_VELOCITY_3D, s3_virge_init, @@ -4457,7 +4457,7 @@ const device_t s3_stb_velocity_3d_pci_device = const device_t s3_virge_375_pci_device = { "S3 ViRGE/DX (375) PCI", - "s3_virge_375_pci", + "virge375_pci", DEVICE_PCI, S3_VIRGE_DX, s3_virge_init, @@ -4472,7 +4472,7 @@ const device_t s3_virge_375_pci_device = const device_t s3_diamond_stealth_2000pro_pci_device = { "S3 ViRGE/DX (Diamond Stealth 3D 2000 Pro) PCI", - "s3_diamond_stealth_2000pro_pci", + "stealth3d_2000pro_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_2000PRO, s3_virge_init, @@ -4487,7 +4487,7 @@ const device_t s3_diamond_stealth_2000pro_pci_device = const device_t s3_virge_385_pci_device = { "S3 ViRGE/GX (385) PCI", - "s3_virge_385_pci", + "virge385_pci", DEVICE_PCI, S3_VIRGE_GX, s3_virge_init, @@ -4502,7 +4502,7 @@ const device_t s3_virge_385_pci_device = const device_t s3_virge_357_pci_device = { "S3 ViRGE/GX2 (357) PCI", - "s3_virge_357_pci", + "virge357_pci", DEVICE_PCI, S3_VIRGE_GX2, s3_virge_init, @@ -4517,7 +4517,7 @@ const device_t s3_virge_357_pci_device = const device_t s3_virge_357_agp_device = { "S3 ViRGE/GX2 (357) AGP", - "s3_virge_357_agp", + "virge357_agp", DEVICE_AGP, S3_VIRGE_GX2, s3_virge_init, @@ -4532,7 +4532,7 @@ const device_t s3_virge_357_agp_device = const device_t s3_diamond_stealth_4000_pci_device = { "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) PCI", - "s3_diamond_stealth_4000_pci", + "stealth3d_4000_pci", DEVICE_PCI, S3_DIAMOND_STEALTH3D_4000, s3_virge_init, @@ -4547,7 +4547,7 @@ const device_t s3_diamond_stealth_4000_pci_device = const device_t s3_diamond_stealth_4000_agp_device = { "S3 ViRGE/GX2 (Diamond Stealth 3D 4000) AGP", - "s3_diamond_stealth_4000_agp", + "stealth3d_4000_agp", DEVICE_AGP, S3_DIAMOND_STEALTH3D_4000, s3_virge_init, @@ -4562,7 +4562,7 @@ const device_t s3_diamond_stealth_4000_agp_device = const device_t s3_trio3d2x_pci_device = { "S3 Trio3D/2X (362) PCI", - "s3_trio3d2x_pci", + "trio3d2x", DEVICE_PCI, S3_TRIO_3D2X, s3_virge_init, @@ -4577,7 +4577,7 @@ const device_t s3_trio3d2x_pci_device = const device_t s3_trio3d2x_agp_device = { "S3 Trio3D/2X (362) AGP", - "s3_trio3d2x_agp", + "trio3d2x_agp", DEVICE_AGP, S3_TRIO_3D2X, s3_virge_init, @@ -4587,4 +4587,4 @@ const device_t s3_trio3d2x_agp_device = s3_virge_speed_changed, s3_virge_force_redraw, s3_virge_357_config -}; \ No newline at end of file +}; diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c index 0ed0c09cc..08ac011d3 100644 --- a/src/video/vid_sigma.c +++ b/src/video/vid_sigma.c @@ -958,7 +958,7 @@ device_config_t sigma_config[] = const device_t sigma_device = { "Sigma Color 400", - "sigma", + "sigma400", DEVICE_ISA, 0, sigma_init, sigma_close, diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 99dbec45f..fcf5279c8 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -50,15 +50,15 @@ static int was_reset = 0; static const device_t vid_none_device = { "None", - "vid_none", + "none", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, NULL }; static const device_t vid_internal_device = { - "Internal Video Card", - "vid_none", + "Internal", + "internal", 0, 0, NULL, NULL, NULL, { NULL }, NULL, NULL, @@ -68,173 +68,173 @@ static const device_t vid_internal_device = { static const VIDEO_CARD video_cards[] = { { &vid_none_device }, - { &vid_internal_device }, - { &atiega_device }, - { &mach64gx_isa_device }, - { &ati28800k_device }, - { &ati18800_vga88_device }, - { &ati28800_device }, - { &compaq_ati28800_device }, + { &vid_internal_device }, + { &atiega_device }, + { &mach64gx_isa_device }, + { &ati28800k_device }, + { &ati18800_vga88_device }, + { &ati28800_device }, + { &compaq_ati28800_device }, #if defined(DEV_BRANCH) && defined(USE_XL24) - { &ati28800_wonderxl24_device }, + { &ati28800_wonderxl24_device }, #endif - { &ati18800_device }, + { &ati18800_device }, #if defined(DEV_BRANCH) && defined(USE_VGAWONDER) - { &ati18800_wonder_device }, + { &ati18800_wonder_device }, #endif - { &cga_device }, - { &sega_device }, - { &gd5401_isa_device }, - { &gd5402_isa_device }, - { &gd5420_isa_device }, - { &gd5422_isa_device }, - { &gd5426_isa_device }, - { &gd5426_diamond_speedstar_pro_a1_isa_device }, - { &gd5428_isa_device }, - { &gd5429_isa_device }, - { &gd5434_isa_device }, - { &gd5434_diamond_speedstar_64_a3_isa_device }, - { &compaq_cga_device }, - { &compaq_cga_2_device }, - { &cpqega_device }, - { &ega_device }, - { &g2_gc205_device }, - { &hercules_device }, - { &herculesplus_device }, - { &incolor_device }, - { &im1024_device }, - { &iskra_ega_device }, - { &et4000_kasan_isa_device }, - { &mda_device }, - { &genius_device }, - { &nga_device }, - { &ogc_device }, - { &oti037c_device }, - { &oti067_device }, - { &oti077_device }, - { ¶dise_pvga1a_device }, - { ¶dise_wd90c11_device }, - { ¶dise_wd90c30_device }, - { &colorplus_device }, - { &pgc_device }, - { &radius_svga_multiview_isa_device }, - { &realtek_rtg3106_device }, - { &s3_diamond_stealth_vram_isa_device }, - { &s3_orchid_86c911_isa_device }, - { &s3_ami_86c924_isa_device }, - { &s3_metheus_86c928_isa_device }, - { &s3_phoenix_86c801_isa_device }, - { &s3_spea_mirage_86c801_isa_device }, - { &sigma_device }, - { &tvga8900b_device }, - { &tvga8900d_device }, - { &tvga9000b_device }, - { &et4000k_isa_device }, - { &et2000_device }, - { &et4000_isa_device }, - { &et4000w32_device }, - { &et4000w32i_isa_device }, - { &vga_device }, - { &v7_vga_1024i_device }, - { &wy700_device }, - { &gd5428_mca_device }, - { &et4000_mca_device }, - { &radius_svga_multiview_mca_device }, - { &mach64gx_pci_device }, - { &mach64vt2_device }, - { &et4000w32p_revc_pci_device }, - { &et4000w32p_cardex_pci_device }, - { &et4000w32p_noncardex_pci_device }, - { &gd5430_pci_device, }, - { &gd5434_pci_device }, - { &gd5436_pci_device }, - { &gd5440_pci_device }, - { &gd5446_pci_device }, - { &gd5446_stb_pci_device }, - { &gd5480_pci_device }, - { &creative_voodoo_banshee_device }, - { &et4000w32p_pci_device }, - { &s3_spea_mercury_lite_86c928_pci_device }, - { &s3_diamond_stealth64_964_pci_device }, - { &s3_elsa_winner2000_pro_x_964_pci_device }, - { &s3_mirocrystal_20sv_964_pci_device }, - { &s3_bahamas64_pci_device }, - { &s3_phoenix_vision864_pci_device }, - { &s3_diamond_stealth_se_pci_device }, - { &s3_phoenix_trio32_pci_device }, - { &s3_diamond_stealth64_pci_device }, - { &s3_9fx_pci_device }, - { &s3_phoenix_trio64_pci_device }, - { &s3_elsa_winner2000_pro_x_pci_device }, - { &s3_mirovideo_40sv_ergo_968_pci_device }, - { &s3_9fx_771_pci_device }, - { &s3_phoenix_vision968_pci_device }, - { &s3_spea_mercury_p64v_pci_device }, - { &s3_9fx_531_pci_device }, - { &s3_phoenix_vision868_pci_device }, - { &s3_phoenix_trio64vplus_pci_device }, - { &s3_trio64v2_dx_pci_device }, - { &s3_virge_325_pci_device }, - { &s3_diamond_stealth_2000_pci_device }, - { &s3_diamond_stealth_3000_pci_device }, - { &s3_stb_velocity_3d_pci_device }, - { &s3_virge_375_pci_device }, - { &s3_diamond_stealth_2000pro_pci_device }, - { &s3_virge_385_pci_device }, - { &s3_virge_357_pci_device }, - { &s3_diamond_stealth_4000_pci_device }, - { &s3_trio3d2x_pci_device }, + { &cga_device }, + { &sega_device }, + { &gd5401_isa_device }, + { &gd5402_isa_device }, + { &gd5420_isa_device }, + { &gd5422_isa_device }, + { &gd5426_isa_device }, + { &gd5426_diamond_speedstar_pro_a1_isa_device }, + { &gd5428_isa_device }, + { &gd5429_isa_device }, + { &gd5434_isa_device }, + { &gd5434_diamond_speedstar_64_a3_isa_device }, + { &compaq_cga_device }, + { &compaq_cga_2_device }, + { &cpqega_device }, + { &ega_device }, + { &g2_gc205_device }, + { &hercules_device }, + { &herculesplus_device }, + { &incolor_device }, + { &im1024_device }, + { &iskra_ega_device }, + { &et4000_kasan_isa_device }, + { &mda_device }, + { &genius_device }, + { &nga_device }, + { &ogc_device }, + { &oti037c_device }, + { &oti067_device }, + { &oti077_device }, + { ¶dise_pvga1a_device }, + { ¶dise_wd90c11_device }, + { ¶dise_wd90c30_device }, + { &colorplus_device }, + { &pgc_device }, + { &radius_svga_multiview_isa_device }, + { &realtek_rtg3106_device }, + { &s3_diamond_stealth_vram_isa_device }, + { &s3_orchid_86c911_isa_device }, + { &s3_ami_86c924_isa_device }, + { &s3_metheus_86c928_isa_device }, + { &s3_phoenix_86c801_isa_device }, + { &s3_spea_mirage_86c801_isa_device }, + { &sigma_device }, + { &tvga8900b_device }, + { &tvga8900d_device }, + { &tvga9000b_device }, + { &et4000k_isa_device }, + { &et2000_device }, + { &et4000_isa_device }, + { &et4000w32_device }, + { &et4000w32i_isa_device }, + { &vga_device }, + { &v7_vga_1024i_device }, + { &wy700_device }, + { &gd5428_mca_device }, + { &et4000_mca_device }, + { &radius_svga_multiview_mca_device }, + { &mach64gx_pci_device }, + { &mach64vt2_device }, + { &et4000w32p_revc_pci_device }, + { &et4000w32p_cardex_pci_device }, + { &et4000w32p_noncardex_pci_device }, + { &gd5430_pci_device, }, + { &gd5434_pci_device }, + { &gd5436_pci_device }, + { &gd5440_pci_device }, + { &gd5446_pci_device }, + { &gd5446_stb_pci_device }, + { &gd5480_pci_device }, + { &creative_voodoo_banshee_device }, + { &et4000w32p_pci_device }, + { &s3_spea_mercury_lite_86c928_pci_device }, + { &s3_diamond_stealth64_964_pci_device }, + { &s3_elsa_winner2000_pro_x_964_pci_device }, + { &s3_mirocrystal_20sv_964_pci_device }, + { &s3_bahamas64_pci_device }, + { &s3_phoenix_vision864_pci_device }, + { &s3_diamond_stealth_se_pci_device }, + { &s3_phoenix_trio32_pci_device }, + { &s3_diamond_stealth64_pci_device }, + { &s3_9fx_pci_device }, + { &s3_phoenix_trio64_pci_device }, + { &s3_elsa_winner2000_pro_x_pci_device }, + { &s3_mirovideo_40sv_ergo_968_pci_device }, + { &s3_9fx_771_pci_device }, + { &s3_phoenix_vision968_pci_device }, + { &s3_spea_mercury_p64v_pci_device }, + { &s3_9fx_531_pci_device }, + { &s3_phoenix_vision868_pci_device }, + { &s3_phoenix_trio64vplus_pci_device }, + { &s3_trio64v2_dx_pci_device }, + { &s3_virge_325_pci_device }, + { &s3_diamond_stealth_2000_pci_device }, + { &s3_diamond_stealth_3000_pci_device }, + { &s3_stb_velocity_3d_pci_device }, + { &s3_virge_375_pci_device }, + { &s3_diamond_stealth_2000pro_pci_device }, + { &s3_virge_385_pci_device }, + { &s3_virge_357_pci_device }, + { &s3_diamond_stealth_4000_pci_device }, + { &s3_trio3d2x_pci_device }, #if defined(DEV_BRANCH) && defined(USE_MGA) - { &mystique_device }, - { &mystique_220_device }, + { &mystique_device }, + { &mystique_220_device }, #endif - { &tgui9440_pci_device }, - { &tgui9660_pci_device }, - { &tgui9680_pci_device }, - { &voodoo_banshee_device }, - { &voodoo_3_2000_device }, - { &voodoo_3_3000_device }, - { &mach64gx_vlb_device }, - { &et4000w32i_vlb_device }, - { &et4000w32p_revc_vlb_device }, - { &et4000w32p_cardex_vlb_device }, - { &et4000w32p_vlb_device }, - { &et4000w32p_noncardex_vlb_device }, - { &gd5424_vlb_device }, - { &gd5426_vlb_device }, - { &gd5428_vlb_device }, - { &gd5428_diamond_speedstar_pro_b1_vlb_device }, - { &gd5429_vlb_device }, - { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, - { &gd5434_vlb_device }, - { &s3_metheus_86c928_vlb_device }, - { &s3_mirocrystal_8s_805_vlb_device }, - { &s3_mirocrystal_10sd_805_vlb_device }, - { &s3_phoenix_86c805_vlb_device }, - { &s3_spea_mirage_86c805_vlb_device }, - { &s3_diamond_stealth64_964_vlb_device }, - { &s3_mirocrystal_20sv_964_vlb_device }, - { &s3_mirocrystal_20sd_864_vlb_device }, - { &s3_bahamas64_vlb_device }, - { &s3_phoenix_vision864_vlb_device }, - { &s3_diamond_stealth_se_vlb_device }, - { &s3_phoenix_trio32_vlb_device }, - { &s3_diamond_stealth64_vlb_device }, - { &s3_9fx_vlb_device }, - { &s3_phoenix_trio64_vlb_device }, - { &s3_spea_mirage_p64_vlb_device }, - { &s3_phoenix_vision968_vlb_device }, - { &s3_phoenix_vision868_vlb_device }, - { &ht216_32_standalone_device }, - { &tgui9400cxi_device }, - { &tgui9440_vlb_device }, - { &s3_virge_357_agp_device }, - { &s3_diamond_stealth_4000_agp_device }, - { &s3_trio3d2x_agp_device }, - { &velocity_100_agp_device }, - { &voodoo_3_2000_agp_device }, - { &voodoo_3_3000_agp_device }, - { NULL } + { &tgui9440_pci_device }, + { &tgui9660_pci_device }, + { &tgui9680_pci_device }, + { &voodoo_banshee_device }, + { &voodoo_3_2000_device }, + { &voodoo_3_3000_device }, + { &mach64gx_vlb_device }, + { &et4000w32i_vlb_device }, + { &et4000w32p_revc_vlb_device }, + { &et4000w32p_cardex_vlb_device }, + { &et4000w32p_vlb_device }, + { &et4000w32p_noncardex_vlb_device }, + { &gd5424_vlb_device }, + { &gd5426_vlb_device }, + { &gd5428_vlb_device }, + { &gd5428_diamond_speedstar_pro_b1_vlb_device }, + { &gd5429_vlb_device }, + { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, + { &gd5434_vlb_device }, + { &s3_metheus_86c928_vlb_device }, + { &s3_mirocrystal_8s_805_vlb_device }, + { &s3_mirocrystal_10sd_805_vlb_device }, + { &s3_phoenix_86c805_vlb_device }, + { &s3_spea_mirage_86c805_vlb_device }, + { &s3_diamond_stealth64_964_vlb_device }, + { &s3_mirocrystal_20sv_964_vlb_device }, + { &s3_mirocrystal_20sd_864_vlb_device }, + { &s3_bahamas64_vlb_device }, + { &s3_phoenix_vision864_vlb_device }, + { &s3_diamond_stealth_se_vlb_device }, + { &s3_phoenix_trio32_vlb_device }, + { &s3_diamond_stealth64_vlb_device }, + { &s3_9fx_vlb_device }, + { &s3_phoenix_trio64_vlb_device }, + { &s3_spea_mirage_p64_vlb_device }, + { &s3_phoenix_vision968_vlb_device }, + { &s3_phoenix_vision868_vlb_device }, + { &ht216_32_standalone_device }, + { &tgui9400cxi_device }, + { &tgui9440_vlb_device }, + { &s3_virge_357_agp_device }, + { &s3_diamond_stealth_4000_agp_device }, + { &s3_trio3d2x_agp_device }, + { &velocity_100_agp_device }, + { &voodoo_3_2000_agp_device }, + { &voodoo_3_3000_agp_device }, + { NULL } }; @@ -357,7 +357,7 @@ video_card_has_config(int card) char * video_get_internal_name(int card) { - return((char *) video_cards[card].device->internal_name); + return device_get_internal_name(video_cards[card].device); } @@ -366,7 +366,7 @@ video_get_video_from_internal_name(char *s) { int c = 0; - while (strcmp(video_cards[c].device->internal_name, "") != 0) { + while (video_cards[c].device != NULL) { if (!strcmp((char *) video_cards[c].device->internal_name, s)) return(c); c++; diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c index 7326c1925..529cc6460 100644 --- a/src/video/vid_tgui9440.c +++ b/src/video/vid_tgui9440.c @@ -3233,7 +3233,7 @@ static const device_config_t tgui96xx_config[] = const device_t tgui9400cxi_device = { "Trident TGUI 9400CXi", - "tgui9400cxi", + "tgui9400cxi_vlb", DEVICE_VLB, TGUI_9400CXI, tgui_init, diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index a0fa9565a..64f2b2b1b 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -2959,7 +2959,7 @@ static void banshee_force_redraw(void *p) const device_t voodoo_banshee_device = { "3dfx Voodoo Banshee", - "voodoo_banshee", + "voodoo_banshee_pci", DEVICE_PCI, 0, banshee_init, @@ -2974,7 +2974,7 @@ const device_t voodoo_banshee_device = const device_t creative_voodoo_banshee_device = { "Creative 3D Blaster Banshee", - "creative_voodoo_banshee", + "ctl3d_banshee_pci", DEVICE_PCI, 0, creative_banshee_init, @@ -2989,7 +2989,7 @@ const device_t creative_voodoo_banshee_device = const device_t voodoo_3_2000_device = { "3dfx Voodoo3 2000", - "voodoo_3_2000", + "voodoo3_2k_pci", DEVICE_PCI, 0, v3_2000_init, @@ -3004,7 +3004,7 @@ const device_t voodoo_3_2000_device = const device_t voodoo_3_2000_agp_device = { "3dfx Voodoo3 2000", - "voodoo_3_2000_agp", + "voodoo3_2k_agp", DEVICE_AGP, 0, v3_2000_agp_init, @@ -3019,7 +3019,7 @@ const device_t voodoo_3_2000_agp_device = const device_t voodoo_3_2000_agp_onboard_8m_device = { "3dfx Voodoo3 2000 (On-Board 8MB SGRAM)", - "voodoo_3_2000_agp_onboard_8m", + "voodoo3_2k_agp_onboard_8m", DEVICE_AGP, 8, v3_2000_agp_onboard_init, @@ -3034,7 +3034,7 @@ const device_t voodoo_3_2000_agp_onboard_8m_device = const device_t voodoo_3_3000_device = { "3dfx Voodoo3 3000", - "voodoo_3_3000", + "voodoo3_3k_pci", DEVICE_PCI, 0, v3_3000_init, @@ -3049,7 +3049,7 @@ const device_t voodoo_3_3000_device = const device_t voodoo_3_3000_agp_device = { "3dfx Voodoo3 3000", - "voodoo_3_3000_agp", + "voodoo3_3k_agp", DEVICE_AGP, 0, v3_3000_agp_init, @@ -3064,7 +3064,7 @@ const device_t voodoo_3_3000_agp_device = const device_t velocity_100_agp_device = { "3dfx Velocity 100", - "velocity_100_agp", + "velocity100_agp", DEVICE_AGP, 0, velocity_100_agp_init,