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

All devices now have the bus marked in their name;

Browse Source 
The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.
This commit is contained in:
OBattler
2017-10-10 00:14:15 +02:00
parent efc129eb22
commit 253ad40376
55 changed files with 852 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sound/snd_adlib.c
View File

@@ -97,7 +97,7 @@ void adlib_close(void *p)
device_t adlib_device =
{
"AdLib",
0,
DEVICE_ISA,
0,
adlib_init, adlib_close, NULL,
NULL, NULL, NULL, NULL,

2
src/sound/snd_adlibgold.c
View File

@@ -840,7 +840,7 @@ static device_config_t adgold_config[] =
device_t adgold_device =
{
"AdLib Gold",
0, 0,
DEVICE_ISA, 0,
adgold_init,
adgold_close,
NULL,

2
src/sound/snd_pas16.c
View File

@@ -746,7 +746,7 @@ static void pas16_close(void *p)
device_t pas16_device =
{
"Pro Audio Spectrum 16",
DEVICE_NOT_WORKING,
DEVICE_ISA | DEVICE_NOT_WORKING,
0,
pas16_init, pas16_close, NULL,
NULL, NULL, NULL, NULL,

14
src/sound/snd_sb.c
View File

@@ -1211,7 +1211,7 @@ static device_config_t sb_awe32_config[] =
device_t sb_1_device =
{
"Sound Blaster v1.0",
0,
DEVICE_ISA,
0,
sb_1_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1222,7 +1222,7 @@ device_t sb_1_device =
device_t sb_15_device =
{
"Sound Blaster v1.5",
0,
DEVICE_ISA,
0,
sb_15_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1244,7 +1244,7 @@ device_t sb_mcv_device =
device_t sb_2_device =
{
"Sound Blaster v2.0",
0,
DEVICE_ISA,
0,
sb_2_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1255,7 +1255,7 @@ device_t sb_2_device =
device_t sb_pro_v1_device =
{
"Sound Blaster Pro v1",
0,
DEVICE_ISA,
0,
sb_pro_v1_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1266,7 +1266,7 @@ device_t sb_pro_v1_device =
device_t sb_pro_v2_device =
{
"Sound Blaster Pro v2",
0,
DEVICE_ISA,
0,
sb_pro_v2_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1288,7 +1288,7 @@ device_t sb_pro_mcv_device =
device_t sb_16_device =
{
"Sound Blaster 16",
0,
DEVICE_ISA,
0,
sb_16_init, sb_close, NULL, NULL,
sb_speed_changed,
@@ -1299,7 +1299,7 @@ device_t sb_16_device =
device_t sb_awe32_device =
{
"Sound Blaster AWE32",
0,
DEVICE_ISA,
0,
sb_awe32_init, sb_close, NULL,
sb_awe32_available,

2
src/sound/snd_wss.c
View File

@@ -115,7 +115,7 @@ void wss_speed_changed(void *p)
device_t wss_device =
{
"Windows Sound System",
0, 0,
DEVICE_ISA, 0,
wss_init, wss_close, NULL,
NULL,
wss_speed_changed,

30
src/sound/sound.c
View File

@@ -54,25 +54,25 @@ typedef struct
static SOUND_CARD sound_cards[] =
{
{ "None", "none", NULL },
{ "Adlib", "adlib", &adlib_device },
{ "Adlib MCA", "adlib_mca", &adlib_mca_device },
{ "Sound Blaster 1.0", "sb", &sb_1_device },
{ "Sound Blaster 1.5", "sb1.5", &sb_15_device },
{ "Sound Blaster MCV", "sbmcv", &sb_mcv_device },
{ "Sound Blaster 2.0", "sb2.0", &sb_2_device },
{ "Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device },
{ "Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device },
{ "Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device },
{ "Sound Blaster 16", "sb16", &sb_16_device },
{ "Sound Blaster AWE32", "sbawe32", &sb_awe32_device },
{ "Adlib Gold", "adlibgold", &adgold_device },
{ "Windows Sound System", "wss", &wss_device },
{ "None", "none", NULL },
{ "[ISA] Adlib", "adlib", &adlib_device },
{ "[ISA] Adlib Gold", "adlibgold",&adgold_device },
{ "[ISA] Sound Blaster 1.0", "sb", &sb_1_device },
{ "[ISA] Sound Blaster 1.5", "sb1.5", &sb_15_device },
{ "[ISA] Sound Blaster 2.0", "sb2.0", &sb_2_device },
{ "[ISA] Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device },
{ "[ISA] Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device },
{ "[ISA] Sound Blaster 16", "sb16", &sb_16_device },
{ "[ISA] Sound Blaster AWE32", "sbawe32", &sb_awe32_device },
#ifdef DEV_BRANCH
#ifdef USE_PAS16
{ "Pro Audio Spectrum 16", "pas16", &pas16_device },
{ "[ISA] Pro Audio Spectrum 16","pas16", &pas16_device },
#endif
#endif
{ "[ISA] Windows Sound System", "wss", &wss_device },
{ "[MCA] Adlib", "adlib_mca", &adlib_mca_device },
{ "[MCA] Sound Blaster MCV","sbmcv", &sb_mcv_device },
{ "[MCA] Sound Blaster Pro MCV","sbpromcv", &sb_pro_mcv_device },
{ "", "", NULL }
};