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

Merge pull request #1588 from 86Box/master

Browse Source 
Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-08-05 16:38:33 +02:00
committed by GitHub
parent 6519581d59 6f639cd866
commit 5b867e6a32
8 changed files with 254 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/resource.h
View File

@@ -163,6 +163,7 @@
#define IDC_CHECK_FLOAT 1048
#define IDC_CONFIGURE_GUS 1049
#define IDC_COMBO_MIDI_IN 1050
#define IDC_CONFIGURE_CMS 1051
#define IDC_COMBO_NET_TYPE 1060 /* network config */
#define IDC_COMBO_PCAP 1061
@@ -309,6 +310,7 @@
#define IDM_CONFIG 40020
#define IDM_VID_HIDE_STATUS_BAR 40021
#define IDM_UPDATE_ICONS 40030
#define IDM_SND_GAIN 40031
#define IDM_VID_RESIZE 40040
#define IDM_VID_REMEMBER 40041
#define IDM_VID_SDL_SW 40050

35
src/include/86box/snd_cms.h Normal file
View File

@@ -0,0 +1,35 @@
#ifndef SOUND_SND_CMS_H
# define SOUND_SND_CMS_H
#include <stdint.h>
#include <86box/sound.h>
#define MASTER_CLOCK 7159090
typedef struct cms_t
{
int addrs[2];
uint8_t regs[2][32];
uint16_t latch[2][6];
int freq[2][6];
float count[2][6];
int vol[2][6][2];
int stat[2][6];
uint16_t noise[2][2];
uint16_t noisefreq[2][2];
int noisecount[2][2];
int noisetype[2][2];
uint8_t latched_data;
int16_t buffer[SOUNDBUFLEN * 2];
int pos;
} cms_t;
extern void cms_update(cms_t *cms);
extern void cms_write(uint16_t addr, uint8_t val, void *p);
extern uint8_t cms_read(uint16_t addr, void *p);
#endif /*SOUND_SND_CMS_H*/

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

@@ -22,6 +22,7 @@
#include <86box/snd_mpu401.h>
#include <86box/snd_opl.h>
#include <86box/snd_sb_dsp.h>
#include <86box/snd_cms.h>
#define SADLIB 1 /* No DSP */
#define SB1 2 /* DSP v1.05 */
@@ -111,7 +112,8 @@ typedef struct sb_ct1745_mixer_t
typedef struct sb_t
{
uint8_t opl_enabled, mixer_enabled;
uint8_t cms_enabled, opl_enabled, mixer_enabled;
cms_t cms;
opl_t opl, opl2;
sb_dsp_t dsp;
union {