openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio: Remove UINT8 

uint8_t has existed since ..... all this century?

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-6-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-26 00:37:18 +02:00 committed by Gerd Hoffmann
parent 882ab9d615
commit 4a796e979e
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/audio/fmopl.c
View File

@ -789,8 +789,8 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
} }
else else
{ /* set IRQ mask ,timer enable*/ { /* set IRQ mask ,timer enable*/
UINT8 st1 = v&1; uint8_t st1 = v&1;
UINT8 st2 = (v>>1)&1; uint8_t st2 = (v>>1)&1;
/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
OPL_STATUS_RESET(OPL,v&0x78); OPL_STATUS_RESET(OPL,v&0x78);
OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01); OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01);
@ -838,7 +838,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
case 0xbd: case 0xbd:
/* amsep,vibdep,r,bd,sd,tom,tc,hh */ /* amsep,vibdep,r,bd,sd,tom,tc,hh */
{ {
UINT8 rkey = OPL->rhythm^v; uint8_t rkey = OPL->rhythm^v;
OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0]; OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0];
OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0]; OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0];
OPL->rhythm = v&0x3f; OPL->rhythm = v&0x3f;
@ -991,7 +991,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
OPLSAMPLE *buf = buffer; OPLSAMPLE *buf = buffer;
UINT32 amsCnt = OPL->amsCnt; UINT32 amsCnt = OPL->amsCnt;
UINT32 vibCnt = OPL->vibCnt; UINT32 vibCnt = OPL->vibCnt;
UINT8 rhythm = OPL->rhythm&0x20; uint8_t rhythm = OPL->rhythm&0x20;
OPL_CH *CH,*R_CH; OPL_CH *CH,*R_CH;
if( (void *)OPL != cur_chip ){ if( (void *)OPL != cur_chip ){

39
hw/audio/fmopl.h
View File

@ -1,6 +1,8 @@
#ifndef FMOPL_H #ifndef FMOPL_H
#define FMOPL_H #define FMOPL_H
#include <stdint.h>
/* --- system optimize --- */ /* --- system optimize --- */
/* select bit size of output : 8 or 16 */ /* select bit size of output : 8 or 16 */
#define OPL_OUTPUT_BIT 16 #define OPL_OUTPUT_BIT 16
@ -8,7 +10,6 @@
/* compiler dependence */ /* compiler dependence */
#ifndef OSD_CPU_H #ifndef OSD_CPU_H
#define OSD_CPU_H #define OSD_CPU_H
typedef unsigned char UINT8; /* unsigned 8bit */
typedef unsigned short UINT16; /* unsigned 16bit */ typedef unsigned short UINT16; /* unsigned 16bit */
typedef unsigned int UINT32; /* unsigned 32bit */ typedef unsigned int UINT32; /* unsigned 32bit */
typedef signed char INT8; /* signed 8bit */ typedef signed char INT8; /* signed 8bit */
@ -41,19 +42,19 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param);
typedef struct fm_opl_slot { typedef struct fm_opl_slot {
INT32 TL; /* total level :TL << 8 */ INT32 TL; /* total level :TL << 8 */
INT32 TLL; /* adjusted now TL */ INT32 TLL; /* adjusted now TL */
UINT8 KSR; /* key scale rate :(shift down bit) */ uint8_t KSR; /* key scale rate :(shift down bit) */
INT32 *AR; /* attack rate :&AR_TABLE[AR<<2] */ INT32 *AR; /* attack rate :&AR_TABLE[AR<<2] */
INT32 *DR; /* decay rate :&DR_TALBE[DR<<2] */ INT32 *DR; /* decay rate :&DR_TALBE[DR<<2] */
INT32 SL; /* sustin level :SL_TALBE[SL] */ INT32 SL; /* sustin level :SL_TALBE[SL] */
INT32 *RR; /* release rate :&DR_TABLE[RR<<2] */ INT32 *RR; /* release rate :&DR_TABLE[RR<<2] */
UINT8 ksl; /* keyscale level :(shift down bits) */ uint8_t ksl; /* keyscale level :(shift down bits) */
UINT8 ksr; /* key scale rate :kcode>>KSR */ uint8_t ksr; /* key scale rate :kcode>>KSR */
UINT32 mul; /* multiple :ML_TABLE[ML] */ UINT32 mul; /* multiple :ML_TABLE[ML] */
UINT32 Cnt; /* frequency count : */ UINT32 Cnt; /* frequency count : */
UINT32 Incr; /* frequency step : */ UINT32 Incr; /* frequency step : */
/* envelope generator state */ /* envelope generator state */
UINT8 eg_typ; /* envelope type flag */ uint8_t eg_typ; /* envelope type flag */
UINT8 evm; /* envelope phase */ uint8_t evm; /* envelope phase */
INT32 evc; /* envelope counter */ INT32 evc; /* envelope counter */
INT32 eve; /* envelope counter end point */ INT32 eve; /* envelope counter end point */
INT32 evs; /* envelope counter step */ INT32 evs; /* envelope counter step */
@ -61,8 +62,8 @@ typedef struct fm_opl_slot {
INT32 evsd; /* envelope step for DR :DR[ksr] */ INT32 evsd; /* envelope step for DR :DR[ksr] */
INT32 evsr; /* envelope step for RR :RR[ksr] */ INT32 evsr; /* envelope step for RR :RR[ksr] */
/* LFO */ /* LFO */
UINT8 ams; /* ams flag */ uint8_t ams; /* ams flag */
UINT8 vib; /* vibrate flag */ uint8_t vib; /* vibrate flag */
/* wave selector */ /* wave selector */
INT32 **wavetable; INT32 **wavetable;
}OPL_SLOT; }OPL_SLOT;
@ -70,38 +71,38 @@ typedef struct fm_opl_slot {
/* ---------- OPL one of channel ---------- */ /* ---------- OPL one of channel ---------- */
typedef struct fm_opl_channel { typedef struct fm_opl_channel {
OPL_SLOT SLOT[2]; OPL_SLOT SLOT[2];
UINT8 CON; /* connection type */ uint8_t CON; /* connection type */
UINT8 FB; /* feed back :(shift down bit) */ uint8_t FB; /* feed back :(shift down bit) */
INT32 *connect1; /* slot1 output pointer */ INT32 *connect1; /* slot1 output pointer */
INT32 *connect2; /* slot2 output pointer */ INT32 *connect2; /* slot2 output pointer */
INT32 op1_out[2]; /* slot1 output for selfeedback */ INT32 op1_out[2]; /* slot1 output for selfeedback */
/* phase generator state */ /* phase generator state */
UINT32 block_fnum; /* block+fnum : */ UINT32 block_fnum; /* block+fnum : */
UINT8 kcode; /* key code : KeyScaleCode */ uint8_t kcode; /* key code : KeyScaleCode */
UINT32 fc; /* Freq. Increment base */ UINT32 fc; /* Freq. Increment base */
UINT32 ksl_base; /* KeyScaleLevel Base step */ UINT32 ksl_base; /* KeyScaleLevel Base step */
UINT8 keyon; /* key on/off flag */ uint8_t keyon; /* key on/off flag */
} OPL_CH; } OPL_CH;
/* OPL state */ /* OPL state */
typedef struct fm_opl_f { typedef struct fm_opl_f {
UINT8 type; /* chip type */ uint8_t type; /* chip type */
int clock; /* master clock (Hz) */ int clock; /* master clock (Hz) */
int rate; /* sampling rate (Hz) */ int rate; /* sampling rate (Hz) */
double freqbase; /* frequency base */ double freqbase; /* frequency base */
double TimerBase; /* Timer base time (==sampling time) */ double TimerBase; /* Timer base time (==sampling time) */
UINT8 address; /* address register */ uint8_t address; /* address register */
UINT8 status; /* status flag */ uint8_t status; /* status flag */
UINT8 statusmask; /* status mask */ uint8_t statusmask; /* status mask */
UINT32 mode; /* Reg.08 : CSM , notesel,etc. */ UINT32 mode; /* Reg.08 : CSM , notesel,etc. */
/* Timer */ /* Timer */
int T[2]; /* timer counter */ int T[2]; /* timer counter */
UINT8 st[2]; /* timer enable */ uint8_t st[2]; /* timer enable */
/* FM channel slots */ /* FM channel slots */
OPL_CH *P_CH; /* pointer of CH */ OPL_CH *P_CH; /* pointer of CH */
int max_ch; /* maximum channel */ int max_ch; /* maximum channel */
/* Rhythm sention */ /* Rhythm sention */
UINT8 rhythm; /* Rhythm mode , key flag */ uint8_t rhythm; /* Rhythm mode , key flag */
OPL_PORTHANDLER_R porthandler_r; OPL_PORTHANDLER_R porthandler_r;
OPL_PORTHANDLER_W porthandler_w; OPL_PORTHANDLER_W porthandler_w;
int port_param; int port_param;
@ -120,7 +121,7 @@ typedef struct fm_opl_f {
INT32 vibCnt; INT32 vibCnt;
INT32 vibIncr; INT32 vibIncr;
/* wave selector enable flag */ /* wave selector enable flag */
UINT8 wavesel; uint8_t wavesel;
/* external event callback handler */ /* external event callback handler */
OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */
int TimerParam; /* TIMER parameter */ int TimerParam; /* TIMER parameter */