80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Make CS423x Sound Blaster Pro a generic compatibility device in preparation for VT82C686

Browse Source
This commit is contained in:
RichardG867
2021-07-18 19:03:01 -03:00
parent b2b2120d8f
commit dffca679c0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/sound.h
View File

@@ -110,7 +110,7 @@ extern const device_t sb_2_device;
extern const device_t sb_pro_v1_device; extern const device_t sb_pro_v1_device;
extern const device_t sb_pro_v2_device; extern const device_t sb_pro_v2_device;
extern const device_t sb_pro_mcv_device; extern const device_t sb_pro_mcv_device;
extern const device_t sb_pro_cs423x_device; extern const device_t sb_pro_compat_device;
extern const device_t sb_16_device; extern const device_t sb_16_device;
extern const device_t sb_16_pnp_device; extern const device_t sb_16_pnp_device;
extern const device_t sb_32_pnp_device; extern const device_t sb_32_pnp_device;

2
src/sound/snd_cs423x.c
View File

@@ -788,7 +788,7 @@ cs423x_init(const device_t *info)
/* Initialize SBPro codec first to get the correct CD audio filter for the default /* Initialize SBPro codec first to get the correct CD audio filter for the default
context, which is SBPro. The WSS codec is initialized later by cs423x_reset */ context, which is SBPro. The WSS codec is initialized later by cs423x_reset */
dev->sb = (sb_t *) device_add(&sb_pro_cs423x_device); dev->sb = device_add(&sb_pro_compat_device);
/* Initialize RAM, registers and WSS codec. */ /* Initialize RAM, registers and WSS codec. */
cs423x_reset(dev); cs423x_reset(dev);

10
src/sound/snd_sb.c
View File

@@ -1625,12 +1625,12 @@ sb_pro_mcv_init(const device_t *info)
static void * static void *
sb_pro_cs423x_init(const device_t *info) sb_pro_compat_init(const device_t *info)
{ {
sb_t *sb = malloc(sizeof(sb_t)); sb_t *sb = malloc(sizeof(sb_t));
memset(sb, 0, sizeof(sb_t)); memset(sb, 0, sizeof(sb_t));
sb->opl_enabled = 0; /* updated by cs423x code */ sb->opl_enabled = 0; /* CS423x updates this, while VT82C686 lacks OPL */
opl3_init(&sb->opl); opl3_init(&sb->opl);
sb_dsp_init(&sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, sb); sb_dsp_init(&sb->dsp, SBPRO2, SB_SUBTYPE_DEFAULT, sb);
@@ -2534,12 +2534,12 @@ const device_t sb_pro_mcv_device =
NULL NULL
}; };
const device_t sb_pro_cs423x_device = const device_t sb_pro_compat_device =
{ {
"Crystal CS423x Sound Blaster Pro compatibility", "Sound Blaster Pro (Compatibility)",
DEVICE_ISA | DEVICE_AT, DEVICE_ISA | DEVICE_AT,
0, 0,
sb_pro_cs423x_init, sb_close, NULL, { NULL }, sb_pro_compat_init, sb_close, NULL, { NULL },
sb_speed_changed, sb_speed_changed,
NULL, NULL,
NULL NULL