From: Terry Wilson Date: Fri, 2 Mar 2012 22:14:15 +0000 (+0000) Subject: Make chan_usbradio compile under dev mode X-Git-Tag: 10.3.0~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2456f442e5743ddf54785cc3a0cea8b1e256c4a;p=thirdparty%2Fasterisk.git Make chan_usbradio compile under dev mode x=++x and x=x=1? Really? ........ Merged revisions 357986 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@357987 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/xpmr/xpmr.c b/channels/xpmr/xpmr.c index b94b0faf96..0fc1fbe99b 100755 --- a/channels/xpmr/xpmr.c +++ b/channels/xpmr/xpmr.c @@ -1555,7 +1555,7 @@ i16 ctcss_detect(t_pmr_chan *pChan) } #endif indexWas=indexNow; - ptdet->zIndex=(++ptdet->zIndex)%4; + ptdet->zIndex=(ptdet->zIndex + 1) % 4; } ptdet->counter-=(points2do*CTCSS_SCOUNT_MUL); @@ -2019,7 +2019,7 @@ t_pmr_chan *createPmrChannel(t_pmr_chan *tChan, i16 numSamples) pSps->sigProc=pmr_rx_frontend; pSps->enabled=1; pSps->decimator=pSps->decimate=6; - pSps->interpolate=pSps->interpolate=1; + pSps->interpolate=1; pSps->nSamples=pChan->nSamplesRx; pSps->ncoef=taps_fir_bpf_noise_1; pSps->size_coef=2;