From 8ef4ae608415a09c077cdd022a55e4ed7b1398a3 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 23 Sep 2011 20:23:43 +0000 Subject: 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 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 --- drivers/dahdi/wctdm24xxp/base.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/dahdi/wctdm24xxp') 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); } } -- cgit v1.2.3