src/sound

This commit is contained in:
Jasmine Iwanek
2022-03-13 10:03:39 -04:00
parent 0d9161016d
commit c195b348a7
22 changed files with 654 additions and 650 deletions

View File

@@ -72,17 +72,17 @@ typedef struct
} MIDI_OUT_DEVICE, MIDI_IN_DEVICE;
static const device_t midi_out_none_device = {
"None",
"none",
0,
0,
NULL,
NULL,
NULL,
{ NULL },
NULL,
NULL,
NULL
.name = "None",
.internal_name = "none",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static const MIDI_OUT_DEVICE devices[] = {
@@ -103,17 +103,17 @@ static const MIDI_OUT_DEVICE devices[] = {
};
static const device_t midi_in_none_device = {
"None",
"none",
0,
0,
NULL,
NULL,
NULL,
{ NULL },
NULL,
NULL,
NULL
.name = "None",
.internal_name = "none",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static const MIDI_IN_DEVICE midi_in_devices[] = {

View File

@@ -540,17 +540,17 @@ static const device_config_t fluidsynth_config[] = {
};
const device_t fluidsynth_device = {
"FluidSynth",
"fluidsynth",
0,
0,
fluidsynth_init,
fluidsynth_close,
NULL,
{ fluidsynth_available },
NULL,
NULL,
fluidsynth_config
.name = "FluidSynth",
.internal_name = "fluidsynth",
.flags = 0,
.local = 0,
.init = fluidsynth_init,
.close = fluidsynth_close,
.reset = NULL,
{ .available = fluidsynth_available },
.speed_changed = NULL,
.force_redraw = NULL,
.config = fluidsynth_config
};
#endif /*USE_FLUIDSYNTH*/

View File

@@ -375,29 +375,29 @@ static const device_config_t mt32_config[] = {
};
const device_t mt32_device = {
"Roland MT-32 Emulation",
"mt32",
0,
0,
mt32_init,
mt32_close,
NULL,
{ mt32_available },
NULL,
NULL,
mt32_config
.name = "Roland MT-32 Emulation",
.internal_name = "mt32",
.flags = 0,
.local = 0,
.init = mt32_init,
.close = mt32_close,
.reset = NULL,
{ .available = mt32_available },
.speed_changed = NULL,
.force_redraw = NULL,
.config = mt32_config
};
const device_t cm32l_device = {
"Roland CM-32L Emulation",
"cm32l",
0,
0,
cm32l_init,
mt32_close,
NULL,
{ cm32l_available },
NULL,
NULL,
mt32_config
.name = "Roland CM-32L Emulation",
.internal_name = "cm32l",
.flags = 0,
.local = 0,
.init = cm32l_init,
.close = mt32_close,
.reset = NULL,
{ .available = cm32l_available },
.speed_changed = NULL,
.force_redraw = NULL,
.config = mt32_config
};

View File

@@ -641,113 +641,113 @@ 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,
{ NULL },
NULL,
NULL,
NULL
.name = "Analog Devices AD1881",
.internal_name = "ad1881",
.flags = DEVICE_AC97,
.local = AC97_CODEC_AD1881,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t ak4540_device = {
"Asahi Kasei AK4540",
"ak4540",
DEVICE_AC97,
AC97_CODEC_AK4540,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "Asahi Kasei AK4540",
.internal_name = "ak4540",
.flags = DEVICE_AC97,
.local = AC97_CODEC_AK4540,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t alc100_device = {
"Avance Logic ALC100",
"alc100",
DEVICE_AC97,
AC97_CODEC_ALC100,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "Avance Logic ALC100",
.internal_name = "alc100",
.flags = DEVICE_AC97,
.local = AC97_CODEC_ALC100,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4297_device = {
"Crystal CS4297",
"cs4297",
DEVICE_AC97,
AC97_CODEC_CS4297,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "Crystal CS4297",
.internal_name = "cs4297",
.flags = DEVICE_AC97,
.local = AC97_CODEC_CS4297,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4297a_device = {
"Crystal CS4297A",
"cs4297a",
DEVICE_AC97,
AC97_CODEC_CS4297A,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "Crystal CS4297A",
.internal_name = "cs4297a",
.flags = DEVICE_AC97,
.local = AC97_CODEC_CS4297A,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t stac9708_device = {
"SigmaTel STAC9708",
"stac9708",
DEVICE_AC97,
AC97_CODEC_STAC9708,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "SigmaTel STAC9708",
.internal_name = "stac9708",
.flags = DEVICE_AC97,
.local = AC97_CODEC_STAC9708,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t stac9721_device = {
"SigmaTel STAC9721",
"stac9721",
DEVICE_AC97,
AC97_CODEC_STAC9721,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "SigmaTel STAC9721",
.internal_name = "stac9721",
.flags = DEVICE_AC97,
.local = AC97_CODEC_STAC9721,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t wm9701a_device = {
"Wolfson WM9701A",
"wm9701a",
DEVICE_AC97,
AC97_CODEC_WM9701A,
ac97_codec_init,
ac97_codec_close,
ac97_codec_reset,
{ NULL },
NULL,
NULL,
NULL
.name = "Wolfson WM9701A",
.internal_name = "wm9701a",
.flags = DEVICE_AC97,
.local = AC97_CODEC_WM9701A,
.init = ac97_codec_init,
.close = ac97_codec_close,
.reset = ac97_codec_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -804,15 +804,15 @@ ac97_via_close(void *priv)
}
const device_t ac97_via_device = {
"VIA VT82C686 Integrated AC97 Controller",
"ac97_via",
DEVICE_PCI,
0,
ac97_via_init,
ac97_via_close,
NULL,
{ NULL },
ac97_via_speed_changed,
NULL,
NULL
.name = "VIA VT82C686 Integrated AC97 Controller",
.internal_name = "ac97_via",
.flags = DEVICE_PCI,
.local = 0,
.init = ac97_via_init,
.close = ac97_via_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = ac97_via_speed_changed,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -142,29 +142,29 @@ adlib_close(void *p)
}
const device_t adlib_device = {
"AdLib",
"adlib",
DEVICE_ISA,
0,
adlib_init,
adlib_close,
NULL,
{ NULL },
NULL,
NULL,
NULL
.name = "AdLib",
.internal_name = "adlib",
.flags = DEVICE_ISA,
.local = 0,
.init = adlib_init,
.close = adlib_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t adlib_mca_device = {
"AdLib (MCA)",
"adlib_mca",
DEVICE_MCA,
0,
adlib_init,
adlib_close,
NULL,
{ NULL },
NULL,
NULL,
NULL
.name = "AdLib (MCA)",
.internal_name = "adlib_mca",
.flags = DEVICE_MCA,
.local = 0,
.init = adlib_init,
.close = adlib_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -990,15 +990,15 @@ static const device_config_t adgold_config[] = {
};
const device_t adgold_device = {
"AdLib Gold",
"adlibgold",
DEVICE_ISA,
0,
adgold_init,
adgold_close,
NULL,
{ NULL },
NULL,
NULL,
adgold_config
.name = "AdLib Gold",
.internal_name = "adlibgold",
.flags = DEVICE_ISA,
.local = 0,
.init = adgold_init,
.close = adgold_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = adgold_config
};

View File

@@ -2088,29 +2088,29 @@ static const device_config_t es1371_config[] = {
};
const device_t es1371_device = {
"Ensoniq AudioPCI (ES1371)",
"es1371",
DEVICE_PCI,
0,
es1371_init,
es1371_close,
es1371_reset,
{ NULL },
es1371_speed_changed,
NULL,
es1371_config
.name = "Ensoniq AudioPCI (ES1371)",
.internal_name = "es1371",
.flags = DEVICE_PCI,
.local = 0,
.init = es1371_init,
.close = es1371_close,
.reset = es1371_reset,
{ .available = NULL },
.speed_changed = es1371_speed_changed,
.force_redraw = NULL,
.config = es1371_config
};
const device_t es1371_onboard_device = {
"Ensoniq AudioPCI (ES1371) (On-Board)",
"es1371_onboard",
DEVICE_PCI,
1,
es1371_init,
es1371_close,
es1371_reset,
{ NULL },
es1371_speed_changed,
NULL,
NULL
.name = "Ensoniq AudioPCI (ES1371) (On-Board)",
.internal_name = "es1371_onboard",
.flags = DEVICE_PCI,
.local = 1,
.init = es1371_init,
.close = es1371_close,
.reset = es1371_reset,
{ .available = NULL },
.speed_changed = es1371_speed_changed,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -1425,29 +1425,29 @@ 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 },
azt_speed_changed,
NULL,
azt2316a_config
.name = "Aztech Sound Galaxy Pro 16 AB (Washington)",
.internal_name = "azt2316a",
.flags = DEVICE_ISA | DEVICE_AT,
.local = SB_SUBTYPE_CLONE_AZT2316A_0X11,
.init = azt_init,
.close = azt_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = azt_speed_changed,
.force_redraw = NULL,
.config = azt2316a_config
};
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 },
azt_speed_changed,
NULL,
azt1605_config
.name = "Aztech Sound Galaxy Nova 16 Extra (Clinton)",
.internal_name = "azt1605",
.flags = DEVICE_ISA | DEVICE_AT,
.local = SB_SUBTYPE_CLONE_AZT1605_0X0C,
.init = azt_init,
.close = azt_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = azt_speed_changed,
.force_redraw = NULL,
.config = azt1605_config
};

View File

@@ -207,15 +207,15 @@ 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,
cms_config
.name = "Creative Music System / Game Blaster",
.internal_name = "cms",
.flags = DEVICE_ISA,
.local = 0,
.init = cms_init,
.close = cms_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = cms_config
};

View File

@@ -827,71 +827,71 @@ cs423x_speed_changed(void *priv)
}
const device_t cs4235_device = {
"Crystal CS4235",
"cs4235",
DEVICE_ISA | DEVICE_AT,
CRYSTAL_CS4235,
cs423x_init,
cs423x_close,
cs423x_reset,
{ NULL },
cs423x_speed_changed,
NULL,
NULL
.name = "Crystal CS4235",
.internal_name = "cs4235",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4235,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
{ .available = NULL },
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4235_onboard_device = {
"Crystal CS4235 (On-Board)",
"cs4235_onboard",
DEVICE_ISA | DEVICE_AT,
CRYSTAL_CS4235 | CRYSTAL_NOEEPROM,
cs423x_init,
cs423x_close,
cs423x_reset,
{ NULL },
cs423x_speed_changed,
NULL,
NULL
.name = "Crystal CS4235 (On-Board)",
.internal_name = "cs4235_onboard",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4235 | CRYSTAL_NOEEPROM,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
{ .available = NULL },
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4236b_device = {
"Crystal CS4236B",
"cs4236b",
DEVICE_ISA | DEVICE_AT,
CRYSTAL_CS4236B,
cs423x_init,
cs423x_close,
cs423x_reset,
{ NULL },
cs423x_speed_changed,
NULL,
NULL
.name = "Crystal CS4236B",
.internal_name = "cs4236b",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4236B,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
{ .available = NULL },
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4237b_device = {
"Crystal CS4237B",
"cs4237b",
DEVICE_ISA | DEVICE_AT,
CRYSTAL_CS4237B,
cs423x_init,
cs423x_close,
cs423x_reset,
{ NULL },
cs423x_speed_changed,
NULL,
NULL
.name = "Crystal CS4237B",
.internal_name = "cs4237b",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4237B,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
{ .available = NULL },
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4238b_device = {
"Crystal CS4238B",
"cs4238b",
DEVICE_ISA | DEVICE_AT,
CRYSTAL_CS4238B,
cs423x_init,
cs423x_close,
cs423x_reset,
{ NULL },
cs423x_speed_changed,
NULL,
NULL
.name = "Crystal CS4238B",
.internal_name = "cs4238b",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4238B,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
{ .available = NULL },
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -1239,15 +1239,15 @@ 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,
{ NULL },
gus_speed_changed,
NULL,
gus_config
.name = "Gravis UltraSound",
.internal_name = "gus",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = gus_init,
.close = gus_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = gus_speed_changed,
.force_redraw = NULL,
.config = gus_config
};

View File

@@ -109,25 +109,25 @@ dac_close(void *p)
}
const lpt_device_t lpt_dac_device = {
"LPT DAC / Covox Speech Thing",
"lpt_dac",
dac_init,
dac_close,
dac_write_data,
dac_write_ctrl,
NULL,
dac_read_status,
NULL
.name = "LPT DAC / Covox Speech Thing",
.internal_name = "lpt_dac",
.init = dac_init,
.close = dac_close,
.write_data = dac_write_data,
.write_ctrl = dac_write_ctrl,
.read_data = NULL,
.read_status = dac_read_status,
.read_ctrl = NULL
};
const lpt_device_t lpt_dac_stereo_device = {
"Stereo LPT DAC",
"lpt_dac_stereo",
dac_stereo_init,
dac_close,
dac_write_data,
dac_write_ctrl,
NULL,
dac_read_status,
NULL
.name = "Stereo LPT DAC",
.internal_name = "lpt_dac_stereo",
.init = dac_stereo_init,
.close = dac_close,
.write_data = dac_write_data,
.write_ctrl = dac_write_ctrl,
.read_data = NULL,
.read_status = dac_read_status,
.read_ctrl = NULL
};

View File

@@ -132,13 +132,13 @@ dss_close(void *p)
}
const lpt_device_t dss_device = {
"Disney Sound Source",
"dss",
dss_init,
dss_close,
dss_write_data,
dss_write_ctrl,
NULL,
dss_read_status,
NULL
.name = "Disney Sound Source",
.internal_name = "dss",
.init = dss_init,
.close = dss_close,
.write_data = dss_write_data,
.write_ctrl = dss_write_ctrl,
.read_data = NULL,
.read_status = dss_read_status,
.read_ctrl = NULL
};

View File

@@ -1857,29 +1857,29 @@ 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 },
NULL,
NULL,
mpu401_standalone_config
.name = "Roland MPU-IPC-T",
.internal_name = "mpu401",
.flags = DEVICE_ISA,
.local = 0,
.init = mpu401_standalone_init,
.close = mpu401_standalone_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = mpu401_standalone_config
};
const device_t mpu401_mca_device = {
"Roland MPU-IMC",
"mpu401_mca",
DEVICE_MCA,
0,
mpu401_standalone_init,
mpu401_standalone_close,
NULL,
{ NULL },
NULL,
NULL,
mpu401_standalone_mca_config
.name = "Roland MPU-IMC",
.internal_name = "mpu401_mca",
.flags = DEVICE_MCA,
.local = 0,
.init = mpu401_standalone_init,
.close = mpu401_standalone_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = mpu401_standalone_mca_config
};

View File

@@ -743,15 +743,15 @@ 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,
{ NULL },
NULL,
NULL,
NULL
.name = "Pro Audio Spectrum 16",
.internal_name = "pas16",
.flags = DEVICE_ISA | DEVICE_NOT_WORKING,
.local = 0,
.init = pas16_init,
.close = pas16_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -187,15 +187,15 @@ ps1snd_close(void *priv)
}
const device_t ps1snd_device = {
"IBM PS/1 Audio Card",
"ps1snd",
0,
0,
ps1snd_init,
ps1snd_close,
NULL,
{ NULL },
NULL,
NULL,
NULL
.name = "IBM PS/1 Audio Card",
.internal_name = "ps1snd",
.flags = 0,
.local = 0,
.init = ps1snd_init,
.close = ps1snd_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

View File

@@ -253,43 +253,45 @@ static const device_config_t pssj_isa_config[] = {
#endif
const device_t pssj_device = {
"Tandy PSSJ",
"pssj",
0,
0,
pssj_init,
pssj_close,
NULL,
{ NULL },
NULL,
NULL
.name = "Tandy PSSJ",
.internal_name = "pssj",
.flags = 0,
.local = 0,
.init = pssj_init,
.close = pssj_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t pssj_1e0_device = {
"Tandy PSSJ (port 1e0h)",
"pssj_1e0",
0,
0,
pssj_1e0_init,
pssj_close,
NULL,
{ NULL },
NULL,
NULL
.name = "Tandy PSSJ (port 1e0h)",
.internal_name = "pssj_1e0",
.flags = 0,
.local = 0,
.init = pssj_1e0_init,
.close = pssj_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t pssj_isa_device = {
"Tandy PSSJ Clone",
"pssj_isa",
DEVICE_ISA,
0,
pssj_isa_init,
pssj_close,
NULL,
{ NULL },
NULL,
NULL,
pssj_isa_config
.name = "Tandy PSSJ Clone",
.internal_name = "pssj_isa",
.flags = DEVICE_ISA,
.local = 0,
.init = pssj_isa_init,
.close = pssj_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = pssj_isa_config
};
#endif

View File

@@ -2394,225 +2394,225 @@ static const device_config_t sb_awe64_gold_config[] = {
// clang-format on
const device_t sb_1_device = {
"Sound Blaster v1.0",
"sb",
DEVICE_ISA,
0,
sb_1_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_config
.name = "Sound Blaster v1.0",
.internal_name = "sb",
.flags = DEVICE_ISA,
.local = 0,
.init = sb_1_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_config
};
const device_t sb_15_device = {
"Sound Blaster v1.5",
"sb1.5",
DEVICE_ISA,
0,
sb_15_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb15_config
.name = "Sound Blaster v1.5",
.internal_name = "sb1.5",
.flags = DEVICE_ISA,
.local = 0,
.init = sb_15_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb15_config
};
const device_t sb_mcv_device = {
"Sound Blaster MCV",
"sbmcv",
DEVICE_MCA,
0,
sb_mcv_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_mcv_config
.name = "Sound Blaster MCV",
.internal_name = "sbmcv",
.flags = DEVICE_MCA,
.local = 0,
.init = sb_mcv_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_mcv_config
};
const device_t sb_2_device = {
"Sound Blaster v2.0",
"sb2.0",
DEVICE_ISA,
0,
sb_2_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb2_config
.name = "Sound Blaster v2.0",
.internal_name = "sb2.0",
.flags = DEVICE_ISA,
.local = 0,
.init = sb_2_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb2_config
};
const device_t sb_pro_v1_device = {
"Sound Blaster Pro v1",
"sbprov1",
DEVICE_ISA,
0,
sb_pro_v1_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_pro_config
.name = "Sound Blaster Pro v1",
.internal_name = "sbprov1",
.flags = DEVICE_ISA,
.local = 0,
.init = sb_pro_v1_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_pro_config
};
const device_t sb_pro_v2_device = {
"Sound Blaster Pro v2",
"sbprov2",
DEVICE_ISA,
0,
sb_pro_v2_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_pro_config
.name = "Sound Blaster Pro v2",
.internal_name = "sbprov2",
.flags = DEVICE_ISA,
.local = 0,
.init = sb_pro_v2_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_pro_config
};
const device_t sb_pro_mcv_device = {
"Sound Blaster Pro MCV",
"sbpromcv",
DEVICE_MCA,
0,
sb_pro_mcv_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
NULL
.name = "Sound Blaster Pro MCV",
.internal_name = "sbpromcv",
.flags = DEVICE_MCA,
.local = 0,
.init = sb_pro_mcv_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t sb_pro_compat_device = {
"Sound Blaster Pro (Compatibility)",
"sbpro_compat",
DEVICE_ISA | DEVICE_AT,
0,
sb_pro_compat_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
NULL
.name = "Sound Blaster Pro (Compatibility)",
.internal_name = "sbpro_compat",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = sb_pro_compat_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t sb_16_device = {
"Sound Blaster 16",
"sb16",
DEVICE_ISA | DEVICE_AT,
0,
sb_16_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_16_config
.name = "Sound Blaster 16",
.internal_name = "sb16",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = sb_16_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_16_config
};
const device_t sb_16_pnp_device = {
"Sound Blaster 16 PnP",
"sb16_pnp",
DEVICE_ISA | DEVICE_AT,
0,
sb_16_pnp_init,
sb_close,
NULL,
{ NULL },
sb_speed_changed,
NULL,
sb_16_pnp_config
.name = "Sound Blaster 16 PnP",
.internal_name = "sb16_pnp",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = sb_16_pnp_init,
.close = sb_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_16_pnp_config
};
const device_t sb_32_pnp_device = {
"Sound Blaster 32 PnP",
"sb32_pnp",
DEVICE_ISA | DEVICE_AT,
0,
sb_awe32_pnp_init,
sb_awe32_close,
NULL,
{ sb_32_pnp_available },
sb_speed_changed,
NULL,
sb_32_pnp_config
.name = "Sound Blaster 32 PnP",
.internal_name = "sb32_pnp",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = sb_awe32_pnp_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_32_pnp_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_32_pnp_config
};
const device_t sb_awe32_device = {
"Sound Blaster AWE32",
"sbawe32",
DEVICE_ISA | DEVICE_AT,
0,
sb_awe32_init,
sb_awe32_close,
NULL,
{ sb_awe32_available },
sb_speed_changed,
NULL,
sb_awe32_config
.name = "Sound Blaster AWE32",
.internal_name = "sbawe32",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = sb_awe32_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_awe32_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_awe32_config
};
const device_t sb_awe32_pnp_device = {
"Sound Blaster AWE32 PnP",
"sbawe32_pnp",
DEVICE_ISA | DEVICE_AT,
1,
sb_awe32_pnp_init,
sb_awe32_close,
NULL,
{ sb_awe32_pnp_available },
sb_speed_changed,
NULL,
sb_awe32_pnp_config
.name = "Sound Blaster AWE32 PnP",
.internal_name = "sbawe32_pnp",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 1,
.init = sb_awe32_pnp_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_awe32_pnp_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_awe32_pnp_config
};
const device_t sb_awe64_value_device = {
"Sound Blaster AWE64 Value",
"sbawe64_value",
DEVICE_ISA | DEVICE_AT,
2,
sb_awe32_pnp_init,
sb_awe32_close,
NULL,
{ sb_awe64_value_available },
sb_speed_changed,
NULL,
sb_awe64_value_config
.name = "Sound Blaster AWE64 Value",
.internal_name = "sbawe64_value",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 2,
.init = sb_awe32_pnp_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_awe64_value_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_awe64_value_config
};
const device_t sb_awe64_device = {
"Sound Blaster AWE64",
"sbawe64",
DEVICE_ISA | DEVICE_AT,
3,
sb_awe32_pnp_init,
sb_awe32_close,
NULL,
{ sb_awe64_available },
sb_speed_changed,
NULL,
sb_awe64_config
.name = "Sound Blaster AWE64",
.internal_name = "sbawe64",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 3,
.init = sb_awe32_pnp_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_awe64_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_awe64_config
};
const device_t sb_awe64_gold_device = {
"Sound Blaster AWE64 Gold",
"sbawe64_gold",
DEVICE_ISA | DEVICE_AT,
4,
sb_awe32_pnp_init,
sb_awe32_close,
NULL,
{ sb_awe64_gold_available },
sb_speed_changed,
NULL,
sb_awe64_gold_config
.name = "Sound Blaster AWE64 Gold",
.internal_name = "sbawe64_gold",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 4,
.init = sb_awe32_pnp_init,
.close = sb_awe32_close,
.reset = NULL,
{ .available = sb_awe64_gold_available },
.speed_changed = sb_speed_changed,
.force_redraw = NULL,
.config = sb_awe64_gold_config
};

View File

@@ -261,43 +261,45 @@ static const device_config_t tndy_config[] = {
#endif
const device_t sn76489_device = {
"TI SN74689 PSG",
"sn76489",
0,
0,
sn76489_device_init,
sn76489_device_close,
NULL,
{ NULL },
NULL,
NULL
.name = "TI SN74689 PSG",
.internal_name = "sn76489",
.flags = 0,
.local = 0,
.init = sn76489_device_init,
.close = sn76489_device_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t ncr8496_device = {
"NCR8496 PSG",
"ncr8496",
0,
0,
ncr8496_device_init,
sn76489_device_close,
NULL,
{ NULL },
NULL,
NULL
.name = "NCR8496 PSG",
.internal_name = "ncr8496",
.flags = 0,
.local = 0,
.init = ncr8496_device_init,
.close = sn76489_device_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t tndy_device = {
"TNDY",
"tndy",
DEVICE_ISA,
0,
tndy_device_init,
sn76489_device_close,
NULL,
{ NULL },
NULL,
NULL,
tndy_config
.name = "TNDY",
.internal_name = "tndy",
.flags = DEVICE_ISA,
.local = 0,
.init = tndy_device_init,
.close = sn76489_device_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = tndy_config
};
#endif

View File

@@ -108,15 +108,15 @@ 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,
ssi2001_config
.name = "Innovation SSI-2001",
.internal_name = "ssi2001",
.flags = DEVICE_ISA,
.local = 0,
.init = ssi2001_init,
.close = ssi2001_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ssi2001_config
};

View File

@@ -243,29 +243,29 @@ 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 },
wss_speed_changed,
NULL,
wss_config
.name = "Windows Sound System",
.internal_name = "wss",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = wss_init,
.close = wss_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = wss_speed_changed,
.force_redraw = NULL,
.config = wss_config
};
const device_t ncr_business_audio_device = {
"NCR Business Audio",
"ncraudio",
DEVICE_MCA,
0,
ncr_audio_init,
wss_close,
NULL,
{ NULL },
wss_speed_changed,
NULL,
NULL
.name = "NCR Business Audio",
.internal_name = "ncraudio",
.flags = DEVICE_MCA,
.local = 0,
.init = ncr_audio_init,
.close = wss_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = wss_speed_changed,
.force_redraw = NULL,
.config = NULL
};