[zaptel-commits] kpfleming: branch 1.4 r3284 - /branches/1.4/wct4xxp/base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Tue Dec  4 09:01:51 2007
New Revision: 3284

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3284
Log:
when reporting devicetype for TE2xx and TE4xx cards, include the presence or absence of a VPM in the result

Modified:
    branches/1.4/wct4xxp/base.c

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=3284&r1=3283&r2=3284
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Tue Dec  4 09:01:51 2007
@@ -1534,6 +1534,15 @@
 			 "T%dXXP (PCI) Card %d Span %d", wc->numspans, wc->num, x+1);
 		ts->span.manufacturer = "Digium";
 		strncpy(ts->span.devicetype, wc->variety, sizeof(ts->span.devicetype) - 1);
+		if (wc->vpm == T4_VPM_PRESENT) {
+			if (!wc->vpm450m)
+				strncat(ts->span.devicetype, " with VPM400M", sizeof(ts->span.devicetype) - 1);
+			else
+				strncat(ts->span.devicetype, (wc->numspans > 2) ? " with VPMOCT128" : " with VPMOCT064",
+					sizeof(ts->span.devicetype) - 1);
+		}
+		snprintf(ts->span.devicetype, sizeof(ts->span.devicetype) - 1, "%s%s", wc->variety,
+			 (wc->vpm != T4_VPM_PRESENT) ? "" : (wc->vpm450m) ? " with VPM450M" : "with VPM400M");
 		snprintf(ts->span.location, sizeof(ts->span.location) - 1,
 			 "PCI%sBus %02d Slot %02d", ts->spanflags & FLAG_EXPRESS ? " Express" : " ",
 			 wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1);