mISDN: Fix indenting in dsp_cmx.c
Subsystems (3)
PATCH 1/1 mISDN: Fix indenting in dsp_cmx.c
We used a script to indent this code back in 2012, but I guess it got confused by the ifdefs and added some extra tabs. This patch removes them.
--- drivers/isdn/mISDN/dsp_cmx.c | 427 +++++++++++++++++------------------ 1 file changed, 213 insertions(+), 214 deletions(-)
drivers/isdn/mISDN/dsp_cmx.c +213 -214
@@ -1676,9 +1676,9 @@ dsp_cmx_send(void *arg)#ifdef CMX_CONF_DEBUG if (conf->software && members >1 ) #else - if (conf->software && members > 2) + if (conf->software && members > 2)#endif - mustmix =1 ; + mustmix =1 ; }/* transmission required */
@@ -1699,263 +1699,262 @@ dsp_cmx_send(void *arg)#ifdef CMX_CONF_DEBUG if (conf->software && members >1 ) {#else -if (conf->software && members >2 ) { +if (conf->software && members >2 ) {#endif -/* check for hdlc conf */ - member =list_entry (conf->mlist.next, - struct dsp_conf_member, list); -if (member->dsp->hdlc) -continue ; -/* mix all data */ -memset (mixbuffer,0 , length *sizeof (s32)); -list_for_each_entry (member, &conf->mlist, list) { - dsp = member->dsp; -/* get range of data to mix */ - c = mixbuffer; - q = dsp->rx_buff; - r = dsp->rx_R; - rr = (r + length) &CMX_BUFF_MASK ; -/* add member's data */ -while (r != rr) { - *c++ += dsp_audio_law_to_s32[q[r]]; - r = (r +1 ) &CMX_BUFF_MASK ; - } +/* check for hdlc conf */ + member =list_entry (conf->mlist.next, + struct dsp_conf_member, list); +if (member->dsp->hdlc) +continue ; +/* mix all data */ +memset (mixbuffer,0 , length *sizeof (s32)); +list_for_each_entry (member, &conf->mlist, list) { + dsp = member->dsp; +/* get range of data to mix */ + c = mixbuffer; + q = dsp->rx_buff; + r = dsp->rx_R; + rr = (r + length) &CMX_BUFF_MASK ; +/* add member's data */ +while (r != rr) { + *c++ += dsp_audio_law_to_s32[q[r]]; + r = (r +1 ) &CMX_BUFF_MASK ; } + } -/* process each member */ -list_for_each_entry (member, &conf->mlist, list) { -/* transmission */ -dsp_cmx_send_member (member->dsp, length, - mixbuffer, members); - } +/* process each member */ +list_for_each_entry (member, &conf->mlist, list) { +/* transmission */ +dsp_cmx_send_member (member->dsp, length, + mixbuffer, members); + } + } + } + +/* delete rx-data, increment buffers, change pointers */ +list_for_each_entry (dsp, &dsp_ilist, list) { +if (dsp->hdlc) +continue ; + p = dsp->rx_buff; + q = dsp->tx_buff; + r = dsp->rx_R; +/* move receive pointer when receiving */ +if (!dsp->rx_is_off) { + rr = (r + length) &CMX_BUFF_MASK ; +/* delete rx-data */ +while (r != rr) { + p[r] = dsp_silence; + r = (r +1 ) &CMX_BUFF_MASK ; } +/* increment rx-buffer pointer */ + dsp->rx_R = r;/* write incremented read pointer */ } -/* delete rx-data, increment buffers, change pointers */ -list_for_each_entry (dsp, &dsp_ilist, list) { -if (dsp->hdlc) -continue ; - p = dsp->rx_buff; - q = dsp->tx_buff; - r = dsp->rx_R; -/* move receive pointer when receiving */ -if (!dsp->rx_is_off) { - rr = (r + length) &CMX_BUFF_MASK ; +/* check current rx_delay */ + delay = (dsp->rx_W-dsp->rx_R) &CMX_BUFF_MASK ; +if (delay >=CMX_BUFF_HALF ) + delay =0 ;/* will be the delay before next write */ +/* check for lower delay */ +if (delay < dsp->rx_delay[0 ]) + dsp->rx_delay[0 ] = delay; +/* check current tx_delay */ + delay = (dsp->tx_W-dsp->tx_R) &CMX_BUFF_MASK ; +if (delay >=CMX_BUFF_HALF ) + delay =0 ;/* will be the delay before next write */ +/* check for lower delay */ +if (delay < dsp->tx_delay[0 ]) + dsp->tx_delay[0 ] = delay; +if (jittercheck) { +/* find the lowest of all rx_delays */ + delay = dsp->rx_delay[0 ]; + i =1 ; +while (i <MAX_SECONDS_JITTER_CHECK ) { +if (delay > dsp->rx_delay[i]) + delay = dsp->rx_delay[i]; + i++; + } +/* +* remove rx_delay only if we have delay AND we +* have not preset cmx_delay AND +* the delay is greater dsp_poll +*/ +if (delay > dsp_poll && !dsp->cmx_delay) { +if (dsp_debug &DEBUG_DSP_CLOCK ) +printk (KERN_DEBUG +"%s lowest rx_delay of %d bytes for" +" dsp %s are now removed.\n" , + __func__, delay, + dsp->name); + r = dsp->rx_R; + rr = (r + delay - (dsp_poll >>1 )) + &CMX_BUFF_MASK ;/* delete rx-data */ while (r != rr) { p[r] = dsp_silence; r = (r +1 ) &CMX_BUFF_MASK ; }/* increment rx-buffer pointer */ - dsp->rx_R = r;/* write incremented read pointer */ + dsp->rx_R = r; +/* write incremented read pointer */ } - -/* check current rx_delay */ - delay = (dsp->rx_W-dsp->rx_R) &CMX_BUFF_MASK ; -if (delay >=CMX_BUFF_HALF ) - delay =0 ;/* will be the delay before next write */ -/* check for lower delay */ -if (delay < dsp->rx_delay[0 ]) - dsp->rx_delay[0 ] = delay; -/* check current tx_delay */ - delay = (dsp->tx_W-dsp->tx_R) &CMX_BUFF_MASK ; -if (delay >=CMX_BUFF_HALF ) - delay =0 ;/* will be the delay before next write */ -/* check for lower delay */ -if (delay < dsp->tx_delay[0 ]) - dsp->tx_delay[0 ] = delay; -if (jittercheck) { -/* find the lowest of all rx_delays */ - delay = dsp->rx_delay[0 ]; - i =1 ; -while (i <MAX_SECONDS_JITTER_CHECK ) { -if (delay > dsp->rx_delay[i]) - delay = dsp->rx_delay[i]; - i++; - } -/* -* remove rx_delay only if we have delay AND we -* have not preset cmx_delay AND -* the delay is greater dsp_poll -*/ -if (delay > dsp_poll && !dsp->cmx_delay) { -if (dsp_debug &DEBUG_DSP_CLOCK ) -printk (KERN_DEBUG -"%s lowest rx_delay of %d bytes for" -" dsp %s are now removed.\n" , - __func__, delay, - dsp->name); - r = dsp->rx_R; - rr = (r + delay - (dsp_poll >>1 )) - &CMX_BUFF_MASK ; -/* delete rx-data */ -while (r != rr) { - p[r] = dsp_silence; - r = (r +1 ) &CMX_BUFF_MASK ; - } -/* increment rx-buffer pointer */ - dsp->rx_R = r; -/* write incremented read pointer */ - } -/* find the lowest of all tx_delays */ - delay = dsp->tx_delay[0 ]; - i =1 ; -while (i <MAX_SECONDS_JITTER_CHECK ) { -if (delay > dsp->tx_delay[i]) - delay = dsp->tx_delay[i]; - i++; - } -/* -* remove delay only if we have delay AND we -* have enabled tx_dejitter -*/ -if (delay > dsp_poll && dsp->tx_dejitter) { -if (dsp_debug &DEBUG_DSP_CLOCK ) -printk (KERN_DEBUG -"%s lowest tx_delay of %d bytes for" -" dsp %s are now removed.\n" , - __func__, delay, - dsp->name); - r = dsp->tx_R; - rr = (r + delay - (dsp_poll >>1 )) - &CMX_BUFF_MASK ; -/* delete tx-data */ -while (r != rr) { - q[r] = dsp_silence; - r = (r +1 ) &CMX_BUFF_MASK ; - } -/* increment rx-buffer pointer */ - dsp->tx_R = r; -/* write incremented read pointer */ - } -/* scroll up delays */ - i =MAX_SECONDS_JITTER_CHECK -1 ; -while (i) { - dsp->rx_delay[i] = dsp->rx_delay[i -1 ]; - dsp->tx_delay[i] = dsp->tx_delay[i -1 ]; - i--; +/* find the lowest of all tx_delays */ + delay = dsp->tx_delay[0 ]; + i =1 ; +while (i <MAX_SECONDS_JITTER_CHECK ) { +if (delay > dsp->tx_delay[i]) + delay = dsp->tx_delay[i]; + i++; + } +/* +* remove delay only if we have delay AND we +* have enabled tx_dejitter +*/ +if (delay > dsp_poll && dsp->tx_dejitter) { +if (dsp_debug &DEBUG_DSP_CLOCK ) +printk (KERN_DEBUG +"%s lowest tx_delay of %d bytes for" +" dsp %s are now removed.\n" , + __func__, delay, + dsp->name); + r = dsp->tx_R; + rr = (r + delay - (dsp_poll >>1 )) + &CMX_BUFF_MASK ; +/* delete tx-data */ +while (r != rr) { + q[r] = dsp_silence; + r = (r +1 ) &CMX_BUFF_MASK ; } - dsp->tx_delay[0 ] =CMX_BUFF_HALF ;/* (infinite) delay */ - dsp->rx_delay[0 ] =CMX_BUFF_HALF ;/* (infinite) delay */ +/* increment rx-buffer pointer */ + dsp->tx_R = r; +/* write incremented read pointer */ } +/* scroll up delays */ + i =MAX_SECONDS_JITTER_CHECK -1 ; +while (i) { + dsp->rx_delay[i] = dsp->rx_delay[i -1 ]; + dsp->tx_delay[i] = dsp->tx_delay[i -1 ]; + i--; + } + dsp->tx_delay[0 ] =CMX_BUFF_HALF ;/* (infinite) delay */ + dsp->rx_delay[0 ] =CMX_BUFF_HALF ;/* (infinite) delay */ } + } -/* if next event would be in the past ... */ -if ((s32)(dsp_spl_jiffies + dsp_tics-jiffies) <=0 ) - dsp_spl_jiffies = jiffies +1 ; -else - dsp_spl_jiffies += dsp_tics; +/* if next event would be in the past ... */ +if ((s32)(dsp_spl_jiffies + dsp_tics-jiffies) <=0 ) + dsp_spl_jiffies = jiffies +1 ; +else + dsp_spl_jiffies += dsp_tics; - dsp_spl_tl.expires = dsp_spl_jiffies; -add_timer (&dsp_spl_tl); + dsp_spl_tl.expires = dsp_spl_jiffies; +add_timer (&dsp_spl_tl); -/* unlock */ - spin_unlock_irqrestore(&dsp_lock, flags); - } +/* unlock */ + spin_unlock_irqrestore(&dsp_lock, flags); +}/* * audio data is transmitted from upper layer to the dsp */ -void -dsp_cmx_transmit (struct dsp *dsp,struct sk_buff *skb) - { -u_int w, ww; -u8 *d, *p; -int space;/* todo: , l = skb->len; */ +void +dsp_cmx_transmit (struct dsp *dsp,struct sk_buff *skb) +{ +u_int w, ww; +u8 *d, *p; +int space;/* todo: , l = skb->len; */ #ifdef CMX_TX_DEBUG -char debugbuf[256 ] ="" ; +char debugbuf[256 ] ="" ;#endif -/* check if there is enough space, and then copy */ - w = dsp->tx_W; - ww = dsp->tx_R; - p = dsp->tx_buff; - d = skb->data; - space = (ww - w -1 ) &CMX_BUFF_MASK ; -/* write-pointer should not overrun nor reach read pointer */ -if (space < skb->len) { -/* write to the space we have left */ - ww = (ww -1 ) &CMX_BUFF_MASK ;/* end one byte prior tx_R */ -if (dsp_debug &DEBUG_DSP_CLOCK ) -printk (KERN_DEBUG "%s: TX overflow space=%d skb->len=" -"%d, w=0x%04x, ww=0x%04x\n" , __func__, space, - skb->len, w, ww); - }else -/* write until all byte are copied */ - ww = (w + skb->len) &CMX_BUFF_MASK ; - dsp->tx_W = ww; - +/* check if there is enough space, and then copy */ + w = dsp->tx_W; + ww = dsp->tx_R; + p = dsp->tx_buff; + d = skb->data; + space = (ww - w -1 ) &CMX_BUFF_MASK ; +/* write-pointer should not overrun nor reach read pointer */ +if (space < skb->len) { +/* write to the space we have left */ + ww = (ww -1 ) &CMX_BUFF_MASK ;/* end one byte prior tx_R */ +if (dsp_debug &DEBUG_DSP_CLOCK ) +printk (KERN_DEBUG "%s: TX overflow space=%d skb->len=" +"%d, w=0x%04x, ww=0x%04x\n" , __func__, space, + skb->len, w, ww); + }else +/* write until all byte are copied */ + ww = (w + skb->len) &CMX_BUFF_MASK ; + dsp->tx_W = ww;/* show current buffer */ #ifdef CMX_DEBUG -printk (KERN_DEBUG -"cmx_transmit(dsp=%lx) %d bytes to 0x%x-0x%x. %s\n" , - (u_long )dsp, (ww - w) &CMX_BUFF_MASK , w, ww, dsp->name); +printk (KERN_DEBUG +"cmx_transmit(dsp=%lx) %d bytes to 0x%x-0x%x. %s\n" , + (u_long )dsp, (ww - w) &CMX_BUFF_MASK , w, ww, dsp->name);#endif -/* copy transmit data to tx-buffer */ +/* copy transmit data to tx-buffer */ #ifdef CMX_TX_DEBUG -sprintf (debugbuf,"TX getting (%04x-%04x)%p: " , w, ww, p); +sprintf (debugbuf,"TX getting (%04x-%04x)%p: " , w, ww, p);#endif -while (w != ww) { +while (w != ww) {#ifdef CMX_TX_DEBUG -if (strlen (debugbuf) <48 ) -sprintf (debugbuf +strlen (debugbuf)," %02x" , *d); +if (strlen (debugbuf) <48 ) +sprintf (debugbuf +strlen (debugbuf)," %02x" , *d);#endif - p[w] = *d++; - w = (w +1 ) &CMX_BUFF_MASK ; - } + p[w] = *d++; + w = (w +1 ) &CMX_BUFF_MASK ; + }#ifdef CMX_TX_DEBUG -printk (KERN_DEBUG "%s\n" , debugbuf); +printk (KERN_DEBUG "%s\n" , debugbuf);#endif - } +}/* * hdlc data is received from card and sent to all members. */ -void -dsp_cmx_hdlc (struct dsp *dsp,struct sk_buff *skb) - { -struct sk_buff *nskb =NULL ; -struct dsp_conf_member *member; -struct mISDNhead *hh; - -/* not if not active */ -if (!dsp->b_active) -return ; +void +dsp_cmx_hdlc (struct dsp *dsp,struct sk_buff *skb) +{ +struct sk_buff *nskb =NULL ; +struct dsp_conf_member *member; +struct mISDNhead *hh; -/* check if we have sompen */ -if (skb->len <1 ) -return ; +/* not if not active */ +if (!dsp->b_active) +return ; -/* no conf */ -if (!dsp->conf) { -/* in case of software echo */ -if (dsp->echo.software) { - nskb =skb_clone (skb,GFP_ATOMIC ); -if (nskb) { - hh =mISDN_HEAD_P (nskb); - hh->prim =PH_DATA_REQ ; - hh->id =0 ; -skb_queue_tail (&dsp->sendq, nskb); -schedule_work (&dsp->workq); - } +/* check if we have sompen */ +if (skb->len <1 ) +return ; + +/* no conf */ +if (!dsp->conf) { +/* in case of software echo */ +if (dsp->echo.software) { + nskb =skb_clone (skb,GFP_ATOMIC ); +if (nskb) { + hh =mISDN_HEAD_P (nskb); + hh->prim =PH_DATA_REQ ; + hh->id =0 ; +skb_queue_tail (&dsp->sendq, nskb); +schedule_work (&dsp->workq); } -return ; } -/* in case of hardware conference */ -if (dsp->conf->hardware) -return ; -list_for_each_entry (member, &dsp->conf->mlist, list) { -if (dsp->echo.software || member->dsp != dsp) { - nskb =skb_clone (skb,GFP_ATOMIC ); -if (nskb) { - hh =mISDN_HEAD_P (nskb); - hh->prim =PH_DATA_REQ ; - hh->id =0 ; -skb_queue_tail (&member->dsp->sendq, nskb); -schedule_work (&member->dsp->workq); - } +return ; + } +/* in case of hardware conference */ +if (dsp->conf->hardware) +return ; +list_for_each_entry (member, &dsp->conf->mlist, list) { +if (dsp->echo.software || member->dsp != dsp) { + nskb =skb_clone (skb,GFP_ATOMIC ); +if (nskb) { + hh =mISDN_HEAD_P (nskb); + hh->prim =PH_DATA_REQ ; + hh->id =0 ; +skb_queue_tail (&member->dsp->sendq, nskb); +schedule_work (&member->dsp->workq); } } } +}
Signature · 1 line
2.20.1
Quoted 3 lines · Dan Carpenter
We used a script to indent this code back in 2012, but I guess it got confused by the ifdefs and added some extra tabs. This patch removes them.
Yup, thanks Dan.
Emacs indent-region made a mess of it.
Quoted 2 lines
drivers/isdn/mISDN/dsp_cmx.c | 427 +++++++++++++++++------------------ 1 file changed, 213 insertions(+), 214 deletions(-)
Quoted 8 lines · Joe Perches
Quoted 3 lines · Dan Carpenter
We used a script to indent this code back in 2012, but I guess it got confused by the ifdefs and added some extra tabs. This patch removes them.
Yup, thanks Dan.
Emacs indent-region made a mess of it.
The re-indent generally made things better and even in this case it didn't really make it worse, just different.
regards,
dan carpenter
From: Dan Carpenter <[email protected]>
Date: Tue, 21 May 2019 12:42:56 +0300
Quoted 5 lines
We used a script to indent this code back in 2012, but I guess it got confused by the ifdefs and added some extra tabs. This patch removes them.
Signed-off-by Dan Carpenter <[email protected]>
Applied.