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

Merge pull request #767 from richardg867/master

Browse Source 
Onboard sound support + onboard ES1371 for Tsunami ATX
This commit is contained in:
OBattler
2020-05-21 04:30:10 +02:00
committed by GitHub
parent b27c1c0bee f781d611ac
commit 17479d24ee
9 changed files with 83 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/include/86box/machine.h
View File

@@ -38,7 +38,8 @@
#define MACHINE_VIDEO 0x002000 /* sys has int video */
#define MACHINE_VIDEO_FIXED 0x004000 /* sys has ONLY int video */
#define MACHINE_MOUSE 0x008000 /* sys has int mouse */
#define MACHINE_NONMI 0x010000 /* sys does not have NMI's */
#define MACHINE_SOUND 0x010000 /* sys has int sound */
#define MACHINE_NONMI 0x020000 /* sys does not have NMI's */
#else
#define MACHINE_PC 0x000000 /* PC architecture */
#define MACHINE_AT 0x000001 /* PC/AT architecture */
@@ -54,7 +55,8 @@
#define MACHINE_VIDEO 0x002000 /* sys has int video */
#define MACHINE_VIDEO_FIXED 0x004000 /* sys has ONLY int video */
#define MACHINE_MOUSE 0x008000 /* sys has int mouse */
#define MACHINE_NONMI 0x010000 /* sys does not have NMI's */
#define MACHINE_SOUND 0x010000 /* sys has int sound */
#define MACHINE_NONMI 0x020000 /* sys does not have NMI's */
#endif
#define IS_ARCH(m, a) (machines[(m)].flags & (a)) ? 1 : 0;
@@ -347,6 +349,12 @@ extern int machine_at_tsunamiatx_init(const machine_t *);
#endif
extern int machine_at_p6sba_init(const machine_t *);
#ifdef EMU_DEVICE_H
#if defined(DEV_BRANCH) && defined(NO_SIO)
extern const device_t *at_tsunamiatx_get_device(void);
#endif
#endif
/* m_at_slot2.c */
#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_s2dge_init(const machine_t *);

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

@@ -51,6 +51,7 @@ enum {
PCI_CARD_NORMAL,
PCI_CARD_ONBOARD,
PCI_CARD_SCSI,
PCI_CARD_SOUND,
PCI_CARD_SPECIAL
};
@@ -59,7 +60,8 @@ enum {
PCI_ADD_SOUTHBRIDGE,
PCI_ADD_NORMAL,
PCI_ADD_VIDEO,
PCI_ADD_SCSI
PCI_ADD_SCSI,
PCI_ADD_SOUND
};
typedef union {

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

@@ -28,6 +28,12 @@ extern int sound_gain;
#define CD_BUFLEN (CD_FREQ / 10)
enum {
SOUND_NONE = 0,
SOUND_INTERNAL
};
extern int ppispeakon;
extern int gated,
speakval,
@@ -79,6 +85,7 @@ extern const device_t azt1605_device;
/* Ensoniq AudioPCI */
extern const device_t es1371_device;
extern const device_t es1371_onboard_device;
/* Creative Labs Game Blaster */
extern const device_t cms_device;