diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-11-02 17:05:38 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-11-02 17:05:38 +0000 |
| commit | 6139ae072c2452bd97b5951ec0b4e12d85b93af6 (patch) | |
| tree | 885c96af4e49066629c2f91dcded43ea87b288d6 | |
| parent | 2009ce87cd47400f42d7cbf6b68ce472c485d93c (diff) | |
xpp: bugfix: clear NOTOPEN span alarm on assign
The NOTOPEN span alarm flag is set at span unassignment time.
* It needs to be cleared when the span is reassigned.
* That is: only if the span is actually connected.
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10302 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 1 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/card_pri.c | 1 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 15 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.h | 1 |
4 files changed, 18 insertions, 0 deletions
diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index a6296f0..1f32eb4 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -863,6 +863,7 @@ static const struct dahdi_span_ops BRI_span_ops = { .maint = xpp_maint, .echocan_create = xpp_echocan_create, .echocan_name = xpp_echocan_name, + .assigned = xpp_span_assigned, #ifdef DAHDI_SYNC_TICK .sync_tick = dahdi_sync_tick, #endif diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index 2012eb1..bdd0f40 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -1242,6 +1242,7 @@ static const struct dahdi_span_ops PRI_span_ops = { .maint = xpp_maint, .echocan_create = xpp_echocan_create, .echocan_name = xpp_echocan_name, + .assigned = xpp_span_assigned, #ifdef DAHDI_SYNC_TICK .sync_tick = dahdi_sync_tick, #endif diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 5dbca26..ccf7f38 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -945,6 +945,19 @@ int xpp_echocan_create(struct dahdi_chan *chan, } EXPORT_SYMBOL(xpp_echocan_create); +void xpp_span_assigned(struct dahdi_span *span) +{ + struct phonedev *phonedev = container_of(span, struct phonedev, span); + xpd_t *xpd = container_of(phonedev, struct xpd, phonedev); + + XPD_INFO(xpd, "Span assigned: %d\n", span->spanno); + if (xpd->card_present) { + span->alarms &= ~DAHDI_ALARM_NOTOPEN; + dahdi_alarm_notify(&phonedev->span); + } +} +EXPORT_SYMBOL(xpp_span_assigned); + static const struct dahdi_span_ops xpp_span_ops = { .owner = THIS_MODULE, .open = xpp_open, @@ -953,6 +966,7 @@ static const struct dahdi_span_ops xpp_span_ops = { .maint = xpp_maint, .echocan_create = xpp_echocan_create, .echocan_name = xpp_echocan_name, + .assigned = xpp_span_assigned, }; static const struct dahdi_span_ops xpp_rbs_span_ops = { @@ -964,6 +978,7 @@ static const struct dahdi_span_ops xpp_rbs_span_ops = { .maint = xpp_maint, .echocan_create = xpp_echocan_create, .echocan_name = xpp_echocan_name, + .assigned = xpp_span_assigned, }; void xpd_set_spanname(xpd_t *xpd) diff --git a/drivers/dahdi/xpp/xpp_dahdi.h b/drivers/dahdi/xpp/xpp_dahdi.h index cd9afb6..f7a0092 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.h +++ b/drivers/dahdi/xpp/xpp_dahdi.h @@ -47,6 +47,7 @@ int xpp_close(struct dahdi_chan *chan); int xpp_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long arg); int xpp_hooksig(struct dahdi_chan *chan, enum dahdi_txsig txsig); int xpp_maint(struct dahdi_span *span, int cmd); +void xpp_span_assigned(struct dahdi_span *span); void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd); int total_registered_spans(void); void oht_pcm(xpd_t *xpd, int pos, bool pass); |