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

dahdi: Move 'timingslips' in with the other maintenance counters.

Browse Source 
This allows timingslips to be reset along with the other counters and clarifies
the intended use.

This came up when Doug Bailey asked why he couldn't use dahdi_maint to clear
timing slips in addition to the other counters.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Shaun Ruffell
2012-12-13 10:41:46 -06:00
parent a8dfd61e53
commit f916f1e91f
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -932,8 +932,8 @@ static int dahdi_seq_show(struct seq_file *sfile, void *v)
seq_printf(sfile, "\tFAS error count: %d\n", s->count.fas);
if (s->parent->irqmisses)
seq_printf(sfile, "\tIRQ misses: %d\n", s->parent->irqmisses);
if (s->timingslips)
seq_printf(sfile, "\tTiming slips: %d\n", s->timingslips);
if (s->count.timingslips)
seq_printf(sfile, "\tTiming slips: %d\n", s->count.timingslips);
seq_printf(sfile, "\n");
for (x = 0; x < s->channels; x++) {

4
drivers/dahdi/wct4xxp/base.c
View File

@@ -3682,7 +3682,7 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
}
if (!ts->span.alarms) {
if ((isr3 & 0x3) || (isr4 & 0xc0))
ts->span.timingslips++;
ts->span.count.timingslips++;
if (debug & DEBUG_MAIN) {
if (isr3 & 0x02)
@@ -3703,7 +3703,7 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
wc->numspans, span + 1);
}
} else
ts->span.timingslips = 0;
ts->span.count.timingslips = 0;
spin_lock_irqsave(&wc->reglock, flags);
/* HDLC controller checks - receive side */

3
include/dahdi/kernel.h
View File

@@ -750,6 +750,7 @@ struct dahdi_count {
__u32 be; /*!< current bit error count */
__u32 prbs; /*!< current PRBS detected pattern */
__u32 errsec; /*!< errored seconds */
__u32 timingslips; /*!< Clock slips */
};
/* map flagbits to flag masks */
@@ -955,8 +956,6 @@ struct dahdi_span {
int maintstat; /*!< Maintenance state */
int mainttimer; /*!< Maintenance timer */
int timingslips; /*!< Clock slips */
struct dahdi_chan **chans; /*!< Member channel structures */
const struct dahdi_span_ops *ops; /*!< span callbacks. */