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

WARNING: CONFIGS MIGHT PARTIALLY BREAK WHERE DEVICE NAMES HAVE CHANGED.

Browse Source 
Changes to device_t struct to accomodate the upcoming PCI IRQ arbitration rewrite;
Added device.c/h API to obtain name from the device_t struct;
Significant changes to win/win_settings.c to clean up the code a bit and fix bugs;
Ported all the CPU and AudioPCI commits from PCem;
Added an API call to allow ACPI soft power off to gracefully stop the emulator;
Removed the Siemens PCD-2L from the Dev branch because it now works;
Removed the Socket 5 HP Vectra from the Dev branch because it now works;
Fixed the Compaq Presario and the Micronics Spitfire;
Give the IBM PC330 its own list of 486 CPU so it can have DX2's with CPUID 0x470;
SMM fixes;
Rewrote the SYSENTER, SYSEXIT, SYSCALL, and SYSRET instructions;
Changed IDE reset period to match the specification, fixes #929;
The keyboard input and output ports are now forced in front of the queue when read, fixes a number of bugs, including the AMI Apollo hanging on soft reset;
Added the Intel AN430TX but Dev branched because it does not work;
The network code no longer drops packets if the emulated network card has failed to receive them (eg. when the buffer is full);
Changes to PCI card adding and renamed some PCI slot types, also added proper AGP bridge slot types;
USB UHCI emulation is no longer a stub (still doesn't fully work, but at least Windows XP chk with Debug no longer ASSERT's on it);
Fixed NVR on the the SMC FDC37C932QF and APM variants;
A number of fixes to Intel 4x0 chipsets, including fixing every register of the 440LX and 440EX;
Some ACPI changes.
This commit is contained in:
OBattler
2020-11-16 00:01:21 +01:00
parent 745460f64b
commit 0faf6692c9
260 changed files with 5122 additions and 4471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/sound/sound.c
View File

@@ -41,7 +41,6 @@
typedef struct {
const char *name;
const char *internal_name;
const device_t *device;
} SOUND_CARD;
@@ -83,30 +82,29 @@ static void *filter_cd_audio_p = NULL;
static const SOUND_CARD sound_cards[] =
{
{ "None", "none", NULL },
{ "Internal", "internal", NULL },
{ "[ISA] Adlib", "adlib", &adlib_device },
{ "[ISA] Adlib Gold", "adlibgold", &adgold_device },
{ "[ISA] Aztech Sound Galaxy Pro 16 AB (Washington)", "azt2316a", &azt2316a_device },
{ "[ISA] Aztech Sound Galaxy Nova 16 Extra (Clinton)", "azt1605", &azt1605_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 },
{ "none", NULL },
{ "internal", NULL },
{ "adlib", &adlib_device },
{ "adlibgold", &adgold_device },
{ "azt2316a", &azt2316a_device },
{ "azt1605", &azt1605_device },
{ "sb", &sb_1_device },
{ "sb1.5", &sb_15_device },
{ "sb2.0", &sb_2_device },
{ "sbprov1", &sb_pro_v1_device },
{ "sbprov2", &sb_pro_v2_device },
{ "sb16", &sb_16_device },
{ "sbawe32", &sb_awe32_device },
#if defined(DEV_BRANCH) && defined(USE_PAS16)
{ "[ISA] Pro Audio Spectrum 16", "pas16", &pas16_device },
{ "pas16", &pas16_device },
#endif
{ "[ISA] Windows Sound System", "wss", &wss_device },
{ "[MCA] Adlib", "adlib_mca", &adlib_mca_device },
{ "[MCA] NCR Business Audio", "ncraudio", &ncr_business_audio_device },
{ "[MCA] Sound Blaster MCV", "sbmcv", &sb_mcv_device },
{ "[MCA] Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device },
{ "[PCI] Ensoniq AudioPCI (ES1371)", "es1371", &es1371_device },
{ "[PCI] Sound Blaster PCI 128", "sbpci128", &es1371_device },
{ "", "", NULL }
{ "wss", &wss_device },
{ "adlib_mca", &adlib_mca_device },
{ "ncraudio", &ncr_business_audio_device },
{ "sbmcv", &sb_mcv_device },
{ "sbpromcv", &sb_pro_mcv_device },
{ "es1371", &es1371_device },
{ "", NULL }
};
@@ -140,13 +138,6 @@ sound_card_available(int card)
}
char *
sound_card_getname(int card)
{
return (char *) sound_cards[card].name;
}
const device_t *
sound_card_getdevice(int card)
{