[zaptel-commits] file: branch file/zaptel-firmware r1860 - /team/file/zaptel-firmware/wct4xxp/

[zaptel-commits at lists.digium.com]

Author: file
Date: Fri Jan 19 00:32:15 2007
New Revision: 1860

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1860
Log:
We might as well use the firmware headers since they are being created now.

Modified:
    team/file/zaptel-firmware/wct4xxp/base.c

Modified: team/file/zaptel-firmware/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/base.c?view=diff&rev=1860&r1=1859&r2=1860
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Fri Jan 19 00:32:15 2007
@@ -50,8 +50,8 @@
 #include "vpm450m.h"
 
 #ifdef HOTPLUG_FIRMWARE
-static const char *oct064_firmware = "OCT6114-64D.ima";
-static const char *oct128_firmware = "OCT6114-128D.ima";
+#include "../firmware/zaptel-fw-octasic-064.h"
+#include "../firmware/zaptel-fw-octasic-128.h"
 #endif
 
 /*
@@ -3138,9 +3138,9 @@
 		   a 128-channel Octasic module
 		*/
 		if (wc->numspans < 3) {
-			if ((request_firmware(&firmware, oct064_firmware, &wc->dev->dev) != 0) ||
+			if ((request_firmware(&firmware, zaptel_fw_octasic_064, &wc->dev->dev) != 0) ||
 			    !firmware) {
-				printk("VPM450: firmware %s not available from userspace\n", oct064_firmware);
+				printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_octasic_064);
 				return;
 			} else {
 				if ((wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware)))
@@ -3151,9 +3151,9 @@
 		}
 
 		if (!passedinit) {
-			if ((request_firmware(&firmware, oct128_firmware, &wc->dev->dev) != 0) ||
+			if ((request_firmware(&firmware, zaptel_fw_octasic_128, &wc->dev->dev) != 0) ||
 			    !firmware) {
-				printk("VPM450: firmware %s not available from userspace\n", oct128_firmware);
+				printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_octasic_128);
 				return;
 			} else {
 				if ((wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware)))