[zaptel-commits] file: branch file/zaptel-firmware r2081 - in
/team/file/zaptel-firmware: ./ f...
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Fri Feb 2 11:10:26 MST 2007
Author: file
Date: Fri Feb 2 12:10:26 2007
New Revision: 2081
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2081
Log:
Change octasic over to oct6114 so as to include the part number.
Modified:
team/file/zaptel-firmware/Makefile
team/file/zaptel-firmware/firmware/Makefile
team/file/zaptel-firmware/firmware/firmware.xml
team/file/zaptel-firmware/wct4xxp/Kbuild
team/file/zaptel-firmware/wct4xxp/Makefile
team/file/zaptel-firmware/wct4xxp/base.c
Modified: team/file/zaptel-firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/Makefile?view=diff&rev=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/Makefile (original)
+++ team/file/zaptel-firmware/Makefile Fri Feb 2 12:10:26 2007
@@ -160,7 +160,7 @@
endif
# Set this to override hotplug firmware loading and revert to classic header
-#HOTPLUG_FIRMWARE=no
+HOTPLUG_FIRMWARE=no
ifeq ($(HOTPLUG_FIRMWARE),yes)
CFLAGS+=-DHOTPLUG_FIRMWARE
endif
Modified: team/file/zaptel-firmware/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/firmware/Makefile?view=diff&rev=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/firmware/Makefile (original)
+++ team/file/zaptel-firmware/firmware/Makefile Fri Feb 2 12:10:26 2007
@@ -17,31 +17,31 @@
PWD:=$(shell pwd)
-OCTASIC_064_VERSION:=1.05.01
-OCTASIC_128_VERSION:=1.05.01
+OCT6114_064_VERSION:=1.05.01
+OCT6114_128_VERSION:=1.05.01
TC400M_VERSION:=MR5.6
FIRMWARE_URL:=http://ftp.digium.com/pub/telephony/firmware/releases
# Firmware files should use the naming convention: zaptel-fw-<base name>-<sub name>-<version> or zaptel-fw-<base name>-<version>
-# First example: zaptel-fw-octasic-064-6114
-# This means this is version 6114 of the octasic 64 firmware
-# Second example: zaptel-fw-tc400m-1
-# This means this is version 1 of the tc400m firmware
+# First example: zaptel-fw-oct6114-064-1.05.01
+# This means this is version 1.05.01 of the oct6114 64 firmware
+# Second example: zaptel-fw-tc400m-MR5.6
+# This means this is version MR5.6 of the tc400m firmware
# Build a list of firmware package filenames we need
-FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCTASIC-064=zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).tar.gz)
-FIRMWARE:=$(FIRMWARE:FIRMWARE-OCTASIC-128=zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).tar.gz)
+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)
# Build a list of object files if hotplug will not be used
-OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCTASIC-064=zaptel-fw-octasic-064.o)
-OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCTASIC-128=zaptel-fw-octasic-128.o)
+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)
# Build a list of firmware header files to include that give the current version of firmware
-HEADER_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCTASIC-064=zaptel-fw-octasic-064.h)
-HEADER_FILES:=$(HEADER_FILES:FIRMWARE-OCTASIC-128=zaptel-fw-octasic-128.h)
+HEADER_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.h)
+HEADER_FILES:=$(HEADER_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.h)
HEADER_FILES:=$(HEADER_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.h)
# If "fetch" is used, --continue is not a valid option.
@@ -103,31 +103,31 @@
rm -f $(INSTALL_PREFIX)/lib/firmware/zaptel-fw-*.bin; \
fi
-# Build object file of an octasic 064 firmware image for linking
-zaptel-fw-octasic-064.o: ../wct4xxp/base.o zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin
- @echo Making firmware object file for zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin
- @echo Temporarily copying to zaptel-fw-octasic-064.bin
- @cp zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin zaptel-fw-octasic-064.bin
- ../build_tools/make_firmware_object zaptel-fw-octasic-064.bin $@ ../wct4xxp/base.o
- @rm -f zaptel-fw-octasic-064.bin
+# Build object file of an oct6114 064 firmware image for linking
+zaptel-fw-oct6114-064.o: ../wct4xxp/base.o zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
+ @echo Making firmware object file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
+ @echo Temporarily copying to zaptel-fw-oct6114-064.bin
+ @cp zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin zaptel-fw-oct6114-064.bin
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o
+ @rm -f zaptel-fw-oct6114-064.bin
-# Build header file of an octasic 064 firmware image for inclusion
-zaptel-fw-octasic-064.h: zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin
- @echo Making firmware header file for zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin
- @echo "static const char *zaptel_fw_octasic_064 = \"zaptel-fw-octasic-064-$(OCTASIC_064_VERSION).bin\";" > $@
+# Build header file of an oct6114 064 firmware image for inclusion
+zaptel-fw-oct6114-064.h: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
+ @echo Making firmware header file for zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin
+ @echo "static const char *zaptel_fw_oct6114_064 = \"zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).bin\";" > $@
-# Build object file of an octasic 128 firmware image for linking
-zaptel-fw-octasic-128.o: ../wct4xxp/base.o zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin
- @echo Making firmware object file for zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin
- @echo Temporarily copying to zaptel-fw-octasic-128.bin
- @cp zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin zaptel-fw-octasic-128.bin
- ../build_tools/make_firmware_object zaptel-fw-octasic-128.bin $@ ../wct4xxp/base.o
- @rm -f zaptel-fw-octasic-128.bin
+# Build object file of an oct6114 128 firmware image for linking
+zaptel-fw-oct6114-128.o: ../wct4xxp/base.o zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
+ @echo Making firmware object file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
+ @echo Temporarily copying to zaptel-fw-oct6114-128.bin
+ @cp zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin zaptel-fw-oct6114-128.bin
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
+ @rm -f zaptel-fw-oct6114-128.bin
-# Build header file of an octasic 128 firmware image for inclusion
-zaptel-fw-octasic-128.h: zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin
- @echo Making firmware header file for zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin
- @echo "static const char *zaptel_fw_octasic_128 = \"zaptel-fw-octasic-128-$(OCTASIC_128_VERSION).bin\";" > $@
+# Build header file of an oct6114 128 firmware image for inclusion
+zaptel-fw-oct6114-128.h: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
+ @echo Making firmware header file for zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin
+ @echo "static const char *zaptel_fw_oct6114_128 = \"zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).bin\";" > $@
# Build object file of a TC400M firmware image for linking
zaptel-fw-tc400m.o:
Modified: team/file/zaptel-firmware/firmware/firmware.xml
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/firmware/firmware.xml?view=diff&rev=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/firmware/firmware.xml (original)
+++ team/file/zaptel-firmware/firmware/firmware.xml Fri Feb 2 12:10:26 2007
@@ -1,8 +1,8 @@
<category name="MENUSELECT_FIRMWARE" displayname="Binary Firmware Packages" positive_output="yes">
- <member name="FIRMWARE-OCTASIC-064" displayname="Octasic 064 Echo Cancellation Firmware" >
+ <member name="FIRMWARE-OCT6114-064" displayname="Oct6114 064 Echo Cancellation Firmware" >
<defaultenabled>yes</defaultenabled>
</member>
- <member name="FIRMWARE-OCTASIC-128" displayname="Octasic 128 Echo Cancellation Firmware" >
+ <member name="FIRMWARE-OCT6114-128" displayname="Oct6114 128 Echo Cancellation Firmware" >
<defaultenabled>yes</defaultenabled>
</member>
<member name="FIRMWARE-TC400M" displayname="TC400M Module Firmware" >
Modified: team/file/zaptel-firmware/wct4xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/Kbuild?view=diff&rev=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/Kbuild (original)
+++ team/file/zaptel-firmware/wct4xxp/Kbuild Fri Feb 2 12:10:26 2007
@@ -5,14 +5,14 @@
wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
ifneq ($(HOTPLUG_FIRMWARE),yes)
-wct4xxp-objs += ../firmware/zaptel-fw-octasic-064.o ../firmware/zaptel-fw-octasic-128.o
+wct4xxp-objs += ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-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-oct6114-064.o: $(obj)/base.o
+ $(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-064.o
-$(obj)/../firmware/zaptel-fw-octasic-128.o: $(obj)/base.o
- $(MAKE) -C $(obj)/../firmware zaptel-fw-octasic-128.o
+$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
+ $(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-128.o
$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
$(obj)/base.o: $(src)/../zaptel.h
Modified: team/file/zaptel-firmware/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/Makefile?view=diff&rev=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/Makefile (original)
+++ team/file/zaptel-firmware/wct4xxp/Makefile Fri Feb 2 12:10:26 2007
@@ -16,13 +16,13 @@
vpm450m.o: vpm450m.h ../oct612x/include/oct6100api/oct6100_api.h
-../firmware/zaptel-fw-octasic-064.o: base.o
- $(MAKE) -C ../firmware zaptel-fw-octasic-064.o
+../firmware/zaptel-fw-oct6114-064.o: base.o
+ $(MAKE) -C ../firmware zaptel-fw-oct6114-064.o
-../firmware/zaptel-fw-octasic-128.o: base.o
- $(MAKE) -C ../firmware zaptel-fw-octasic-128.o
+../firmware/zaptel-fw-oct6114-128.o: base.o
+ $(MAKE) -C ../firmware zaptel-fw-oct6114-128.o
-wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) ../firmware/zaptel-fw-octasic-064.o ../firmware/zaptel-fw-octasic-128.o
+wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS) ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
$(LD) -r -o $@ $^
clean:
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=2081&r1=2080&r2=2081
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Fri Feb 2 12:10:26 2007
@@ -48,8 +48,8 @@
#include "vpm450m.h"
#ifdef HOTPLUG_FIRMWARE
-#include "../firmware/zaptel-fw-octasic-064.h"
-#include "../firmware/zaptel-fw-octasic-128.h"
+#include "../firmware/zaptel-fw-oct6114-064.h"
+#include "../firmware/zaptel-fw-oct6114-128.h"
#endif
/*
@@ -3102,10 +3102,10 @@
struct firmware embedded_firmware;
const struct firmware *firmware = &embedded_firmware;
#if !defined(HOTPLUG_FIRMWARE)
- extern void _binary_zaptel_fw_octasic_064_bin_size;
- extern void _binary_zaptel_fw_octasic_128_bin_size;
- extern u8 _binary_zaptel_fw_octasic_064_bin_start[];
- extern u8 _binary_zaptel_fw_octasic_128_bin_start[];
+ extern void _binary_zaptel_fw_oct6114_064_bin_size;
+ extern void _binary_zaptel_fw_oct6114_128_bin_size;
+ extern u8 _binary_zaptel_fw_oct6114_064_bin_start[];
+ extern u8 _binary_zaptel_fw_oct6114_128_bin_start[];
#endif
if (!vpmsupport) {
@@ -3135,38 +3135,38 @@
switch ((vpm_capacity = get_vpm450m_capacity(wc))) {
case 64:
#if defined(HOTPLUG_FIRMWARE)
- if ((request_firmware(&firmware, zaptel_fw_octasic_064, &wc->dev->dev) != 0) ||
+ if ((request_firmware(&firmware, zaptel_fw_oct6114_064, &wc->dev->dev) != 0) ||
!firmware) {
- printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_octasic_064);
+ printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_064);
return;
}
#else
- embedded_firmware.data = _binary_zaptel_fw_octasic_064_bin_start;
+ embedded_firmware.data = _binary_zaptel_fw_oct6114_064_bin_start;
/* Yes... this is weird. objcopy gives us a symbol containing
the size of the firmware, not a pointer a variable containing
the size. The only way we can get the value of the symbol
is to take its address, so we define it as a pointer and
then cast that value to the proper type.
*/
- embedded_firmware.size = (size_t) &_binary_zaptel_fw_octasic_064_size;
+ embedded_firmware.size = (size_t) &_binary_zaptel_fw_oct6114_064_bin_size;
#endif
break;
case 128:
#if defined(HOTPLUG_FIRMWARE)
- if ((request_firmware(&firmware, zaptel_fw_octasic_128, &wc->dev->dev) != 0) ||
+ if ((request_firmware(&firmware, zaptel_fw_oct6114_128, &wc->dev->dev) != 0) ||
!firmware) {
- printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_octasic_128);
+ printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_128);
return;
}
#else
- embedded_firmware.data = _binary_zaptel_fw_octasic_128_bin_start;
+ embedded_firmware.data = _binary_zaptel_fw_oct6114_128_bin_start;
/* Yes... this is weird. objcopy gives us a symbol containing
the size of the firmware, not a pointer a variable containing
the size. The only way we can get the value of the symbol
is to take its address, so we define it as a pointer and
then cast that value to the proper type.
*/
- embedded_firmware.size = (size_t) &_binary_zaptel_fw_octasic_128_size;
+ embedded_firmware.size = (size_t) &_binary_zaptel_fw_oct6114_128_bin_size;
#endif
break;
default:
More information about the zaptel-commits
mailing list