diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-09-23 20:23:43 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-09-23 20:23:43 +0000 |
| commit | 8ef4ae608415a09c077cdd022a55e4ed7b1398a3 (patch) | |
| tree | b9677a1c247d34701f6e507fa827d5b78595a801 /drivers/dahdi | |
| parent | 21fd78d97785b48bf746103e73913d28f75e3a39 (diff) | |
wctdm24xxp, wcte12xp: Advertise VPMOCT032 presence in dahdi_span.devicetype.
A "(VPMADT032)" string is appended to the devicetype (as shown by
dahdi_scan) for the span if one is installed. Now append '(VPMOCT032)'
if one is installed as well.
Also, for the wcte12xp driver append the VPM name to the device type after
initially probing as opposed to only after the span is configured.
(Related to issue DAHDI-890)
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10203
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10206 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 2 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 316d79d..f57d408 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -4354,6 +4354,8 @@ static void wctdm_fixup_analog_span(struct wctdm *wc, int spanno) continue; if (wc->vpmadt032) strncat(wc->spans[x]->span.devicetype, " (VPMADT032)", sizeof(wc->spans[x]->span.devicetype) - 1); + else if (wc->vpmoct) + strncat(wc->spans[x]->span.devicetype, " (VPMOCT032)", sizeof(wc->spans[x]->span.devicetype) - 1); } } diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 0d31350..ecee50f 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1022,9 +1022,13 @@ static void set_span_devicetype(struct t1 *wc) sizeof(wc->span.devicetype) - 1); #if defined(VPM_SUPPORT) - if (wc->vpmadt032) + if (wc->vpmadt032) { strncat(wc->span.devicetype, " (VPMADT032)", sizeof(wc->span.devicetype) - 1); + } else if (wc->vpmoct) { + strncat(wc->span.devicetype, " (VPMOCT032)", + sizeof(wc->span.devicetype) - 1); + } #endif } @@ -1660,6 +1664,8 @@ static void check_and_load_vpm(struct t1 *wc) vpmoct_init(vpmoct, t1_vpm_load_complete); } + + set_span_devicetype(wc); } #else static inline void check_and_load_vpm(const struct t1 *wc) |