diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-05-23 12:20:23 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-05-23 12:20:23 +0000 |
commit | fa1d3ba9465064f7a1551fe7369525d8b355861d (patch) | |
tree | e69ab4124842248fc84b8534dd05ebe90a091cfb /drivers/dahdi/wctdm24xxp | |
parent | 45a4b3459991f23fc17240886d1435d67ff2e89c (diff) |
convert span->spantype to enumerated type
* This is a minimal convertion -- everything compiles and looks OK.
* We print a warning for spans registering without a spantype.
* Low-level drivers may later want (but not required)
to fold their internal representations to this canonical
representation -- it will save code and make it more readable.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10683 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp')
-rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/wctdm24xxp/xhfc.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index e1d6799..a1eff33 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -4520,7 +4520,7 @@ wctdm_init_span(struct wctdm *wc, int spanno, int chanoffset, int chancount, s->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_B8ZS | DAHDI_CONFIG_D4; s->span.linecompat |= DAHDI_CONFIG_ESF | DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4; s->span.linecompat |= DAHDI_CONFIG_NTTE | DAHDI_CONFIG_TERM; - s->span.spantype = "TE"; + s->span.spantype = SPANTYPE_DIGITAL_BRI_TE; } else { s->span.ops = &wctdm24xxp_analog_span_ops; s->span.flags = DAHDI_FLAG_RBS; diff --git a/drivers/dahdi/wctdm24xxp/xhfc.c b/drivers/dahdi/wctdm24xxp/xhfc.c index c5eb5a6..bd82fb4 100644 --- a/drivers/dahdi/wctdm24xxp/xhfc.c +++ b/drivers/dahdi/wctdm24xxp/xhfc.c @@ -2150,7 +2150,9 @@ static int b400m_set_ntte(struct b400m_span *bspan, int te_mode, int term_on) int all_modes = 0, all_terms = 0; int i; - bspan->wspan->span.spantype = (te_mode > 0) ? "TE" : "NT"; + bspan->wspan->span.spantype = (te_mode > 0) + ? SPANTYPE_DIGITAL_BRI_TE + : SPANTYPE_DIGITAL_BRI_NT; bspan->te_mode = te_mode; bspan->term_on = term_on; |