Removed the legacy #defines in device.h.
This commit is contained in:
@@ -1557,7 +1557,7 @@ static const device_config_t azt2316a_config[] = {
|
||||
const device_t azt2316a_device = {
|
||||
.name = "Aztech Sound Galaxy Pro 16 AB (Washington)",
|
||||
.internal_name = "azt2316a",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_SUBTYPE_CLONE_AZT2316A_0X11,
|
||||
.init = azt_init,
|
||||
.close = azt_close,
|
||||
@@ -1571,7 +1571,7 @@ const device_t azt2316a_device = {
|
||||
const device_t azt1605_device = {
|
||||
.name = "Aztech Sound Galaxy Nova 16 Extra (Clinton)",
|
||||
.internal_name = "azt1605",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_SUBTYPE_CLONE_AZT1605_0X0C,
|
||||
.init = azt_init,
|
||||
.close = azt_close,
|
||||
|
||||
@@ -1061,7 +1061,7 @@ cs423x_speed_changed(void *priv)
|
||||
const device_t cs4235_device = {
|
||||
.name = "Crystal CS4235",
|
||||
.internal_name = "cs4235",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4235,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1075,7 +1075,7 @@ const device_t cs4235_device = {
|
||||
const device_t cs4235_onboard_device = {
|
||||
.name = "Crystal CS4235 (On-Board)",
|
||||
.internal_name = "cs4235_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4235 | CRYSTAL_NOEEPROM,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1089,7 +1089,7 @@ const device_t cs4235_onboard_device = {
|
||||
const device_t cs4236_onboard_device = {
|
||||
.name = "Crystal CS4236 (On-Board)",
|
||||
.internal_name = "cs4236_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4236 | CRYSTAL_NOEEPROM,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1103,7 +1103,7 @@ const device_t cs4236_onboard_device = {
|
||||
const device_t cs4236b_device = {
|
||||
.name = "Crystal CS4236B",
|
||||
.internal_name = "cs4236b",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4236B,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1117,7 +1117,7 @@ const device_t cs4236b_device = {
|
||||
const device_t cs4236b_onboard_device = {
|
||||
.name = "Crystal CS4236B",
|
||||
.internal_name = "cs4236b",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4236B | CRYSTAL_NOEEPROM,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1131,7 +1131,7 @@ const device_t cs4236b_onboard_device = {
|
||||
const device_t cs4237b_device = {
|
||||
.name = "Crystal CS4237B",
|
||||
.internal_name = "cs4237b",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4237B,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
@@ -1145,7 +1145,7 @@ const device_t cs4237b_device = {
|
||||
const device_t cs4238b_device = {
|
||||
.name = "Crystal CS4238B",
|
||||
.internal_name = "cs4238b",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = CRYSTAL_CS4238B,
|
||||
.init = cs423x_init,
|
||||
.close = cs423x_close,
|
||||
|
||||
@@ -1500,7 +1500,7 @@ static const device_config_t gus_config[] = {
|
||||
const device_t gus_device = {
|
||||
.name = "Gravis UltraSound",
|
||||
.internal_name = "gus",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = gus_init,
|
||||
.close = gus_close,
|
||||
|
||||
@@ -484,7 +484,7 @@ static const device_config_t optimc_config[] = {
|
||||
const device_t acermagic_s20_device = {
|
||||
.name = "AcerMagic S20",
|
||||
.internal_name = "acermagic_s20",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0xE3 | OPTIMC_CS4231,
|
||||
.init = optimc_init,
|
||||
.close = optimc_close,
|
||||
@@ -498,7 +498,7 @@ const device_t acermagic_s20_device = {
|
||||
const device_t mirosound_pcm10_device = {
|
||||
.name = "miroSOUND PCM10",
|
||||
.internal_name = "mirosound_pcm10",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0xE3 | OPTIMC_OPL4,
|
||||
.init = optimc_init,
|
||||
.close = optimc_close,
|
||||
|
||||
@@ -2453,7 +2453,7 @@ const device_t pasplus_device = {
|
||||
const device_t pas16_device = {
|
||||
.name = "Pro Audio Spectrum 16",
|
||||
.internal_name = "pas16",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0x0f,
|
||||
.init = pas16_init,
|
||||
.close = pas16_close,
|
||||
@@ -2467,7 +2467,7 @@ const device_t pas16_device = {
|
||||
const device_t pas16d_device = {
|
||||
.name = "Pro Audio Spectrum 16D",
|
||||
.internal_name = "pas16d",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0x0c,
|
||||
.init = pas16_init,
|
||||
.close = pas16_close,
|
||||
|
||||
@@ -5476,7 +5476,7 @@ const device_t sb_pro_mcv_device = {
|
||||
const device_t sb_pro_compat_device = {
|
||||
.name = "Sound Blaster Pro (Compatibility)",
|
||||
.internal_name = "sbpro_compat",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = sb_pro_compat_init,
|
||||
.close = sb_close,
|
||||
@@ -5490,7 +5490,7 @@ const device_t sb_pro_compat_device = {
|
||||
const device_t sb_16_device = {
|
||||
.name = "Sound Blaster 16",
|
||||
.internal_name = "sb16",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = FM_YMF262,
|
||||
.init = sb_16_init,
|
||||
.close = sb_close,
|
||||
@@ -5504,7 +5504,7 @@ const device_t sb_16_device = {
|
||||
const device_t sb_vibra16c_onboard_device = {
|
||||
.name = "Sound Blaster ViBRA 16C (On-Board)",
|
||||
.internal_name = "sb_vibra16c_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16C,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5518,7 +5518,7 @@ const device_t sb_vibra16c_onboard_device = {
|
||||
const device_t sb_vibra16c_device = {
|
||||
.name = "Sound Blaster ViBRA 16C",
|
||||
.internal_name = "sb_vibra16c",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16C,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5532,7 +5532,7 @@ const device_t sb_vibra16c_device = {
|
||||
const device_t sb_vibra16cl_onboard_device = {
|
||||
.name = "Sound Blaster ViBRA 16CL (On-Board)",
|
||||
.internal_name = "sb_vibra16cl_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16CL,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5546,7 +5546,7 @@ const device_t sb_vibra16cl_onboard_device = {
|
||||
const device_t sb_vibra16cl_device = {
|
||||
.name = "Sound Blaster ViBRA 16CL",
|
||||
.internal_name = "sb_vibra16cl",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16CL,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5560,7 +5560,7 @@ const device_t sb_vibra16cl_device = {
|
||||
const device_t sb_vibra16s_onboard_device = {
|
||||
.name = "Sound Blaster ViBRA 16S (On-Board)",
|
||||
.internal_name = "sb_vibra16s_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = FM_YMF289B,
|
||||
.init = sb_16_init,
|
||||
.close = sb_close,
|
||||
@@ -5574,7 +5574,7 @@ const device_t sb_vibra16s_onboard_device = {
|
||||
const device_t sb_vibra16s_device = {
|
||||
.name = "Sound Blaster ViBRA 16S",
|
||||
.internal_name = "sb_vibra16s",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = FM_YMF289B,
|
||||
.init = sb_16_init,
|
||||
.close = sb_close,
|
||||
@@ -5588,7 +5588,7 @@ const device_t sb_vibra16s_device = {
|
||||
const device_t sb_vibra16xv_onboard_device = {
|
||||
.name = "Sound Blaster ViBRA 16XV (On-Board)",
|
||||
.internal_name = "sb_vibra16xv_onboard",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16XV,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5602,7 +5602,7 @@ const device_t sb_vibra16xv_onboard_device = {
|
||||
const device_t sb_vibra16xv_device = {
|
||||
.name = "Sound Blaster ViBRA 16XV",
|
||||
.internal_name = "sb_vibra16xv",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_VIBRA16XV,
|
||||
.init = sb_vibra16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5630,7 +5630,7 @@ const device_t sb_16_reply_mca_device = {
|
||||
const device_t sb_16_pnp_device = {
|
||||
.name = "Sound Blaster 16 PnP",
|
||||
.internal_name = "sb16_pnp",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_16_PNP_NOIDE,
|
||||
.init = sb_16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5644,7 +5644,7 @@ const device_t sb_16_pnp_device = {
|
||||
const device_t sb_16_pnp_ide_device = {
|
||||
.name = "Sound Blaster 16 PnP (IDE)",
|
||||
.internal_name = "sb16_pnp_ide",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_16_PNP_IDE,
|
||||
.init = sb_16_pnp_init,
|
||||
.close = sb_close,
|
||||
@@ -5658,7 +5658,7 @@ const device_t sb_16_pnp_ide_device = {
|
||||
const device_t sb_16_compat_device = {
|
||||
.name = "Sound Blaster 16 (Compatibility)",
|
||||
.internal_name = "sb16_compat",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 1,
|
||||
.init = sb_16_compat_init,
|
||||
.close = sb_close,
|
||||
@@ -5672,7 +5672,7 @@ const device_t sb_16_compat_device = {
|
||||
const device_t sb_16_compat_nompu_device = {
|
||||
.name = "Sound Blaster 16 (Compatibility - MPU-401 Off)",
|
||||
.internal_name = "sb16_compat",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = sb_16_compat_init,
|
||||
.close = sb_close,
|
||||
@@ -5686,7 +5686,7 @@ const device_t sb_16_compat_nompu_device = {
|
||||
const device_t sb_goldfinch_device = {
|
||||
.name = "Creative EMU8000 PnP (Goldfinch)",
|
||||
.internal_name = "sb_goldfinch",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = sb_goldfinch_init,
|
||||
.close = sb_goldfinch_close,
|
||||
@@ -5700,7 +5700,7 @@ const device_t sb_goldfinch_device = {
|
||||
const device_t sb_32_pnp_device = {
|
||||
.name = "Sound Blaster 32 PnP",
|
||||
.internal_name = "sb32_pnp",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_32_PNP,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5714,7 +5714,7 @@ const device_t sb_32_pnp_device = {
|
||||
const device_t sb_awe32_device = {
|
||||
.name = "Sound Blaster AWE32",
|
||||
.internal_name = "sbawe32",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = sb_awe32_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5728,7 +5728,7 @@ const device_t sb_awe32_device = {
|
||||
const device_t sb_awe32_pnp_device = {
|
||||
.name = "Sound Blaster AWE32 PnP",
|
||||
.internal_name = "sbawe32_pnp",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_AWE32_PNP,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5742,7 +5742,7 @@ const device_t sb_awe32_pnp_device = {
|
||||
const device_t sb_awe64_value_device = {
|
||||
.name = "Sound Blaster AWE64 Value",
|
||||
.internal_name = "sbawe64_value",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_AWE64_VALUE,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5756,7 +5756,7 @@ const device_t sb_awe64_value_device = {
|
||||
const device_t sb_awe64_device = {
|
||||
.name = "Sound Blaster AWE64",
|
||||
.internal_name = "sbawe64",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_AWE64_NOIDE,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5770,7 +5770,7 @@ const device_t sb_awe64_device = {
|
||||
const device_t sb_awe64_ide_device = {
|
||||
.name = "Sound Blaster AWE64 (IDE)",
|
||||
.internal_name = "sbawe64_ide",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_AWE64_IDE,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
@@ -5784,7 +5784,7 @@ const device_t sb_awe64_ide_device = {
|
||||
const device_t sb_awe64_gold_device = {
|
||||
.name = "Sound Blaster AWE64 Gold",
|
||||
.internal_name = "sbawe64_gold",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = SB_AWE64_GOLD,
|
||||
.init = sb_awe32_pnp_init,
|
||||
.close = sb_awe32_close,
|
||||
|
||||
@@ -279,7 +279,7 @@ static const device_config_t wss_config[] = {
|
||||
const device_t wss_device = {
|
||||
.name = "Windows Sound System",
|
||||
.internal_name = "wss",
|
||||
.flags = DEVICE_ISA | DEVICE_AT,
|
||||
.flags = DEVICE_ISA16,
|
||||
.local = 0,
|
||||
.init = wss_init,
|
||||
.close = wss_close,
|
||||
|
||||
Reference in New Issue
Block a user