[dahdi-commits] sruffell: branch linux/2.5 r10211 - /linux/branches/2.5/drivers/dahdi/wctdm24...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Tue Sep 27 17:10:34 2011
New Revision: 10211

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10211
Log:
wctdm24xxp: Set dahdi_span.devicetype string in one place.

Currently the devicetype string was set both when the device was first
allocated and updated when an echocanceler was detected. For simplicity,
combine both these steps into a single function.

This change also replaces an improper use of strncat with strlcat.

Additionally, on the 2.5 branch, this change actually makes r10206
"wctdm24xxp, wcte12xp: Advertise VPMOCT032 presence in
dahdi_span.devicetype",  work the way it was originally intended. That
change was only functioning properly previously on trunk.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10210

Modified:
    linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c

Modified: linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10211&r1=10210&r2=10211
==============================================================================
--- linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c Tue Sep 27 17:10:34 2011
@@ -4242,7 +4242,6 @@
 		 (wc->desc->flags & FLAG_EXPRESS) ? " Express" : "",
 		 pdev->bus->number, PCI_SLOT(pdev->devfn) + 1);
 	s->span.manufacturer = "Digium";
-	strncpy(s->span.devicetype, wc->desc->name, sizeof(s->span.devicetype) - 1);
 
 	if (wc->companding == DAHDI_LAW_DEFAULT) {
 		if (wc->digi_mods || digital_span)
@@ -4347,15 +4346,6 @@
 		} else {
 			s->chans[y++]->sigcap = 0;
 		}
-	}
-
-	for (x = 0; x < MAX_SPANS; x++) {
-		if (!wc->spans[x])
-			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);
 	}
 }
 
@@ -5270,6 +5260,27 @@
 	spin_unlock_irqrestore(&wc->reglock, flags);
 }
 
+static void set_span_devicetype_string(struct wctdm *wc)
+{
+	unsigned int x;
+
+	for (x = 0; x < ARRAY_SIZE(wc->spans); x++) {
+		struct dahdi_span *const s = &wc->spans[x]->span;
+		if (!s)
+			continue;
+
+		strlcpy(s->devicetype, wc->desc->name, sizeof(s->devicetype));
+
+		if (wc->vpmadt032) {
+			strlcat(s->devicetype, " (VPMADT032)",
+				sizeof(s->devicetype));
+		} else if (wc->vpmoct) {
+			strlcat(s->devicetype, " (VPMOCT032)",
+				sizeof(s->devicetype));
+		}
+	}
+}
+
 #ifdef USE_ASYNC_INIT
 struct async_data {
 	struct pci_dev *pdev;
@@ -5524,6 +5535,8 @@
 	wc->avchannels = curchan;
 
 	wctdm_initialize_vpm(wc);
+
+	set_span_devicetype_string(wc);
 
 #ifdef USE_ASYNC_INIT
 		async_synchronize_cookie(cookie);