[dahdi-commits] sruffell: linux/trunk r10203 - in /linux/trunk/drivers/dahdi: wctdm24xxp/ wct...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Fri Sep 23 15:18:21 2011
New Revision: 10203

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10203
Log:
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 at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10203&r1=10202&r2=10203
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Fri Sep 23 15:18:21 2011
@@ -4595,6 +4595,8 @@
 			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);
 	}
 }
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=10203&r1=10202&r2=10203
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Fri Sep 23 15:18:21 2011
@@ -1022,9 +1022,13 @@
 		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 @@
 
 		vpmoct_init(vpmoct, t1_vpm_load_complete);
 	}
+
+	set_span_devicetype(wc);
 }
 #else
 static inline void check_and_load_vpm(const struct t1 *wc)