[zaptel-commits] kpfleming: trunk r1328 - in /trunk: ./ wct4xxp_base.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Fri Aug 18 21:31:56 2006
New Revision: 1328

URL: http://svn.digium.com/view/zaptel?rev=1328&view=rev
Log:
Merged revisions 1327 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1327 | kpfleming | 2006-08-18 21:27:49 -0500 (Fri, 18 Aug 2006) | 2 lines

don't report the VPM servicing more spans than the card actually has

........

Modified:
    trunk/   (props changed)
    trunk/wct4xxp_base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Fri Aug 18 21:31:56 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317,1327

Modified: trunk/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp_base.c?rev=1328&r1=1327&r2=1328&view=diff
==============================================================================
--- trunk/wct4xxp_base.c (original)
+++ trunk/wct4xxp_base.c Fri Aug 18 21:31:56 2006
@@ -3149,7 +3149,7 @@
 	release_firmware(firmware);
 #endif
 	wc->vpm = T4_VPM_PRESENT;
-	printk("VPM450: Present and operational servicing %d span(s)\n", vpmspans);
+	printk("VPM450: Present and operational servicing %d span(s)\n", wc->numspans);
 		
 }
 
@@ -3285,7 +3285,7 @@
 			t4_vpm_out(wc, x, i, (x < 4) ? 0x55 : 0xAA);
 
 	} 
-	printk("VPM400%s: Present and operational servicing %d span(s)\n", (gen2vpm ? " (2nd Gen)" : ""), vpmspans);
+	printk("VPM400%s: Present and operational servicing %d span(s)\n", (gen2vpm ? " (2nd Gen)" : ""), wc->numspans);
 	wc->vpm = T4_VPM_PRESENT;
 }