[svn-commits] mogorman: branch mogorman/zaptel-1.2-transcoder r1851
- in /team/mogorman/zap...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Jan 18 13:48:12 MST 2007
Author: mogorman
Date: Thu Jan 18 14:48:11 2007
New Revision: 1851
URL: http://svn.digium.com/view/zaptel?view=rev&rev=1851
Log:
wctc4xxb lives!
Added:
team/mogorman/zaptel-1.2-transcoder/wctc4xxb/wctc4xxb_firm.bin
- copied unchanged from r1850, team/mogorman/zaptel-1.2-transcoder/wctc4xxb/dte_firm.bin
Removed:
team/mogorman/zaptel-1.2-transcoder/wctc4xxb/dte_firm.bin
Modified:
team/mogorman/zaptel-1.2-transcoder/Makefile
team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Kbuild
team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Makefile
team/mogorman/zaptel-1.2-transcoder/wctc4xxb/base.c
Modified: team/mogorman/zaptel-1.2-transcoder/Makefile
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/Makefile?view=diff&rev=1851&r1=1850&r2=1851
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/Makefile (original)
+++ team/mogorman/zaptel-1.2-transcoder/Makefile Thu Jan 18 14:48:11 2007
@@ -118,8 +118,8 @@
MOD_DESTDIR:=zaptel
obj-m:=$(MODULESO)
-obj-m+=wct4xxp ztcodec_dte/
-MODULES+=wct4xxp ztcodec_dte
+obj-m+=wct4xxp wctc4xxb/
+MODULES+=wct4xxp wctc4xxb
# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only
# for i386. On other archs the module will probably build but panic.
@@ -154,8 +154,8 @@
wct4xxp/wct4xxp.o:
$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-ztcodec_dte/ztcodec_dte.o:
- $(MAKE) -C ztcodec_dte KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+wctc4xxb/wctc4xxb.o:
+ $(MAKE) -C wctc4xxb KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
devel: tor2ee
@@ -336,7 +336,7 @@
for x in $(MODULESO) wct4xxp/wct4xxp.o; do \
install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
done;
- for x in $(MODULESO) ztcodec_dte/ztcodec_dte.o; do \
+ for x in $(MODULESO) wctc4xxb/wctc4xxb.o; do \
install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
done;
@@ -371,11 +371,11 @@
ifeq ($(HOTPLUG_FIRMWARE),yes)
if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
- install -m 644 ztcodec_dte/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+ install -m 644 wctc4xxb/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
fi
if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/lib/firmware; \
- install -m 644 ztcodec_dte/*.bin $(INSTALL_PREFIX)/lib/firmware; \
+ install -m 644 wctc4xxb/*.bin $(INSTALL_PREFIX)/lib/firmware; \
fi
@echo "Installed firmware"
else
@@ -423,7 +423,7 @@
$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
else
$(MAKE) -C wct4xxp clean
- $(MAKE) -C ztcodec_dte clean
+ $(MAKE) -C wctc4xxb clean
endif
rm -rf .tmp_versions
rm -f gendigits tones.h
Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Kbuild
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Kbuild?view=diff&rev=1851&r1=1850&r2=1851
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Kbuild (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Kbuild Thu Jan 18 14:48:11 2007
@@ -1,15 +1,15 @@
-obj-m += ztcodec_dte.o
+obj-m += wctc4xxb.o
EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
-ztcodec_dte-objs := base.o
+wctc4xxb-objs := base.o
ifneq ($(HOTPLUG_FIRMWARE),yes)
-ztcodec_dte-objs += firmware_dte.o
+wctc4xxb-objs += firmware_wctc4xxb.o
endif
$(obj)/base.o: $(src)/../zaptel.h
-$(obj)/firmware_dte.o: $(src)/dte_firm.bin $(obj)/base.o
+$(obj)/firmware_wctc4xxb.o: $(src)/wctc4xxb_firm.bin $(obj)/base.o
@echo Making firmware object file for $(notdir $<)
@cd $(src) && ../build_tools/make_firmware_object $(notdir $<) $@ $(obj)/base.o
Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Makefile
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Makefile?view=diff&rev=1851&r1=1850&r2=1851
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Makefile (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxb/Makefile Thu Jan 18 14:48:11 2007
@@ -4,7 +4,7 @@
else
-all: ztcodec_dte.o
+all: wctc4xxb.o
%.o: %.c
$(CC) $(KFLAGS) -o $@ -c $<
@@ -12,11 +12,11 @@
base.o: ../zaptel.h
-firmware_dte.o: dte_firm.bin base.o
+firmware_wctc4xxb.o: wctc4xxb_firm.bin base.o
@echo Making firmware object file for $<
../build_tools/make_firmware_object $< $@ base.o
-ztcodec_dte.o: base.o firmware_dte.o
+wctc4xxb.o: base.o firmware_wctc4xxb.o
$(LD) -r -o $@ $^
clean:
Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxb/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxb/base.c?view=diff&rev=1851&r1=1850&r2=1851
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxb/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxb/base.c Thu Jan 18 14:48:11 2007
@@ -52,10 +52,10 @@
#include <linux/moduleparam.h>
#ifdef HOTPLUG_FIRMWARE
#include <linux/firmware.h>
-static const char *dte_firmware = "dte_firm.bin";
+static const char *dte_firmware = "wctc4xxb_firm.bin";
#else
-extern const unsigned char _binary_dte_firm_bin_start[];
-extern const unsigned int _binary_dte_firm_bin_size;
+extern const unsigned char _binary_wctc4xxb_firm_bin_start[];
+extern const unsigned int _binary_wctc4xxb_firm_bin_size;
#endif
@@ -1440,7 +1440,7 @@
{
last_byteloc = byteloc;
- length = (_binary_dte_firm_bin_start[byteloc] << 8) | _binary_dte_firm_ima_start[byteloc+1];
+ length = (_binary_wctc4xxb_firm_bin_start[byteloc] << 8) | _binary_dte_firm_ima_start[byteloc+1];
byteloc += 2;
down(&wc->cmdqsem);
@@ -1450,7 +1450,7 @@
{
wc->cmdq[wc->cmdq_wndx].cmdlen = length;
for (i = 0; i < length; i++)
- wc->cmdq[wc->cmdq_wndx].cmd[i] = _binary_dte_firm_bin_start[byteloc++];
+ wc->cmdq[wc->cmdq_wndx].cmd[i] = _binary_wctc4xxb_firm_bin_start[byteloc++];
wc->cmdq_wndx = (wc->cmdq_wndx + 1) % MAX_COMMANDS;
}
@@ -1464,7 +1464,7 @@
byteloc = last_byteloc;
j++;
- } while (byteloc < _binary_dte_firm_bin_size-20);
+ } while (byteloc < _binary_wctc4xxb_firm_bin_size-20);
#endif
wc->timeout = 10 * HZ;
if (wcdte_waitfor_csmencaps(wc, RCV_CSMENCAPS, 1))
@@ -1663,9 +1663,9 @@
g729_numchannels = firmware->data[1];
g723_numchannels = firmware->data[2];
#else
- dte_firmware_ver = _binary_dte_firm_bin_start[0];
- g729_numchannels = _binary_dte_firm_bin_start[1];
- g723_numchannels = _binary_dte_firm_bin_start[2];
+ dte_firmware_ver = _binary_wctc4xxb_firm_bin_start[0];
+ g729_numchannels = _binary_wctc4xxb_firm_bin_start[1];
+ g723_numchannels = _binary_wctc4xxb_firm_bin_start[2];
#endif
if (g723_numchannels < g729_numchannels)
@@ -1900,7 +1900,7 @@
MODULE_DEVICE_TABLE(pci, wcdte_pci_tbl);
static struct pci_driver wcdte_driver = {
- name: "ztcodec_dte",
+ name: "wctc4xxb",
probe: wcdte_init_one,
remove: __devexit_p(wcdte_remove_one),
suspend: NULL,
@@ -1927,7 +1927,7 @@
module_param(debug, int, 0600);
module_param(mode, charp, 0600);
-MODULE_DESCRIPTION("Zaptel DTE (G.729/G.723) Transcoder Support");
+MODULE_DESCRIPTION("Wildcard Transcoder 400B (G.729/G.723) Transcoder Support");
MODULE_AUTHOR("John Sloan <jsloan at digium.com>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
More information about the svn-commits
mailing list