claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CS423x: Add on-board CS4236 to the VS440FX

Browse Source
This commit is contained in:
RichardG867
2025-02-07 20:44:21 -03:00
parent bc5d2a425e
commit b7f7975054
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,6 +170,7 @@ extern const device_t sb_awe64_gold_device;
/* Crystal CS423x */ /* Crystal CS423x */
extern const device_t cs4235_device; extern const device_t cs4235_device;
extern const device_t cs4235_onboard_device; extern const device_t cs4235_onboard_device;
extern const device_t cs4236_onboard_device;
extern const device_t cs4236b_device; extern const device_t cs4236b_device;
extern const device_t cs4237b_device; extern const device_t cs4237b_device;
extern const device_t cs4238b_device; extern const device_t cs4238b_device;

6
src/machine/m_at_socket8.c
View File

@@ -256,6 +256,9 @@ machine_at_vs440fx_init(const machine_t *model)
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
if (sound_card_current[0] == SOUND_INTERNAL)
device_add(machine_get_snd_device(machine));
return ret; return ret;
} }
@@ -290,6 +293,9 @@ machine_at_gw2kvenus_init(const machine_t *model)
device_add(&intel_flash_bxt_ami_device); device_add(&intel_flash_bxt_ami_device);
if (sound_card_current[0] == SOUND_INTERNAL)
device_add(machine_get_snd_device(machine));
return ret; return ret;
} }

8
src/machine/machine_table.c
View File

@@ -14072,7 +14072,7 @@ const machine_t machines[] = {
.max_multi = 3.5 .max_multi = 3.5
}, },
.bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 524288, .max = 524288,
@@ -14087,7 +14087,7 @@ const machine_t machines[] = {
.fdc_device = NULL, .fdc_device = NULL,
.sio_device = NULL, .sio_device = NULL,
.vid_device = NULL, .vid_device = NULL,
.snd_device = NULL, .snd_device = &cs4236_onboard_device,
.net_device = NULL .net_device = NULL
}, },
/* Has the AMIKey-2 (updated 'H') KBC firmware. */ /* Has the AMIKey-2 (updated 'H') KBC firmware. */
@@ -14196,7 +14196,7 @@ const machine_t machines[] = {
.max_multi = 3.5 .max_multi = 3.5
}, },
.bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_GAMEPORT | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 524288, .max = 524288,
@@ -14211,7 +14211,7 @@ const machine_t machines[] = {
.fdc_device = NULL, .fdc_device = NULL,
.sio_device = NULL, .sio_device = NULL,
.vid_device = NULL, .vid_device = NULL,
.snd_device = NULL, .snd_device = &cs4236_onboard_device,
.net_device = NULL .net_device = NULL
}, },
/* Has the AMIKey-2 (updated 'H') KBC firmware. */ /* Has the AMIKey-2 (updated 'H') KBC firmware. */

16
src/sound/snd_cs423x.c
View File

@@ -259,7 +259,7 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
break; break;
case 3: /* Control Indirect Access Register (CS4236B+) */ case 3: /* Control Indirect Access Register (CS4236B+) */
if (dev->type < CRYSTAL_CS4236B) if (dev->type < CRYSTAL_CS4236) /* must be writable on CS4236 for the aforementioned VS440FX BIOS check */
return; return;
val &= 0x0f; val &= 0x0f;
break; break;
@@ -1089,6 +1089,20 @@ const device_t cs4235_onboard_device = {
.config = NULL .config = NULL
}; };
const device_t cs4236_onboard_device = {
.name = "Crystal CS4236 (On-Board)",
.internal_name = "cs4236_onboard",
.flags = DEVICE_ISA | DEVICE_AT,
.local = CRYSTAL_CS4236 | CRYSTAL_NOEEPROM,
.init = cs423x_init,
.close = cs423x_close,
.reset = cs423x_reset,
.available = cs423x_available,
.speed_changed = cs423x_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t cs4236b_device = { const device_t cs4236b_device = {
.name = "Crystal CS4236B", .name = "Crystal CS4236B",
.internal_name = "cs4236b", .internal_name = "cs4236b",