[Pkg-voip-commits] r8183 - /dahdi-linux/trunk/debian/patches/dahdi_linux_extra
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Wed Mar 10 18:56:22 UTC 2010
Author: tzafrir-guest
Date: Wed Mar 10 18:56:21 2010
New Revision: 8183
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8183
Log:
dahdi_linux_extra: zaphfc r7
* zaphfc r7: fix a typo bug
* Remove .mod.c files from the generated patch
Modified:
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
Modified: dahdi-linux/trunk/debian/patches/dahdi_linux_extra
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/dahdi_linux_extra?rev=8183&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Wed Mar 10 18:56:21 2010
@@ -1,18 +1,18 @@
Subject: dahdi-extra: out-of-tree DAHDI drivers
Origin: http://git.tzafrir.org.il/?p=dahdi-extra.git
Forwarded: No
-Last-Update: 2010-01-21
+Last-Update: 2010-03-10
This patch includes a number of out-of-tree DAHDI drivers from the
dahdi-extra repository. They are all out-of-tree and are highly likely
not to be included in DAHDI-linux in the forseeable future.
-Git-Commit: 88d86f570f2460fb1adfb645f527699d615ef125
+Git-Commit: a50c69e27aeed2e66e6a7a8feedab30c9628b862
---
diff -urN dahdi-svn-orig/drivers/dahdi/Kbuild dahdi-svn-new/drivers/dahdi/Kbuild
--- dahdi-svn-orig/drivers/dahdi/Kbuild 2009-06-13 01:30:02.000000000 +0300
-+++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-03-10 20:49:40.000000000 +0200
@@ -1,10 +1,16 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200) += opvxa1200.o
@@ -32,7 +32,7 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
diff -urN dahdi-svn-orig/drivers/dahdi/Kconfig dahdi-svn-new/drivers/dahdi/Kconfig
--- dahdi-svn-orig/drivers/dahdi/Kconfig 2009-04-29 20:48:39.000000000 +0300
-+++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-03-10 20:49:40.000000000 +0200
@@ -279,3 +279,54 @@
If unsure, say Y.
@@ -90,7 +90,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/opvxa1200.c dahdi-svn-new/drivers/dahdi/opvxa1200.c
--- dahdi-svn-orig/drivers/dahdi/opvxa1200.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/opvxa1200.c 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/opvxa1200.c 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,3018 @@
+/*
+ * OpenVox A1200P FXS/FXO Interface Driver for DAHDI Telephony interface
@@ -3112,7 +3112,7 @@
+module_exit(wctdm_cleanup);
diff -urN dahdi-svn-orig/drivers/dahdi/wcopenpci.c dahdi-svn-new/drivers/dahdi/wcopenpci.c
--- dahdi-svn-orig/drivers/dahdi/wcopenpci.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/wcopenpci.c 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/wcopenpci.c 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,1842 @@
+/*
+ * Voicetronix OpenPCI Interface Driver for Zapata Telephony interface
@@ -4958,7 +4958,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/base.c dahdi-svn-new/drivers/dahdi/zaphfc/base.c
--- dahdi-svn-orig/drivers/dahdi/zaphfc/base.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/base.c 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/base.c 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,1706 @@
+/*
+ * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -5660,7 +5660,7 @@
+
+ if (i == hfccard->span.channels - 1) {
+ hfccard->chans[i].sigcap = DAHDI_SIG_HARDHDLC;
-+ hfccard->sigchan = &hfccard->chans[D];
++ hfccard->sigchan = &hfccard->chans[DAHDI_D];
+ hfccard->sigactive = 0;
+ atomic_set(&hfccard->hdlc_pending, 0);
+ } else {
@@ -6668,7 +6668,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.c dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c
--- dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,375 @@
+/*
+ * fifo.c - HFC FIFO management routines
@@ -7047,7 +7047,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.h dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h
--- dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,139 @@
+/*
+ * fifo.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7190,7 +7190,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/Kbuild dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild
--- dahdi-svn-orig/drivers/dahdi/zaphfc/Kbuild 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,10 @@
+obj-m += zaphfc.o
+
@@ -7204,7 +7204,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/zaphfc.h dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h
--- dahdi-svn-orig/drivers/dahdi/zaphfc/zaphfc.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,414 @@
+/*
+ * zaphfc.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7622,7 +7622,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/staging/echo/echo.c dahdi-svn-new/drivers/staging/echo/echo.c
--- dahdi-svn-orig/drivers/staging/echo/echo.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/echo.c 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/echo.c 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,662 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8288,7 +8288,7 @@
+MODULE_VERSION("0.3.0");
diff -urN dahdi-svn-orig/drivers/staging/echo/echo.h dahdi-svn-new/drivers/staging/echo/echo.h
--- dahdi-svn-orig/drivers/staging/echo/echo.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/echo.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/echo.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,175 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8465,30 +8465,9 @@
+};
+
+#endif /* __ECHO_H */
-diff -urN dahdi-svn-orig/drivers/staging/echo/echo.mod.c dahdi-svn-new/drivers/staging/echo/echo.mod.c
---- dahdi-svn-orig/drivers/staging/echo/echo.mod.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/echo.mod.c 2010-01-21 13:35:37.000000000 +0200
-@@ -0,0 +1,17 @@
-+#include <linux/module.h>
-+#include <linux/vermagic.h>
-+#include <linux/compiler.h>
-+
-+MODULE_INFO(vermagic, VERMAGIC_STRING);
-+
-+struct module __this_module
-+__attribute__((section(".gnu.linkonce.this_module"))) = {
-+ .name = KBUILD_MODNAME,
-+ .arch = MODULE_ARCH_INIT,
-+};
-+
-+static const char __module_depends[]
-+__used
-+__attribute__((section(".modinfo"))) =
-+"depends=";
-+
diff -urN dahdi-svn-orig/drivers/staging/echo/fir.h dahdi-svn-new/drivers/staging/echo/fir.h
--- dahdi-svn-orig/drivers/staging/echo/fir.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/fir.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/fir.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,286 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8778,7 +8757,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/staging/echo/Kbuild dahdi-svn-new/drivers/staging/echo/Kbuild
--- dahdi-svn-orig/drivers/staging/echo/Kbuild 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/Kbuild 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/Kbuild 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,6 @@
+ifdef DAHDI_USE_MMX
+EXTRA_CFLAGS += -DUSE_MMX
@@ -8788,7 +8767,7 @@
+obj-m += echo.o
diff -urN dahdi-svn-orig/drivers/staging/echo/mmx.h dahdi-svn-new/drivers/staging/echo/mmx.h
--- dahdi-svn-orig/drivers/staging/echo/mmx.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/mmx.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/mmx.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,288 @@
+/*
+ * mmx.h
@@ -9080,7 +9059,7 @@
+#endif /* AVCODEC_I386MMX_H */
diff -urN dahdi-svn-orig/drivers/staging/echo/oslec.h dahdi-svn-new/drivers/staging/echo/oslec.h
--- dahdi-svn-orig/drivers/staging/echo/oslec.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/oslec.h 2010-01-21 13:35:37.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/oslec.h 2010-03-10 20:49:40.000000000 +0200
@@ -0,0 +1,94 @@
+/*
+ * OSLEC - A line echo canceller. This code is being developed
More information about the Pkg-voip-commits
mailing list