refactored device_t and all declarations
This commit is contained in:
@@ -556,6 +556,7 @@ static const device_config_t fluidsynth_config[] =
|
||||
const device_t fluidsynth_device =
|
||||
{
|
||||
"FluidSynth",
|
||||
"fluidsynth",
|
||||
0,
|
||||
0,
|
||||
fluidsynth_init,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 },
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 },
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 },
|
||||
|
||||
Reference in New Issue
Block a user