[Pkg-voip-commits] r3483 - in zaptel/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Wed Apr 25 23:08:19 UTC 2007
Author: msp
Date: 2007-04-25 23:08:19 +0000 (Wed, 25 Apr 2007)
New Revision: 3483
Removed:
zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
zaptel/trunk/debian/patches/Makefile_deps_utils.dpatch
zaptel/trunk/debian/patches/Makefile_hostcc.dpatch
zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
zaptel/trunk/debian/patches/Makefile_targets.dpatch
zaptel/trunk/debian/patches/Makefile_uname.dpatch
zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
zaptel/trunk/debian/patches/bristuff.dpatch
zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
zaptel/trunk/debian/patches/dbug391840.dpatch
zaptel/trunk/debian/patches/echocan_env.dpatch
zaptel/trunk/debian/patches/sangoma.dpatch
zaptel/trunk/debian/patches/ukcid.dpatch
zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
Modified:
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/00list
Log:
* Cleanup debian/patches/
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/changelog 2007-04-25 23:08:19 UTC (rev 3483)
@@ -9,8 +9,9 @@
- No mention of wcfxs -> wctdm module rename (Closes: #419161)
- Missing modutils/modprobe rules for wctdm (Closes: #419162)
* provide debian/compat fixes lintian: debian-rules-sets-DH_COMPAT
+ * Cleanup debian/patches/
- -- Mark Purcell <msp at debian.org> Thu, 26 Apr 2007 09:06:01 +1000
+ -- Mark Purcell <msp at debian.org> Thu, 26 Apr 2007 09:07:48 +1000
zaptel (1:1.4.1~dfsg-3) unstable; urgency=low
Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/00list 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,17 +1,2 @@
-#Makefile_deps_utils
-#Makefile_uname
-#Makefile_targets
-#Makefile_kbuild
-# probably depends on previus Makefile_* patches (specifically: Makefile_targets)
-#Makefile_bristuff
-# touches the Makefile as well:
-#echocan_env
-#ukcid
-#bristuff
-#bristuff_local_zaptelh
-#Makefile_vzaphfc.dpatch
-#wct4xxp-dfsg.dpatch
-#dbug391840.dpatch
-#Makefile_hostcc
ztdiag
zaptel_perl
Deleted: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_bristuff.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_bristuff.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_bristuff.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: A bit of extra Makefile changes to build bristuff
-## DP: Also adds two unrelated modules: opvxa1200
-
- at DPATCH@
-diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
---- zaptel-1.2.9.1.dfsg~/Makefile 2006-09-23 13:48:37.000000000 +0100
-+++ zaptel-1.2.9.1.dfsg/Makefile 2006-09-23 13:48:37.000000000 +0100
-@@ -129,6 +129,11 @@
- MODULES+=ztdummy
- endif
-
-+BRIMODS=cwain qozap zaphfc ztgsm
-+MODULES+=$(BRIMODS)
-+MODULES+=opvxa1200
-+BINS+=ztpty
-+
- MODULESO:=$(MODULES:%=%.o)
- MODULESKO:=$(MODULES:%=%.ko)
- ifeq ($(BUILDVER),linux26)
-@@ -164,6 +169,8 @@
- usbfxstest fxstest fxotune fxsdump ztdiag
- UTILSO:=$(UTILS:%=%.o)
-
-+BINS+=ztpty
-+
- all: modules $(LIBTONEZONE_SO)
-
- programs: $(BINS) $(LIBTONEZONE_SO)
-@@ -209,6 +216,28 @@
-
- ztdummy.o: ztdummy.h
-
-+$(BRIMODS:%=%.o): %.o: %.h
-+ifneq (,$(wildcard /usr/src/modules/rtai/base/include/rtai.h))
-+zaphfc.o: KFLAGS+=-DRTAITIMING \
-+ -I/usr/src/modules/rtai/base/include -I/usr/src/modules/rtai
-+endif
-+# copy the zaptel modules to current directory before building modules:
-+prereq: $(BRIMODS:%=%.c) $(BRIMODS:%=%.h)
-+
-+# copy bristuff files from subdirectories
-+# provide zaphfc.[ch] from zaphfc/zaphfc.[ch] etc. Any better way?
-+ztgsm.%: ztgsm/ztgsm.%
-+ cp $^ $@
-+
-+zaphfc.%: zaphfc/zaphfc.%
-+ cp $^ $@
-+
-+qozap.%: qozap/qozap.%
-+ cp $^ $@
-+
-+cwain.%: cwain/cwain.%
-+ cp $^ $@
-+
- $(MODULESO): %.o: %.c zaptel.h
- $(CC) $(KFLAGS) -o $@ -c $<
-
Deleted: zaptel/trunk/debian/patches/Makefile_deps_utils.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_deps_utils.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_deps_utils.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_progdeps.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Clean dependencies and build flags of misc. utils
-## -- make specific, cannot be commited upstream.
-
- at DPATCH@
-diff -urNad zaptel-1.2.0-0beta1/Makefile /tmp/dpep.GxuAYU/zaptel-1.2.0-0beta1/Makefile
---- zaptel-1.2.0-0beta1/Makefile 2005-09-10 17:14:59.442470186 +0300
-+++ /tmp/dpep.GxuAYU/zaptel-1.2.0-0beta1/Makefile 2005-09-10 18:43:28.224686623 +0300
-@@ -109,7 +109,10 @@
- ifneq (,$(wildcard /usr/include/newt.h))
- ZTTOOL:=zttool
- endif
--BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
-+BINS:=ztcfg ztmonitor ztspeed $(ZTTOOL) zttest fxotune
-+UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
-+ usbfxstest fxstest fxotune fxsdump ztdiag
-+UTILSO:=$(UTILS:%=%.o)
-
- #PRIMARY=wcfxsusb
- PRIMARY=torisa
-@@ -173,8 +176,7 @@
-
- tor2ee.o: tor2-hw.h
-
--tor2ee: tor2ee.o
-- $(CC) $(CFLAGS) -o $@ $^ -lpci
-+tor2ee: LDFLAGS+=-lpci
-
- zonedata.lo: zonedata.c
- $(CC) -c $(LCFLAGS) -o $@ $^
-@@ -194,8 +196,7 @@
- radfw.h: makefw pciradio.rbt
- ./makefw pciradio.rbt radfw > radfw.h
-
--gendigits: gendigits.o
-- $(CC) -o $@ $^ -lm
-+gendigits: LDFLAGS+=-lm
-
- zaptel.c: tones.h
-
-@@ -207,23 +208,10 @@
-
- ztmonitor.o: ztmonitor.c zaptel.h
-
--ztspeed.o: ztspeed.c
-- $(CC) -o $@ -c $^
--
--zttool: zttool.o
-- $(CC) -o $@ $^ -lnewt
--
--ztmonitor: ztmonitor.o
-- $(CC) -o $@ $^
--
--ztspeed: ztspeed.o
-- $(CC) -o $@ $^
--
--sethdlc-new: sethdlc-new.o
-- $(CC) -o $@ $^
--
--sethdlc-new.o: sethdlc-new.c
-- $(CC) -o $@ -c $(CFLAGS) -I$(KINCLUDES) $^
-+ztspeed: CFLAGS=
-+ztspeed.o: CFLAGS=
-+zttool: LDFLAGS+=-lnewt
-+sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
-
- libtonezone.a: $(TZOBJS)
- ar rcs libtonezone.a $^
-@@ -248,26 +236,20 @@
- complex.o: complex.cc
- $(CC) -o $@ -c $^
-
--usbfxstest.o: usbfxstest.c
-- $(CC) -o $@ -g -c $^
--
--usbfxstest: usbfxstest.o
-- $(CC) -o $@ $^ -lzap
--
--fxstest: fxstest.o $(LIBTONEZONE_SO)
-- $(CC) -o $@ $^ -lm
--
--fxotune: fxotune.o
-- $(CC) -o $@ $^ -lm
--
--fxsdump: fxsdump.o
-- $(CC) -o $@ $^ -lm
-+usbfxstest: LDFLAGS+=-lzap
-+fxstest: $(LIBTONEZONE_SO)
-+fxstest: LDFLAGS+=-lm
-+fxotune: LDFLAGS+=-lm
-+fxsdump: LDFLAGS+=-lm
-
- stackcheck: checkstack $(BUILDVER)
- ./checkstack *.o
-
--ztdiag: ztdiag.o
-- $(CC) -o $@ $^
-+$(UTILS): %: %.o
-+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
-+
-+$(UTILSO): %.o: %.c
-+ $(CC) $(CFLAGS) -o $@ -c $<
-
- devices:
- ifndef DYNFS
Deleted: zaptel/trunk/debian/patches/Makefile_hostcc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_hostcc.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_hostcc.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_hostcc.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove hardcoded HOSTCC
-
- at DPATCH@
-diff -urNad zaptel-1.2.12~dfsg~/Makefile zaptel-1.2.12~dfsg/Makefile
---- zaptel-1.2.12~dfsg~/Makefile 2006-12-07 00:22:11.000000000 +0100
-+++ zaptel-1.2.12~dfsg/Makefile 2006-12-28 13:17:04.396969151 +0100
-@@ -6,7 +6,6 @@
- #
-
-
--HOSTCC=gcc
- PWD:=$(shell pwd)
-
- INSTALL_PREFIX:=$(DESTDIR)
Deleted: zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_kbuild.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_kbuild.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_kbuild.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use kbuild (the kernel build system) more extensively. This will
-## DP: be useful for recursive builds.
-## -- applied upstream in 1.2 branch
-
- at DPATCH@
-diff -urNad zaptel-1.2.6/Makefile /tmp/dpep.x8Bqi9/zaptel-1.2.6/Makefile
---- zaptel-1.2.6/Makefile 2006-06-22 13:14:41.994504042 +0300
-+++ /tmp/dpep.x8Bqi9/zaptel-1.2.6/Makefile 2006-06-22 13:23:59.447070160 +0300
-@@ -408,10 +408,14 @@
- install -m 644 tonezone.h $(INC_DIR)
- install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
-
--install-modules: $(MODULES_BUILD)
-+install-modules: install-$(BUILDVER)
-+install-linux24: $(MODULES_BUILD)
- install -d $(MOD_DIR)
- install -m 644 $(MODULES_BUILD) $(MOD_DIR)
-
-+install-linux26: $(MODULESKO)
-+ $(KMAKE_INST)
-+
- clean:
- rm -f torisatool makefw tor2fw.h radfw.h
- rm -f $(BINS)
Deleted: zaptel/trunk/debian/patches/Makefile_targets.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_targets.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_targets.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_modules.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds targets modules, programs, install-modules and install-programs to
-## DP: allow separate installation of the programs and the modules
-## -- will be fixed later on.. still pending.
-
- at DPATCH@
-diff -urNad zaptel-1.2.1/Makefile /tmp/dpep.hnX6Yg/zaptel-1.2.1/Makefile
---- zaptel-1.2.1/Makefile 2005-12-22 00:01:06.000000000 +0200
-+++ /tmp/dpep.hnX6Yg/zaptel-1.2.1/Makefile 2005-12-22 00:09:25.000000000 +0200
-@@ -122,6 +122,16 @@
- endif
- MODULESO:=$(MODULES:%=%.o)
- MODULESKO:=$(MODULES:%=%.ko)
-+ifeq ($(BUILDVER),linux26)
-+MODULES_BUILD:=$(MODULESKO)
-+else
-+MODULES_BUILD:=$(MODULESO)
-+endif
-+
-+BIN_DIR:=$(INSTALL_PREFIX)/sbin
-+LIB_DIR:=$(INSTALL_PREFIX)/usr/lib
-+INC_DIR:=$(INSTALL_PREFIX)/usr/include
-+MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
-
- ifneq (,$(wildcard /usr/include/newt.h))
- ZTTOOL:=zttool
-@@ -136,7 +146,11 @@
- #PRIMARY=wcfxo
- PWD:=$(shell pwd)
-
--all: $(BUILDVER) $(LIBTONEZONE_SO)
-+all: modules $(LIBTONEZONE_SO)
-+
-+programs: $(BINS) $(LIBTONEZONE_SO)
-+
-+modules: $(BUILDVER)
-
- linux24: $(MODULESO) $(BINS)
-
-@@ -387,6 +401,21 @@
- echo "Not under version control"; \
- fi
-
-+# make should *fail* and not silently succeed if a program did not build
-+install-programs: $(BINS) $(LIBTONEZONE) libtonezone.a
-+ install -d $(BIN_DIR)
-+ install $(BINS) $(BIN_DIR)
-+ install -d $(LIB_DIR)
-+ install -m 755 $(LIBTONEZONE) libtonezone.a $(LIB_DIR)
-+ install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
-+ install -d $(INC_DIR)/linux
-+ install -m 644 tonezone.h $(INC_DIR)
-+ install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
-+
-+install-modules: $(MODULES_BUILD)
-+ install -d $(MOD_DIR)
-+ install -m 644 $(MODULES_BUILD) $(MOD_DIR)
-+
- clean:
- rm -f torisatool makefw tor2fw.h radfw.h
- rm -f ${BINS}
Deleted: zaptel/trunk/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_uname.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_uname.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_unamem.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes unnecessary calls to uname -r and uname -m . Use UNAME_M
-## DP: and KVERS/KVERS_MAJ instead.
-## DP: Impact: Minimal: fixes a possible incorrect behaviour (try version
-## DP: no. 2.6.2-4) and will also consider 2.5 as linux26 BUILDVER .
-
- at DPATCH@
-diff -urNad zaptel-1.2.11.dfsg~/Makefile zaptel-1.2.11.dfsg/Makefile
---- zaptel-1.2.11.dfsg~/Makefile 2006-12-02 14:12:47.000000000 +0000
-+++ zaptel-1.2.11.dfsg/Makefile 2006-12-02 14:12:54.000000000 +0000
-@@ -11,6 +11,11 @@
-
- INSTALL_PREFIX:=$(DESTDIR)
-
-+ifeq ($(DEB_HOST_GNU_TYPE),)
-+UNAME_M:=$(shell uname -m)
-+else
-+UNAME_M:=$(DEB_HOST_GNU_TYPE)
-+endif
- # If you want to build for a kernel other than the current kernel, set KVERS
- ifndef KVERS
- KVERS:=$(shell uname -r)
-@@ -23,11 +28,16 @@
- KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $$dir; break; fi; done)
- endif
- endif
-+KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
- KINCLUDES:=$(KSRC)/include
-
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
--CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
--CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
-+CFLAGS+=-I. -O2 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+ifneq (,$(findstring ppc,$(UNAME_M)))
-+CFLAGS_PPC:=-fsigned-char
-+endif
-+ifneq (,$(findstring x86_64,$(UNAME_M)))
-+CFLAGS_X86-64:=-m64
-+endif
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
- LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
- KFLAGS:=-I$(KINCLUDES) -O6
-@@ -36,9 +46,15 @@
- ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
- KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
- endif
--KFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-msoft-float -fsigned-char"; fi)
-+ifneq (,$(findstring ppc,$(UNAME_M)))
-+KFLAGS_PPC:=-msoft-float -fsigned-char
-+endif
- KFLAGS+=$(KFLAGS_PPC)
--KFLAGS+=$(shell if uname -r | grep -q 2.4; then if uname -m | grep -q x86_64; then echo "-mcmodel=kernel"; fi; fi)
-+ifeq ($(KVERS_MAJ),2.4)
-+ ifneq (,$(findstring x86_64,$(UNAME_M)))
-+ KFLAGS+=-mcmodel=kernel
-+ endif
-+endif
-
- #
- # Features are now configured in zconfig.h
-@@ -52,10 +68,10 @@
- CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
- CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
-
--ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
-- BUILDVER:=linux26
--else
-+ifeq ($(KVERS_MAJ),2.4)
- BUILDVER:=linux24
-+else
-+ BUILDVER:=linux26
- endif
-
- ifeq ($(BUILDVER),linux24)
Deleted: zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/Makefile_vzaphfc.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_vzaphfc.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add vzaphfc to linux-2.6 modules
-
- at DPATCH@
-diff -urNad zaptel-1.2.12~dfsg~/Makefile zaptel-1.2.12~dfsg/Makefile
---- zaptel-1.2.12~dfsg~/Makefile 2006-12-27 20:59:12.564324230 +0100
-+++ zaptel-1.2.12~dfsg/Makefile 2006-12-27 22:48:51.929450581 +0100
-@@ -150,7 +150,8 @@
-
- obj-m:=$(MODULESO)
- obj-m+=wct4xxp/
--MODULES+=wct4xxp
-+obj-m+=vzaphfc/
-+MODULES+=wct4xxp vzaphfc
-
- # 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.
Deleted: zaptel/trunk/debian/patches/bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/bristuff.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,210 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bristuff.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This is the patch zaptel.patch from bristuff, with the Makefile
-## DP: patch removed. Version: bristuff-0.3.0-PRE-1w
-## DP: removed setting of echo canceller.
-## DP: Fixed zaptel.c patch.
-## DP: removed ztcfg.c patch until I figure how to fix it.
-
- at DPATCH@
-diff -urN zaptel-1.2.10.orig/zaptel.c zaptel-1.2.10/zaptel.c
---- zaptel-1.2.10.orig/zaptel.c 2006-09-16 09:45:04.000000000 +0200
-+++ zaptel-1.2.10/zaptel.c 2006-10-19 11:16:47.000000000 +0200
-@@ -139,6 +139,7 @@
- EXPORT_SYMBOL(zt_qevent_lock);
- EXPORT_SYMBOL(zt_hooksig);
- EXPORT_SYMBOL(zt_alarm_notify);
-+EXPORT_SYMBOL(zt_alarm_notify_no_master_change);
- EXPORT_SYMBOL(zt_set_dynamic_ioctl);
- EXPORT_SYMBOL(zt_ec_chunk);
- EXPORT_SYMBOL(zt_ec_span);
-@@ -2700,6 +2701,30 @@
- }
- }
-
-+void zt_alarm_notify_no_master_change(struct zt_span *span)
-+{
-+ int j;
-+ int x;
-+
-+ span->alarms &= ~ZT_ALARM_LOOPBACK;
-+ /* Determine maint status */
-+ if (span->maintstat || span->mainttimer)
-+ span->alarms |= ZT_ALARM_LOOPBACK;
-+ /* DON'T CHANGE THIS AGAIN. THIS WAS DONE FOR A REASON.
-+ The expression (a != b) does *NOT* do the same thing
-+ as ((!a) != (!b)) */
-+ /* if change in general state */
-+ if ((!span->alarms) != (!span->lastalarms)) {
-+ if (span->alarms)
-+ j = ZT_EVENT_ALARM;
-+ else
-+ j = ZT_EVENT_NOALARM;
-+ span->lastalarms = span->alarms;
-+ for (x=0;x < span->channels;x++)
-+ zt_qevent_lock(&span->chans[x], j);
-+ }
-+}
-+
- #define VALID_SPAN(j) do { \
- if ((j >= ZT_MAX_SPANS) || (j < 1)) \
- return -EINVAL; \
-@@ -4928,11 +4953,40 @@
- *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- }
- bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+ /*
-+ * Let's get this right, we want to transmit complete frames only.
-+ * The card driver will do the dirty HDLC work for us.
-+ * txb (transmit buffer) is supposed to be big enough to store one frame
-+ * we will make this as big as the D fifo (1KB or 2KB)
-+ */
-+
-+ /* there are 'left' bytes in the user buffer left to transmit */
-+ left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+ if (left > ms->maxbytes2transmit) {
-+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+ ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+ txb += ms->maxbytes2transmit;
-+ ms->bytes2transmit = ms->maxbytes2transmit;
-+ ms->eoftx = 0;
-+ } else {
-+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+ ms->writeidx[ms->outwritebuf] += left + 2;
-+ txb += left;
-+ ms->bytes2transmit = left;
-+ ms->eoftx = 1;
-+ }
-+ bytes = 0;
-+#endif
- } else {
- memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- ms->writeidx[ms->outwritebuf]+=left;
- txb += left;
- bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
-+ ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
- }
- /* Check buffer status */
- if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4977,6 +5031,17 @@
- /* Transmit a flag if this is an HDLC channel */
- if (ms->flags & ZT_FLAG_HDLC)
- fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
-+ if(ms->flags & ZT_FLAG_BRIDCHAN) {
-+ // if (ms->bytes2transmit > 0) {
-+ // txb += 2;
-+ // ms->bytes2transmit -= 2;
-+ bytes=0;
-+ ms->eoftx = 1;
-+// printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+ // }
-+ }
-+#endif
- #ifdef CONFIG_ZAPATA_NET
- if (ms->flags & ZT_FLAG_NETDEV)
- netif_wake_queue(ztchan_to_dev(ms));
-@@ -5033,6 +5098,10 @@
- memset(txb, 0xFF, bytes);
- }
- bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
-+ } else if(ms->flags & ZT_FLAG_BRIDCHAN) {
-+ bytes = 0;
-+#endif
- } else {
- memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
- bytes = 0;
-@@ -5758,6 +5827,14 @@
- int bytes = ZT_CHUNKSIZE, left;
- int x;
-
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
-+ if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+ bytes = ms->bytes2receive;
-+ if (bytes < 1) return;
-+// printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+ }
-+#endif
-+
- /* Let's pick something to transmit. First source to
- try is our write-out buffer. Always check it first because
- its our 'fast path' for whatever that's worth. */
-@@ -5816,6 +5892,19 @@
- }
- }
- }
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+ } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+ rxb += left;
-+ ms->readidx[ms->inreadbuf] += left;
-+ bytes -= left;
-+ if (ms->eofrx == 1) {
-+ eof=1;
-+ }
-+// printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+ ms->bytes2receive = 0;
-+ ms->eofrx = 0;
-+#endif
- } else {
- /* Not HDLC */
- memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -urN zaptel-1.2.10.orig/zaptel.h zaptel-1.2.10/zaptel.h
---- zaptel-1.2.10.orig/zaptel.h 2005-12-17 03:04:05.000000000 +0100
-+++ zaptel-1.2.10/zaptel.h 2006-10-19 11:16:47.000000000 +0200
-@@ -994,6 +994,13 @@
- int do_ppp_error;
- struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+ int bytes2receive;
-+ int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+ int bytes2transmit;
-+ int eofrx;
-+ int eoftx;
-+#endif
- spinlock_t lock;
- char name[40]; /* Name */
- /* Specified by zaptel */
-@@ -1231,6 +1238,10 @@
- #define ZT_FLAG_T1PPP (1 << 15)
- #define ZT_FLAG_SIGFREEZE (1 << 16) /* Freeze signalling */
-
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)
-+#define ZT_FLAG_BRIDCHAN (1 << 17)
-+#endif
-+
- struct zt_span {
- spinlock_t lock;
- void *pvt; /* Private stuff */
-@@ -1404,6 +1415,9 @@
- /* Notify a change possible change in alarm status */
- extern void zt_alarm_notify(struct zt_span *span);
-
-+/* Notify a change possible change in alarm status, DONT change the zaptel master! */
-+extern void zt_alarm_notify_no_master_change(struct zt_span *span);
-+
- /* Initialize a tone state */
- extern void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
-
-diff -urN zaptel-1.2.10.orig/zconfig.h zaptel-1.2.10/zconfig.h
---- zaptel-1.2.10.orig/zconfig.h 2005-11-29 19:42:08.000000000 +0100
-+++ zaptel-1.2.10/zconfig.h 2006-10-19 11:16:47.000000000 +0200
-@@ -152,4 +152,10 @@
- */
- /* #define FXSFLASH */
-
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
Deleted: zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,72 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bristuff_local_zaptelh.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow bristuff modules to be built in the same directory as
-## DP: zaptel itself (when -DSTANDALONE_ZAPATA is used)
-
- at DPATCH@
-diff -urNad trunk/cwain/cwain.c /tmp/dpep.u4G4Tv/trunk/cwain/cwain.c
---- trunk/cwain/cwain.c 2006-04-25 22:15:34.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/cwain/cwain.c 2006-06-27 18:23:08.474483444 +0300
-@@ -18,7 +18,11 @@
- #include <linux/pci.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- #include "cwain.h"
-
- #if CONFIG_PCI
-diff -urNad trunk/qozap/qozap.c /tmp/dpep.u4G4Tv/trunk/qozap/qozap.c
---- trunk/qozap/qozap.c 2006-04-25 16:37:39.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/qozap/qozap.c 2006-06-27 18:24:14.512637006 +0300
-@@ -15,7 +15,11 @@
- #include <linux/pci.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- #include "qozap.h"
-
- #if CONFIG_PCI
-diff -urNad trunk/zaphfc/zaphfc.c /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c
---- trunk/zaphfc/zaphfc.c 2006-04-25 16:38:47.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c 2006-06-27 18:25:06.105038433 +0300
-@@ -24,7 +24,11 @@
- #include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- #include "zaphfc.h"
-
- #if CONFIG_PCI
-diff -urNad trunk/ztgsm/ztgsm.c /tmp/dpep.u4G4Tv/trunk/ztgsm/ztgsm.c
---- trunk/ztgsm/ztgsm.c 2006-04-25 16:48:02.000000000 +0300
-+++ /tmp/dpep.u4G4Tv/trunk/ztgsm/ztgsm.c 2006-06-27 18:25:19.518522688 +0300
-@@ -14,7 +14,11 @@
- #include <linux/pci.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
--#include <zaptel.h>
-+#ifdef STANDALONE_ZAPATA
-+#include "zaptel.h"
-+#else
-+#include <linux/zaptel.h>
-+#endif
- #include "ztgsm.h"
-
- #if CONFIG_PCI
Deleted: zaptel/trunk/debian/patches/dbug391840.dpatch
===================================================================
--- zaptel/trunk/debian/patches/dbug391840.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/dbug391840.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dbug391840.dpatch by <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes: Bug#391840: ztcfg segfaults because of -O4
-## DP: http://bugs.debian.org/391840
-
- at DPATCH@
-diff -urNad zaptel-1.2.9.1.dfsg~/ztcfg.c zaptel-1.2.9.1.dfsg/ztcfg.c
---- zaptel-1.2.9.1.dfsg~/ztcfg.c 2006-02-01 13:33:54.000000000 +1100
-+++ zaptel-1.2.9.1.dfsg/ztcfg.c 2006-10-09 12:56:32.000000000 +1000
-@@ -929,6 +929,8 @@
- if (ind_ioctl(x,fd,ZT_RADIO_GETPARAM,&p) == -1)
- error("Cannot get number of tones for channel %d\n",x);
- n = p.data;
-+ if (n > NUM_TONES)
-+ error("Too many tones for channel %d: %d\n",x,n);
- p.radpar = ZT_RADPAR_INITTONE;
- if (ind_ioctl(x,fd,ZT_RADIO_SETPARAM,&p) == -1)
- error("Cannot init tones for channel %d\n",x);
Deleted: zaptel/trunk/debian/patches/echocan_env.dpatch
===================================================================
--- zaptel/trunk/debian/patches/echocan_env.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/echocan_env.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## echhcan_env.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow setting the echo cancceler from the environment at (modules)
-## DP: build time.
-
- at DPATCH@
-diff -urNad zaptel-1.1.9.0rc1/Makefile /tmp/dpep.m12xU5/zaptel-1.1.9.0rc1/Makefile
---- zaptel-1.1.9.0rc1/Makefile 2005-11-10 09:02:00.424207126 +0200
-+++ /tmp/dpep.m12xU5/zaptel-1.1.9.0rc1/Makefile 2005-11-10 09:04:15.366618603 +0200
-@@ -217,7 +217,12 @@
-
- gendigits: LDFLAGS+=-lm
-
--zaptel.c: tones.h
-+ifndef EC_TYPE
-+ EC_TYPE:=KB1
-+endif
-+# only for for 2.6 kernel:
-+EXTRA_CFLAGS+=-DECHO_CAN_SET -DECHO_CAN_$(EC_TYPE)
-+zaptel.c: tones.h
-
- prereq: tones.h tor2fw.h radfw.h
-
-diff -urNad zaptel-1.1.9.0rc1/zconfig.h /tmp/dpep.m12xU5/zaptel-1.1.9.0rc1/zconfig.h
---- zaptel-1.1.9.0rc1/zconfig.h 2005-11-10 09:01:58.140487865 +0200
-+++ /tmp/dpep.m12xU5/zaptel-1.1.9.0rc1/zconfig.h 2005-11-10 09:02:01.534070690 +0200
-@@ -44,12 +44,18 @@
- * Pick your echo canceller: MARK2, MARK3, STEVE, or STEVE2 :)
- *
- */
-+
-+// you must define externally both ECHO_CAN_SET and ECHO_CAN_foo
-+#ifndef ECHO_CAN_SET
-+#define ECHO_CAN_SET ECHO_CAN_KB1
-+#define ECHO_CAN_KB1
-+#endif
- /* #define ECHO_CAN_STEVE */
- /* #define ECHO_CAN_STEVE2 */
- /* #define ECHO_CAN_MARK */
- /* #define ECHO_CAN_MARK2 */
- /* #define ECHO_CAN_MARK3 */
--#define ECHO_CAN_KB1
-+/*#define ECHO_CAN_KB1 */
- /* MG2 is a version of KB1 that has some changes to it that are
- * supposed to improve how it performs. If you have echo problems,
- * try it out! */
Deleted: zaptel/trunk/debian/patches/sangoma.dpatch
===================================================================
--- zaptel/trunk/debian/patches/sangoma.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/sangoma.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## sangoma.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The patch zaptel.patch from the Sangoma wanpipe driver distribution.
-
- at DPATCH@
-diff -urNad zaptel-1.2.8.xpp.r2496/zaptel.c /tmp/dpep.3jOAuc/zaptel-1.2.8.xpp.r2496/zaptel.c
---- zaptel-1.2.8.xpp.r2496/zaptel.c 2006-08-24 12:08:11.000000000 +0300
-+++ /tmp/dpep.3jOAuc/zaptel-1.2.8.xpp.r2496/zaptel.c 2006-10-26 21:15:01.000000000 +0200
-@@ -1774,6 +1774,13 @@
- } else {
- if (copy_from_user(chan->writebuf[chan->inwritebuf], usrbuf, amnt))
- return -EFAULT;
-+
-+ if ((chan->flags & ZT_FLAG_HDLC) && chan->span->ioctl != NULL){
-+ if (chan->span->ioctl(chan, ZT_DCHAN_TX_V2, amnt)==0){
-+ return amnt;
-+ }
-+ }
-+
- chan->writen[chan->inwritebuf] = amnt;
- }
- chan->writeidx[chan->inwritebuf] = 0;
-diff -urNad zaptel-1.2.8.xpp.r2496/zaptel.h /tmp/dpep.3jOAuc/zaptel-1.2.8.xpp.r2496/zaptel.h
---- zaptel-1.2.8.xpp.r2496/zaptel.h 2006-08-24 12:08:11.000000000 +0300
-+++ /tmp/dpep.3jOAuc/zaptel-1.2.8.xpp.r2496/zaptel.h 2006-10-26 21:15:01.000000000 +0200
-@@ -632,6 +632,10 @@
- * 60-80 are reserved for private drivers
- * 80-85 are reserved for dynamic span stuff
- */
-+#define ZT_DCHAN_TX _IOR (ZT_CODE, 60, int)
-+#define ZT_DCHAN_TX_V1 ZT_DCHAN_TX
-+#define ZT_DCHAN_TX_V2 ZT_DCHAN_TX
-+
-
- /*
- * Create a dynamic span
Deleted: zaptel/trunk/debian/patches/ukcid.dpatch
===================================================================
--- zaptel/trunk/debian/patches/ukcid.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/ukcid.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,139 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ukcid.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: UK Caller-ID patch from http://www.lusyn.com/asterisk/patches.html ,
-## DP: zaptel part
-
- at DPATCH@
-diff -urNad zaptel-1.1.9.0beta2/zaptel.c /tmp/dpep.qnDT2q/zaptel-1.1.9.0beta2/zaptel.c
---- zaptel-1.1.9.0beta2/zaptel.c 2005-10-04 23:34:36.000000000 +0300
-+++ /tmp/dpep.qnDT2q/zaptel-1.1.9.0beta2/zaptel.c 2005-11-01 23:37:26.435046197 +0200
-@@ -734,6 +734,20 @@
- unsigned char *newbuf, *oldbuf;
- unsigned long flags;
- int x;
-+
-+ /* Allocate history buffer, or not. This probably shouldn't
-+ * be here, but it's convenient */
-+ if(!j)
-+ {
-+ if(ss->history) kfree(ss->history);
-+ ss->history = NULL;
-+ }
-+ else
-+ {
-+ if(!ss->history) ss->history=kmalloc(ZT_HISTORY_BUF_LEN, GFP_KERNEL);
-+ }
-+ ss->historypos=0;
-+
- /* Check numbufs */
- if (numbufs < 2)
- numbufs = 2;
-@@ -3955,11 +3969,12 @@
- {
- struct zt_chan *chan = chans[unit];
- unsigned long flags;
-- int j, rv;
-+ int j, k1, k2, rv;
- int ret;
- int oldconf;
- void *rxgain=NULL;
- echo_can_state_t *ec, *tec;
-+ struct zt_history hist;
-
- if (!chan)
- return -ENOSYS;
-@@ -4311,6 +4326,29 @@
- return -EINVAL;
- break;
- #endif
-+ case ZT_GET_HISTORY:
-+ if (copy_from_user(&hist,(struct zt_history *) data,sizeof(hist)))
-+ return -EIO;
-+
-+ if (!(chan->flags & ZT_FLAG_AUDIO)) return (-EINVAL);
-+ if (!chan->history) return -EINVAL;
-+ j=hist.len;
-+ k1=ZT_HISTORY_BUF_LEN-chan->historypos;
-+ k2=chan->historypos;
-+ if(j>0 && k1>0)
-+ {
-+ if (copy_to_user(hist.buf,chan->history+chan->historypos,min(j,k1)))
-+ return -EIO;
-+ j-=min(j,k1);
-+ }
-+ if(j>0 && k2>0)
-+ {
-+ if (copy_to_user(hist.buf+k1,chan->history,min(j,k2)))
-+ return -EIO;
-+ j-=min(j,k2);
-+ }
-+ /* Probably should assert j==0 here */
-+ break;
- default:
- return zt_chanandpseudo_ioctl(inode, file, cmd, data, unit);
- }
-@@ -5575,6 +5613,15 @@
- memcpy(ms->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
- memcpy(ms->putraw, rxb, ZT_CHUNKSIZE);
- }
-+
-+ /* Store in the history buffer */
-+ if(ms->history)
-+ {
-+ memcpy(ms->history+ms->historypos,rxb,ZT_CHUNKSIZE);
-+ ms->historypos+=ZT_CHUNKSIZE;
-+ if(ms->historypos >= ZT_HISTORY_BUF_LEN)
-+ ms->historypos=0;
-+ }
-
- /* Take the rxc, twiddle it for conferencing if appropriate and put it
- back */
-diff -urNad zaptel-1.1.9.0beta2/zaptel.h /tmp/dpep.qnDT2q/zaptel-1.1.9.0beta2/zaptel.h
---- zaptel-1.1.9.0beta2/zaptel.h 2005-10-27 18:05:07.000000000 +0200
-+++ /tmp/dpep.qnDT2q/zaptel-1.1.9.0beta2/zaptel.h 2005-11-01 23:37:26.446044778 +0200
-@@ -143,6 +143,8 @@
- #define ZT_MAX_NUM_BUFS 32
- #define ZT_MAX_BUF_SPACE 32768
-
-+#define ZT_HISTORY_BUF_LEN 16384 /* Count of ulaw samples */
-+
- #define ZT_DEFAULT_BLOCKSIZE 1024
- #define ZT_DEFAULT_MTR_MRU 2048
-
-@@ -289,6 +291,11 @@
- int reserved[4]; /* Reserved for future expansion -- always set to 0 */
- } ZT_DIAL_PARAMS;
-
-+typedef struct zt_history
-+{
-+ unsigned char *buf; /* Sample buffer */
-+ int len; /* Length of buffer, in bytes */
-+} ZT_HISTORY;
-
- typedef struct zt_dynamic_span {
- char driver[20]; /* Which low-level driver to use */
-@@ -604,6 +611,11 @@
- #define ZT_TIMERPONG _IOW (ZT_CODE, 53, int)
-
- /*
-+ * Return history buffer
-+ */
-+#define ZT_GET_HISTORY _IOR(ZT_CODE, 54, struct zt_history)
-+
-+/*
- * Set/get signalling freeze
- */
- #define ZT_SIGFREEZE _IOW (ZT_CODE, 54, int)
-@@ -1039,6 +1051,10 @@
-
- int blocksize; /* Block size */
-
-+
-+ u_char *history; /* History buffer, for pre-ring caller ID (ZT_HISTORY_BUF_LEN) */
-+ u_short historypos; /* Current position within buffer */
-+
- int eventinidx; /* out index in event buf (circular) */
- int eventoutidx; /* in index in event buf (circular) */
- unsigned int eventbuf[ZT_MAX_EVENTSIZE]; /* event circ. buffer */
Deleted: zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
===================================================================
--- zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch 2007-04-25 23:06:19 UTC (rev 3482)
+++ zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch 2007-04-25 23:08:19 UTC (rev 3483)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## wct4xxp-dfsg.dpatch by <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch builds the wct4xxp module without firmware support
-## DP: The module is completely usable without the firmware, as long
-## DP: as the user does not have the optional Octasic module on their
-## DP: TE4XXP card (and most users do not have those modules).
-
- at DPATCH@
-diff -urNad zaptel-1.2.11.dfsg~/wct4xxp/Kbuild zaptel-1.2.11.dfsg/wct4xxp/Kbuild
---- zaptel-1.2.11.dfsg~/wct4xxp/Kbuild 2006-11-05 06:44:13.000000000 +0000
-+++ zaptel-1.2.11.dfsg/wct4xxp/Kbuild 2006-12-02 13:25:37.000000000 +0000
-@@ -12,7 +12,7 @@
- $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
- $(obj)/base.o: $(src)/../zaptel.h
-
--$(obj)/vpm450m.o: $(obj)/vpmoct128_fw.h $(obj)/vpmoct064_fw.h $(src)/vpm450m.h
-+$(obj)/vpm450m.o: $(src)/vpm450m.h
- $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
-
- $(obj)/vpmoct128_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
More information about the Pkg-voip-commits
mailing list