mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #6711 from MaxwellS04/Sortout

Browse Source 
Sound card list sortout + forgotten onboard change
This commit is contained in:
Miran Grča
2026-01-14 15:47:06 +01:00
committed by GitHub
parent 9185607907 857e5d99cc
commit 8752656949
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,8 +131,6 @@ extern const device_t ad1816_device;
/* Aztech Sound Galaxy 16 */
extern const device_t azt2316a_device;
extern const device_t acermagic_s20_device;
extern const device_t mirosound_pcm10_device;
extern const device_t azt1605_device;
extern const device_t aztpr16_device;
@@ -231,6 +229,8 @@ extern const device_t entertainer_device;
extern const device_t mmb_device;
/* OPTi 82c93x */
extern const device_t acermagic_s20_device;
extern const device_t mirosound_pcm10_device;
extern const device_t opti_82c930_device;
extern const device_t opti_82c931_device;

2
src/machine/m_pcjr.c
View File

@@ -848,7 +848,7 @@ static const device_config_t pcjr_config[] = {
};
const device_t pcjr_device = {
.name = "IBM PCjr",
.name = "IBM PCjr (Video)",
.internal_name = "pcjr",
.flags = 0,
.local = 0,

16
src/sound/sound.c
View File

@@ -123,12 +123,10 @@ static const SOUND_CARD sound_cards[] = {
{ &ess_ess0968_pnp_device },
{ &ssi2001_device },
{ &mmb_device },
#ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
{ &opl2board_device },
#endif
{ &pasplus_device },
{ &voicemasterkey_device },
{ &soundmasterplus_device },
{ &soundman_device },
{ &isadacr0_device },
{ &isadacr1_device },
{ &sb_1_device },
{ &sb_15_device },
{ &sb_2_device },
@@ -137,11 +135,13 @@ static const SOUND_CARD sound_cards[] = {
{ &entertainer_device },
{ &pssj_isa_device },
{ &tndy_device },
#ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
{ &opl2board_device },
#endif
/* ISA/Sidecar */
{ &adlib_device },
{ &soundmasterplus_device },
{ &voicemasterkey_device },
{ &isadacr0_device },
{ &isadacr1_device },
{ &soundman_device },
/* ISA16 */
{ &acermagic_s20_device },
{ &ad1816_device },