[zaptel-commits] file: branch 1.4 r2671 - in /branches/1.4: firmware/ wctc4xxp/

[SVN commits to the Zaptel project]

Author: file
Date: Mon Jul  2 08:46:37 2007
New Revision: 2671

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2671
Log:
Nobody ever updated the wctc4xxp stuff to use the in-tree firmware management stuff... 'tsk 'tsk. (issue #10093 reported by snuffy)

Removed:
    branches/1.4/wctc4xxp/tc400m-firmware.bin
Modified:
    branches/1.4/firmware/Makefile
    branches/1.4/wctc4xxp/Makefile.kernel26
    branches/1.4/wctc4xxp/base.c

Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=2671&r1=2670&r2=2671
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Mon Jul  2 08:46:37 2007
@@ -165,4 +165,6 @@
 	../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
 
 # Build object file of a TC400M firmware image for linking
-zaptel-fw-tc400m.o:
+zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz ../wctc4xxp/base.o zaptel-fw-tc400m.bin
+	@echo Making firmware object file for zaptel-fw-tc400m.bin
+	../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ ../wctc4xxp/base.o

Modified: branches/1.4/wctc4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/Makefile.kernel26?view=diff&rev=2671&r1=2670&r2=2671
==============================================================================
--- branches/1.4/wctc4xxp/Makefile.kernel26 (original)
+++ branches/1.4/wctc4xxp/Makefile.kernel26 Mon Jul  2 08:46:37 2007
@@ -5,11 +5,10 @@
 wctc4xxp-objs := base.o 
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
-wctc4xxp-objs += firmware_tc400m.o
+wctc4xxp-objs += ../firmware/zaptel-fw-tc400m.o
 endif
 
 $(obj)/base.o: $(src)/../zaptel.h
 
-$(obj)/firmware_tc400m.o: $(src)/tc400m-firmware.bin $(obj)/base.o
-	@echo Making firmware object file for $(notdir $<)
-	@cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o
+$(obj)/../firmware/zaptel-fw-tc400m.o: $(obj)/base.o
+	$(MAKE) -C $(obj)/../firmware zaptel-fw-tc400m.o

Modified: branches/1.4/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/base.c?view=diff&rev=2671&r1=2670&r2=2671
==============================================================================
--- branches/1.4/wctc4xxp/base.c (original)
+++ branches/1.4/wctc4xxp/base.c Mon Jul  2 08:46:37 2007
@@ -53,10 +53,7 @@
 #endif
 
 #ifdef HOTPLUG_FIRMWARE
-static const char *dte_firmware = "tc400m-firmware.bin";
-#else
-extern u8 _binary_tc400m_firmware_bin_start[];
-extern void _binary_tc400m_firmware_bin_size;
+static const char *dte_firmware = "zaptel-fw-tc400m.bin";
 #endif
 
 
@@ -1508,6 +1505,10 @@
 	static int initd_ifaces=0;
 	unsigned char g729_numchannels, g723_numchannels, min_numchannels, dte_firmware_ver;
 	unsigned int complexfmts;
+#if !defined(HOTPLUG_FIRMWARE)
+	extern void _binary_zaptel_fw_tc400m_bin_size;
+	extern u8 _binary_zaptel_fw_tc400m_bin_start[];
+#endif
 	struct firmware embedded_firmware = {
 #if !defined(HOTPLUG_FIRMWARE)
 		/* Yes... this is weird. objcopy gives us a symbol containing
@@ -1516,8 +1517,8 @@
 		   is to take its address, so we define it as a pointer and
 		   then cast that value to the proper type.
 		*/
-		.size = (size_t) &_binary_tc400m_firmware_bin_size,
-		.data = _binary_tc400m_firmware_bin_start,
+		.size = (size_t) &_binary_zaptel_fw_tc400m_bin_size,
+		.data = _binary_zaptel_fw_tc400m_bin_start,
 #endif
 	};
 	const struct firmware *firmware = &embedded_firmware;