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

[zaptel-commits at lists.digium.com]

Author: file
Date: Fri Jan 19 12:03:19 2007
New Revision: 1867

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1867
Log:
Add support for embedding firmware via object files under the 2.6 kernel

Modified:
    team/file/zaptel-firmware/wct4xxp/Kbuild
    team/file/zaptel-firmware/wct4xxp/vpm450m.c

Modified: team/file/zaptel-firmware/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/Kbuild?view=diff&rev=1867&r1=1866&r2=1867
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/Kbuild (original)
+++ team/file/zaptel-firmware/wct4xxp/Kbuild Fri Jan 19 12:03:19 2007
@@ -8,6 +8,12 @@
 wct4xxp-objs += ../firmware/zaptel-fw-octasic-064.o ../firmware/zaptel-fw-octasic-128.o
 endif
 
+$(obj)/../firmware/zaptel-fw-octasic-064.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-octasic-064.o
+
+$(obj)/../firmware/zaptel-fw-octasic-128.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-octasic-128.o
+
 $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
 $(obj)/base.o: $(src)/../zaptel.h
 

Modified: team/file/zaptel-firmware/wct4xxp/vpm450m.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/vpm450m.c?view=diff&rev=1867&r1=1866&r2=1867
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/vpm450m.c (original)
+++ team/file/zaptel-firmware/wct4xxp/vpm450m.c Fri Jan 19 12:03:19 2007
@@ -406,17 +406,17 @@
 	ChipOpen.ulImageSize = firmware->size;
 #else
 	if (vpm450m->numchans > 64) {
-		extern const unsigned char _binary_OCT6114_128D_ima_start[];
-		extern const unsigned int _binary_OCT6114_128D_ima_size;
-
-		ChipOpen.pbyImageFile = _binary_OCT6114_128D_ima_start;
-		ChipOpen.ulImageSize = _binary_OCT6114_128D_ima_size;
+		extern const unsigned char _binary_zaptel_fw_octasic_128_bin_start[];
+		extern const unsigned int _binary_zaptel_fw_octasic_128_bin_size;
+
+		ChipOpen.pbyImageFile = _binary_zaptel_fw_octasic_128_bin_start;
+		ChipOpen.ulImageSize = _binary_zaptel_fw_octasic_128_bin_size;
 	} else {
-		extern const unsigned char _binary_OCT6114_64D_ima_start[];
-		extern const unsigned int _binary_OCT6114_64D_ima_size;
-
-		ChipOpen.pbyImageFile = _binary_OCT6114_64D_ima_start;
-		ChipOpen.ulImageSize = _binary_OCT6114_64D_ima_size;
+		extern const unsigned char _binary_zaptel_fw_octasic_064_bin_start[];
+		extern const unsigned int _binary_zaptel_fw_octasic_064_bin_size;
+
+		ChipOpen.pbyImageFile = _binary_zaptel_fw_octasic_064_bin_start;
+		ChipOpen.ulImageSize = _binary_zaptel_fw_octasic_064_bin_size;
 	}
 #endif