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

Merge pull request #1767 from Ompronce/master

Browse Source 
Prevent the selection of certain sound cards on machines without ISA or ISA16
This commit is contained in:
Miran Grča
2021-10-26 01:58:55 +02:00
committed by GitHub
parent a6ac798ee8 6b9802f0d9
commit 10c571c6c6
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sound/snd_cms.c
View File

@@ -207,7 +207,7 @@ static const device_config_t cms_config[] =
const device_t cms_device = const device_t cms_device =
{ {
"Creative Music System / Game Blaster", "Creative Music System / Game Blaster",
0, 0, DEVICE_ISA, 0,
cms_init, cms_close, NULL, cms_init, cms_close, NULL,
{ NULL }, NULL, NULL, { NULL }, NULL, NULL,
cms_config cms_config

2
src/sound/snd_gus.c
View File

@@ -1315,7 +1315,7 @@ static const device_config_t gus_config[] = {
const device_t gus_device = const device_t gus_device =
{ {
"Gravis UltraSound", "Gravis UltraSound",
DEVICE_ISA, DEVICE_ISA | DEVICE_AT,
0, 0,
gus_init, gus_close, NULL, gus_init, gus_close, NULL,
{ NULL }, { NULL },

2
src/sound/snd_ssi2001.c
View File

@@ -118,7 +118,7 @@ static const device_config_t ssi2001_config[] =
const device_t ssi2001_device = const device_t ssi2001_device =
{ {
"Innovation SSI-2001", "Innovation SSI-2001",
0, 0, DEVICE_ISA, 0,
ssi2001_init, ssi2001_close, NULL, ssi2001_init, ssi2001_close, NULL,
{ NULL }, NULL, NULL, { NULL }, NULL, NULL,
ssi2001_config ssi2001_config

9
src/win/win_settings.c
View File

@@ -1380,12 +1380,15 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401); settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow()); settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401); settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_CMS, (machines[temp_machine].flags & MACHINE_BUS_ISA));
settings_set_check(hdlg, IDC_CHECK_CMS, temp_GAMEBLASTER); settings_set_check(hdlg, IDC_CHECK_CMS, temp_GAMEBLASTER);
settings_enable_window(hdlg, IDC_CONFIGURE_CMS, temp_GAMEBLASTER); settings_enable_window(hdlg, IDC_CONFIGURE_CMS, (machines[temp_machine].flags & MACHINE_BUS_ISA) && temp_GAMEBLASTER);
settings_enable_window(hdlg, IDC_CHECK_GUS, (machines[temp_machine].flags & MACHINE_BUS_ISA16));
settings_set_check(hdlg, IDC_CHECK_GUS, temp_GUS); settings_set_check(hdlg, IDC_CHECK_GUS, temp_GUS);
settings_enable_window(hdlg, IDC_CONFIGURE_GUS, temp_GUS); settings_enable_window(hdlg, IDC_CONFIGURE_GUS, (machines[temp_machine].flags & MACHINE_BUS_ISA16) && temp_GUS);
settings_enable_window(hdlg, IDC_CHECK_SSI, (machines[temp_machine].flags & MACHINE_BUS_ISA));
settings_set_check(hdlg, IDC_CHECK_SSI, temp_SSI2001); settings_set_check(hdlg, IDC_CHECK_SSI, temp_SSI2001);
settings_enable_window(hdlg, IDC_CONFIGURE_SSI, temp_SSI2001); settings_enable_window(hdlg, IDC_CONFIGURE_SSI, (machines[temp_machine].flags & MACHINE_BUS_ISA) && temp_SSI2001);
settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float); settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float);
free(lptsTemp); free(lptsTemp);