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,