[zaptel-commits] kpfleming: branch 1.2 r1886 - /branches/1.2/wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 14:58:30 2007
New Revision: 1886

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1886
Log:
might be good if i committed the working version of this code...

Modified:
    branches/1.2/wct4xxp/base.c

Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=1886&r1=1885&r2=1886
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Mon Jan 22 14:58:30 2007
@@ -2675,6 +2675,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)
@@ -2708,7 +2709,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) ||
@@ -2720,6 +2721,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) ||
@@ -2731,8 +2733,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;
 	}