From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Bxt-0008N0-4T for qemu-devel@nongnu.org; Tue, 25 Apr 2017 21:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3Bxp-0005Ji-50 for qemu-devel@nongnu.org; Tue, 25 Apr 2017 21:41:57 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:36027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d3Bxo-0005J8-W6 for qemu-devel@nongnu.org; Tue, 25 Apr 2017 21:41:53 -0400 Received: by mail-qk0-x243.google.com with SMTP id y63so19459227qkd.3 for ; Tue, 25 Apr 2017 18:41:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <20170425223739.6703-1-quintela@redhat.com> <20170425223739.6703-6-quintela@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <1558ac56-8c05-0940-f19c-d3783c708ab3@amsat.org> Date: Tue, 25 Apr 2017 22:41:48 -0300 MIME-Version: 1.0 In-Reply-To: <20170425223739.6703-6-quintela@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/26] audio: Remove UINT8 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Hi Juan, On 04/25/2017 07:37 PM, Juan Quintela wrote: > uint8_t has existed since ..... all this century? > > Signed-off-by: Juan Quintela > --- > hw/audio/fmopl.c | 8 ++++---- > hw/audio/fmopl.h | 39 ++++++++++++++++++++------------------- > 2 files changed, 24 insertions(+), 23 deletions(-) > > diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c > index 282662a..3d14b45 100644 > --- a/hw/audio/fmopl.c > +++ b/hw/audio/fmopl.c > @@ -789,8 +789,8 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) > } > else > { /* set IRQ mask ,timer enable*/ > - UINT8 st1 = v&1; > - UINT8 st2 = (v>>1)&1; > + uint8_t st1 = v&1; > + uint8_t st2 = (v>>1)&1; Welcome to stdint! but since you're changing this code please make it more readable (at least spaces) so checkpatch don't reject your serie: ERROR: spaces required around that '&' > /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ > OPL_STATUS_RESET(OPL,v&0x78); > OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01); > @@ -838,7 +838,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) > case 0xbd: > /* 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->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0]; > OPL->rhythm = v&0x3f; > @@ -991,7 +991,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) > OPLSAMPLE *buf = buffer; > UINT32 amsCnt = OPL->amsCnt; > UINT32 vibCnt = OPL->vibCnt; > - UINT8 rhythm = OPL->rhythm&0x20; > + uint8_t rhythm = OPL->rhythm&0x20; > OPL_CH *CH,*R_CH; > > if( (void *)OPL != cur_chip ){ > diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h > index e476497..3df8942 100644 > --- a/hw/audio/fmopl.h > +++ b/hw/audio/fmopl.h > @@ -1,6 +1,8 @@ > #ifndef FMOPL_H > #define FMOPL_H > > +#include > + > /* --- system optimize --- */ > /* select bit size of output : 8 or 16 */ > #define OPL_OUTPUT_BIT 16 > @@ -8,7 +10,6 @@ > /* compiler dependence */ > #ifndef OSD_CPU_H > #define OSD_CPU_H > -typedef unsigned char UINT8; /* unsigned 8bit */ > typedef unsigned short UINT16; /* unsigned 16bit */ > typedef unsigned int UINT32; /* unsigned 32bit */ > typedef signed char INT8; /* signed 8bit */ > @@ -41,19 +42,19 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param); > typedef struct fm_opl_slot { > INT32 TL; /* total level :TL << 8 */ > 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 *DR; /* decay rate :&DR_TALBE[DR<<2] */ > INT32 SL; /* sustin level :SL_TALBE[SL] */ > INT32 *RR; /* release rate :&DR_TABLE[RR<<2] */ > - UINT8 ksl; /* keyscale level :(shift down bits) */ > - UINT8 ksr; /* key scale rate :kcode>>KSR */ > + uint8_t ksl; /* keyscale level :(shift down bits) */ > + uint8_t ksr; /* key scale rate :kcode>>KSR */ > UINT32 mul; /* multiple :ML_TABLE[ML] */ > UINT32 Cnt; /* frequency count : */ > UINT32 Incr; /* frequency step : */ > /* envelope generator state */ > - UINT8 eg_typ; /* envelope type flag */ > - UINT8 evm; /* envelope phase */ > + uint8_t eg_typ; /* envelope type flag */ > + uint8_t evm; /* envelope phase */ > INT32 evc; /* envelope counter */ > INT32 eve; /* envelope counter end point */ > INT32 evs; /* envelope counter step */ > @@ -61,8 +62,8 @@ typedef struct fm_opl_slot { > INT32 evsd; /* envelope step for DR :DR[ksr] */ > INT32 evsr; /* envelope step for RR :RR[ksr] */ > /* LFO */ > - UINT8 ams; /* ams flag */ > - UINT8 vib; /* vibrate flag */ > + uint8_t ams; /* ams flag */ > + uint8_t vib; /* vibrate flag */ > /* wave selector */ > INT32 **wavetable; > }OPL_SLOT; > @@ -70,38 +71,38 @@ typedef struct fm_opl_slot { > /* ---------- OPL one of channel ---------- */ > typedef struct fm_opl_channel { > OPL_SLOT SLOT[2]; > - UINT8 CON; /* connection type */ > - UINT8 FB; /* feed back :(shift down bit) */ > + uint8_t CON; /* connection type */ > + uint8_t FB; /* feed back :(shift down bit) */ > INT32 *connect1; /* slot1 output pointer */ > INT32 *connect2; /* slot2 output pointer */ > INT32 op1_out[2]; /* slot1 output for selfeedback */ > /* phase generator state */ > UINT32 block_fnum; /* block+fnum : */ > - UINT8 kcode; /* key code : KeyScaleCode */ > + uint8_t kcode; /* key code : KeyScaleCode */ > UINT32 fc; /* Freq. Increment base */ > UINT32 ksl_base; /* KeyScaleLevel Base step */ > - UINT8 keyon; /* key on/off flag */ > + uint8_t keyon; /* key on/off flag */ > } OPL_CH; > > /* OPL state */ > typedef struct fm_opl_f { > - UINT8 type; /* chip type */ > + uint8_t type; /* chip type */ > int clock; /* master clock (Hz) */ > int rate; /* sampling rate (Hz) */ > double freqbase; /* frequency base */ > double TimerBase; /* Timer base time (==sampling time) */ > - UINT8 address; /* address register */ > - UINT8 status; /* status flag */ > - UINT8 statusmask; /* status mask */ > + uint8_t address; /* address register */ > + uint8_t status; /* status flag */ > + uint8_t statusmask; /* status mask */ > UINT32 mode; /* Reg.08 : CSM , notesel,etc. */ > /* Timer */ > int T[2]; /* timer counter */ > - UINT8 st[2]; /* timer enable */ > + uint8_t st[2]; /* timer enable */ > /* FM channel slots */ > OPL_CH *P_CH; /* pointer of CH */ > int max_ch; /* maximum channel */ > /* Rhythm sention */ > - UINT8 rhythm; /* Rhythm mode , key flag */ > + uint8_t rhythm; /* Rhythm mode , key flag */ > OPL_PORTHANDLER_R porthandler_r; > OPL_PORTHANDLER_W porthandler_w; > int port_param; > @@ -120,7 +121,7 @@ typedef struct fm_opl_f { > INT32 vibCnt; > INT32 vibIncr; > /* wave selector enable flag */ > - UINT8 wavesel; > + uint8_t wavesel; > /* external event callback handler */ > OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ > int TimerParam; /* TIMER parameter */ >