[svn-commits] kpfleming: trunk r1888 - in /trunk: ./ wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 14:59:32 2007
New Revision: 1888

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1888
Log:
Merged revisions 1887 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1887 | kpfleming | 2007-01-22 14:59:03 -0600 (Mon, 22 Jan 2007) | 10 lines

Merged revisions 1886 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1886 | kpfleming | 2007-01-22 14:58:30 -0600 (Mon, 22 Jan 2007) | 2 lines

might be good if i committed the working version of this code...

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Jan 22 14:59:32 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=1888&r1=1887&r2=1888
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Mon Jan 22 14:59:32 2007
@@ -3103,6 +3103,7 @@
 	unsigned int check1, check2;
 	int laws[4] = { 0, };
 	int x;
+	unsigned int vpm_capacity;
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
@@ -3136,7 +3137,7 @@
 			laws[x] = 1;
 	}
 
-	switch (get_vpm450m_capacity(wc)) {
+	switch ((vpm_capacity = get_vpm450m_capacity(wc))) {
 	case 64:
 #if defined(HOTPLUG_FIRMWARE)
 		if ((request_firmware(&firmware, oct064_firmware, &wc->dev->dev) != 0) ||
@@ -3148,6 +3149,7 @@
 		embedded_firmware.data = _binary_OCT6114D_64D_ima_start;
 		embedded_firmware.size = _binary_OCT6114D_64D_ima_start;
 #endif
+		break;
 	case 128:
 #if defined(HOTPLUG_FIRMWARE)
 		if ((request_firmware(&firmware, oct128_firmware, &wc->dev->dev) != 0) ||
@@ -3159,8 +3161,9 @@
 		embedded_firmware.data = _binary_OCT6114D_128D_ima_start;
 		embedded_firmware.size = _binary_OCT6114D_128D_ima_start;
 #endif
+		break;
 	default:
-		printk("Unsupported channel capacity found on VPM module.\n");
+		printk("Unsupported channel capacity found on VPM module (%d).\n", vpm_capacity);
 		return;
 	}