Author: mattf
Date: Fri Jul 20 17:57:30 2007
New Revision: 2769
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2769
Log:
Make sure we use the new firmware interface
Modified:
branches/1.4/firmware/Makefile
branches/1.4/firmware/firmware.xml
branches/1.4/wctdm24xxp/base.c
Modified: branches/1.4/firmware/Makefile
URL:
http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=2769&r1=2768&r2=2769
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Fri Jul 20 17:57:30 2007
@@ -20,6 +20,7 @@
OCT6114_064_VERSION:=1.05.01
OCT6114_128_VERSION:=1.05.01
TC400M_VERSION:=MR5.6
+VPMADT032_VERSION:=1.07
FIRMWARE_URL:=http://ftp.digium.com/pub/telephony/firmware/releases
@@ -33,11 +34,13 @@
FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz)
+FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz)
# Build a list of object files if hotplug will not be used
OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o)
+#OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o)
# If "fetch" is used, --continue is not a valid option.
ifeq ($(WGET),wget)
@@ -128,6 +131,29 @@
@echo "Firmware zaptel-fw-tc400m.bin is already installed with required
version $(TC400M_VERSION)"
endif
+zaptel-fw-vpmadt032-%.tar.gz: have_download
+ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" == "no" ] ) || ( [ -d
$(INSTALL_PREFIX)/usr/lib/hotplug/firmware ] && ! [ -f
$(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION)
] ) || ( [ -d $(INSTALL_PREFIX)/lib/firmware ] && ! [ -f
$(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] );
then echo "yes"; else echo "no"; fi),yes)
+ @echo "Attempting to download $@"
+ @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi;
+ if test ! -f $@; then exit 1; fi; \
+ (cat $@ | gzip -d | tar -xf -)
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+ @echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware
directories"
+ if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
+ $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin
$(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+ rm -rf
$(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-*; \
+ touch
$(INSTALL_PREFIX)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION);
\
+ fi
+ if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
+ $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin
$(INSTALL_PREFIX)/lib/firmware; \
+ rm -rf $(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-*; \
+ touch
$(INSTALL_PREFIX)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \
+ fi
+endif
+else
+ @echo "Firmware zaptel-fw-vpmadt032.bin is already installed with
required version $(VPMADT032_VERSION)"
+endif
+
# Clean up any downloaded/extracted firmware packages
dist-clean: clean
rm -f zaptel-fw-*.bin
Modified: branches/1.4/firmware/firmware.xml
URL:
http://svn.digium.com/view/zaptel/branches/1.4/firmware/firmware.xml?view=diff&rev=2769&r1=2768&r2=2769
==============================================================================
--- branches/1.4/firmware/firmware.xml (original)
+++ branches/1.4/firmware/firmware.xml Fri Jul 20 17:57:30 2007
@@ -11,4 +11,8 @@
<defaultenabled>yes</defaultenabled>
<depend>wctc4xxp</depend>
</member>
+ <member name="FIRMWARE-VPMADT032" displayname="Digium
VPMADT032" >
+ <defaultenabled>yes</defaultenabled>
+ <depend>wctdm24xxp</depend>
+ </member>
</category>
Modified: branches/1.4/wctdm24xxp/base.c
URL:
http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=2769&r1=2768&r2=2769
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Jul 20 17:57:30 2007
@@ -287,7 +287,7 @@
#define VPM_DEFAULT_DTMFTHRESHOLD 1250
static int dtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD;
-static const char *vpm150m_firmware = "VPMADT032.bin";
+static const char *vpm150m_firmware = "zaptel-fw-vpmadt032.bin";
#endif
static int wctdm_init_proslic(struct wctdm *wc, int card, int fast , int
manual, int sane);
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
