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; } MIDI_OUT_DEVICE, MIDI_IN_DEVICE;
static const device_t midi_out_none_device = { static const device_t midi_out_none_device = {
"None", .name = "None",
"none", .internal_name = "none",
0, .flags = 0,
0, .local = 0,
NULL, .init = NULL,
NULL, .close = NULL,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
NULL .config = NULL
}; };
static const MIDI_OUT_DEVICE devices[] = { static const MIDI_OUT_DEVICE devices[] = {
@@ -103,17 +103,17 @@ static const MIDI_OUT_DEVICE devices[] = {
}; };
static const device_t midi_in_none_device = { static const device_t midi_in_none_device = {
"None", .name = "None",
"none", .internal_name = "none",
0, .flags = 0,
0, .local = 0,
NULL, .init = NULL,
NULL, .close = NULL,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
NULL .config = NULL
}; };
static const MIDI_IN_DEVICE midi_in_devices[] = { 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 = { const device_t fluidsynth_device = {
"FluidSynth", .name = "FluidSynth",
"fluidsynth", .internal_name = "fluidsynth",
0, .flags = 0,
0, .local = 0,
fluidsynth_init, .init = fluidsynth_init,
fluidsynth_close, .close = fluidsynth_close,
NULL, .reset = NULL,
{ fluidsynth_available }, { .available = fluidsynth_available },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
fluidsynth_config .config = fluidsynth_config
}; };
#endif /*USE_FLUIDSYNTH*/ #endif /*USE_FLUIDSYNTH*/

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1425,29 +1425,29 @@ static const device_config_t azt2316a_config[] = {
}; };
const device_t azt2316a_device = { const device_t azt2316a_device = {
"Aztech Sound Galaxy Pro 16 AB (Washington)", .name = "Aztech Sound Galaxy Pro 16 AB (Washington)",
"azt2316a", .internal_name = "azt2316a",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
SB_SUBTYPE_CLONE_AZT2316A_0X11, .local = SB_SUBTYPE_CLONE_AZT2316A_0X11,
azt_init, .init = azt_init,
azt_close, .close = azt_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
azt_speed_changed, .speed_changed = azt_speed_changed,
NULL, .force_redraw = NULL,
azt2316a_config .config = azt2316a_config
}; };
const device_t azt1605_device = { const device_t azt1605_device = {
"Aztech Sound Galaxy Nova 16 Extra (Clinton)", .name = "Aztech Sound Galaxy Nova 16 Extra (Clinton)",
"azt1605", .internal_name = "azt1605",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
SB_SUBTYPE_CLONE_AZT1605_0X0C, .local = SB_SUBTYPE_CLONE_AZT1605_0X0C,
azt_init, .init = azt_init,
azt_close, .close = azt_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
azt_speed_changed, .speed_changed = azt_speed_changed,
NULL, .force_redraw = NULL,
azt1605_config .config = azt1605_config
}; };

View File

@@ -207,15 +207,15 @@ static const device_config_t cms_config[] = {
}; };
const device_t cms_device = { const device_t cms_device = {
"Creative Music System / Game Blaster", .name = "Creative Music System / Game Blaster",
"cms", .internal_name = "cms",
DEVICE_ISA, .flags = DEVICE_ISA,
0, .local = 0,
cms_init, .init = cms_init,
cms_close, .close = cms_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
cms_config .config = cms_config
}; };

View File

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

View File

@@ -1239,15 +1239,15 @@ static const device_config_t gus_config[] = {
}; };
const device_t gus_device = { const device_t gus_device = {
"Gravis UltraSound", .name = "Gravis UltraSound",
"gus", .internal_name = "gus",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
0, .local = 0,
gus_init, .init = gus_init,
gus_close, .close = gus_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
gus_speed_changed, .speed_changed = gus_speed_changed,
NULL, .force_redraw = NULL,
gus_config .config = gus_config
}; };

View File

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

View File

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

View File

@@ -1857,29 +1857,29 @@ static const device_config_t mpu401_standalone_mca_config[] = {
}; };
const device_t mpu401_device = { const device_t mpu401_device = {
"Roland MPU-IPC-T", .name = "Roland MPU-IPC-T",
"mpu401", .internal_name = "mpu401",
DEVICE_ISA, .flags = DEVICE_ISA,
0, .local = 0,
mpu401_standalone_init, .init = mpu401_standalone_init,
mpu401_standalone_close, .close = mpu401_standalone_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
mpu401_standalone_config .config = mpu401_standalone_config
}; };
const device_t mpu401_mca_device = { const device_t mpu401_mca_device = {
"Roland MPU-IMC", .name = "Roland MPU-IMC",
"mpu401_mca", .internal_name = "mpu401_mca",
DEVICE_MCA, .flags = DEVICE_MCA,
0, .local = 0,
mpu401_standalone_init, .init = mpu401_standalone_init,
mpu401_standalone_close, .close = mpu401_standalone_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
mpu401_standalone_mca_config .config = mpu401_standalone_mca_config
}; };

View File

@@ -743,15 +743,15 @@ pas16_close(void *p)
} }
const device_t pas16_device = { const device_t pas16_device = {
"Pro Audio Spectrum 16", .name = "Pro Audio Spectrum 16",
"pas16", .internal_name = "pas16",
DEVICE_ISA | DEVICE_NOT_WORKING, .flags = DEVICE_ISA | DEVICE_NOT_WORKING,
0, .local = 0,
pas16_init, .init = pas16_init,
pas16_close, .close = pas16_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
NULL .config = NULL
}; };

View File

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

View File

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

View File

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

View File

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

View File

@@ -108,15 +108,15 @@ static const device_config_t ssi2001_config[] = {
const device_t ssi2001_device = const device_t ssi2001_device =
{ {
"Innovation SSI-2001", .name = "Innovation SSI-2001",
"ssi2001", .internal_name = "ssi2001",
DEVICE_ISA, .flags = DEVICE_ISA,
0, .local = 0,
ssi2001_init, .init = ssi2001_init,
ssi2001_close, .close = ssi2001_close,
NULL, .reset = NULL,
{ NULL }, { .available = NULL },
NULL, .speed_changed = NULL,
NULL, .force_redraw = NULL,
ssi2001_config .config = ssi2001_config
}; };

View File

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