FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Group all conditions for skipping channel receive together.

Browse Source 
Streamlines the function a bit by grouping the three conditions that
would cause the channel receive to be completely skipped.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9606 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-01-03 18:28:02 +00:00
parent 5002e537c3
commit 4533614fb6
1 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
drivers/dahdi/dahdi-base.c
View File

@@ -8659,9 +8659,8 @@ static void process_masterspan(void)
spin_lock(&chan->lock);
data = __buf_peek(&chan->confin);
__dahdi_receive_chunk(chan, data);
if (data) {
__buf_pull(&chan->confin, NULL, chans[x]);
}
if (data)
__buf_pull(&chan->confin, NULL, chan);
spin_unlock(&chan->lock);
}
}
@@ -8848,6 +8847,13 @@ static void __receive_from_slaves(struct dahdi_chan *const chan)
}
}
static inline bool should_skip_receive(const struct dahdi_chan *const chan)
{
return (unlikely(chan->flags & DAHDI_FLAG_NOSTDTXRX) ||
(chan->master != chan) ||
is_chan_dacsed(chan));
}
int dahdi_receive(struct dahdi_span *span)
{
unsigned long flags;
@@ -8861,65 +8867,60 @@ int dahdi_receive(struct dahdi_span *span)
for (x = 0; x < span->channels; x++) {
struct dahdi_chan *const chan = span->chans[x];
spin_lock(&chan->lock);
if (unlikely(chan->flags & DAHDI_FLAG_NOSTDTXRX)) {
if (should_skip_receive(chan)) {
spin_unlock(&chan->lock);
continue;
}
if (chan->master == chan) {
if (is_chan_dacsed(chan)) {
/* this channel is in DACS mode, there is nothing to do here */
spin_unlock_irqrestore(&chan->lock, flags);
continue;
} else if (chan->nextslave) {
__receive_from_slaves(chan);
} else {
/* Process a normal channel */
__dahdi_real_receive(chan);
}
if (chan->itimer) {
chan->itimer -= DAHDI_CHUNKSIZE;
if (chan->itimer <= 0)
rbs_itimer_expire(chan);
}
if (chan->ringdebtimer)
chan->ringdebtimer--;
if (chan->sig & __DAHDI_SIG_FXS) {
if (chan->rxhooksig == DAHDI_RXSIG_RING)
chan->ringtrailer = DAHDI_RINGTRAILER;
else if (chan->ringtrailer) {
chan->ringtrailer -= DAHDI_CHUNKSIZE;
/* See if RING trailer is expired */
if (!chan->ringtrailer && !chan->ringdebtimer)
__qevent(chan, DAHDI_EVENT_RINGOFFHOOK);
}
}
if (chan->pulsetimer) {
chan->pulsetimer--;
if (chan->pulsetimer <= 0) {
if (chan->pulsecount) {
if (chan->pulsecount > 12) {
module_printk(KERN_NOTICE, "Got pulse digit %d on %s???\n",
chan->pulsecount,
chan->name);
} else if (chan->pulsecount > 11) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '#');
} else if (chan->pulsecount > 10) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '*');
} else if (chan->pulsecount > 9) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '0');
} else {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | ('0' +
chan->pulsecount));
}
chan->pulsecount = 0;
if (chan->nextslave) {
__receive_from_slaves(chan);
} else {
/* Process a normal channel */
__dahdi_real_receive(chan);
}
if (chan->itimer) {
chan->itimer -= DAHDI_CHUNKSIZE;
if (chan->itimer <= 0)
rbs_itimer_expire(chan);
}
if (chan->ringdebtimer)
chan->ringdebtimer--;
if (chan->sig & __DAHDI_SIG_FXS) {
if (chan->rxhooksig == DAHDI_RXSIG_RING)
chan->ringtrailer = DAHDI_RINGTRAILER;
else if (chan->ringtrailer) {
chan->ringtrailer -= DAHDI_CHUNKSIZE;
/* See if RING trailer is expired */
if (!chan->ringtrailer && !chan->ringdebtimer)
__qevent(chan, DAHDI_EVENT_RINGOFFHOOK);
}
}
if (chan->pulsetimer) {
chan->pulsetimer--;
if (chan->pulsetimer <= 0) {
if (chan->pulsecount) {
if (chan->pulsecount > 12) {
module_printk(KERN_NOTICE, "Got pulse digit %d on %s???\n",
chan->pulsecount,
chan->name);
} else if (chan->pulsecount > 11) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '#');
} else if (chan->pulsecount > 10) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '*');
} else if (chan->pulsecount > 9) {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | '0');
} else {
__qevent(chan, DAHDI_EVENT_PULSEDIGIT | ('0' +
chan->pulsecount));
}
chan->pulsecount = 0;
}
}
#ifdef BUFFER_DEBUG
chan->statcount -= DAHDI_CHUNKSIZE;
#endif
}
#ifdef BUFFER_DEBUG
chan->statcount -= DAHDI_CHUNKSIZE;
#endif
spin_unlock(&chan->lock);
}