diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-20 22:58:59 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-20 22:58:59 +0000 |
| commit | df240c3edeb9545a99eff3365fcfdb7d068d25a2 (patch) | |
| tree | 84a6e1ca13fd9fe79c210db430f0eeb69fd0105b | |
| parent | 6736314c3d77b59a52fcfd91c42e72f0cf300e38 (diff) | |
Merged revisions 2769 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2769 | mattf | 2007-07-20 17:57:30 -0500 (Fri, 20 Jul 2007) | 1 line
Make sure we use the new firmware interface
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2770 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | firmware/Makefile | 26 | ||||
| -rw-r--r-- | firmware/firmware.xml | 4 | ||||
| -rw-r--r-- | wctdm24xxp/base.c | 2 |
3 files changed, 31 insertions, 1 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index c214836..c439c45 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -20,6 +20,7 @@ PWD:=$(shell pwd) 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_URL:=http://ftp.digium.com/pub/telephony/firmware/releases 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 @@ else @echo "Firmware zaptel-fw-tc400m.bin is already installed with latest 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 diff --git a/firmware/firmware.xml b/firmware/firmware.xml index f7baa46..d2175a0 100644 --- a/firmware/firmware.xml +++ b/firmware/firmware.xml @@ -8,4 +8,8 @@ <member name="FIRMWARE-TC400M" displayname="TC400M Module Firmware" > <defaultenabled>yes</defaultenabled> </member> + <member name="FIRMWARE-VPMADT032" displayname="Digium VPMADT032" > + <defaultenabled>yes</defaultenabled> + <depend>wctdm24xxp</depend> + </member> </category> diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c index a1abe1d..6274cf4 100644 --- a/wctdm24xxp/base.c +++ b/wctdm24xxp/base.c @@ -287,7 +287,7 @@ static int vpmdtmfsupport = 0; #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); |