[Pkg-voip-commits] r8595 - in /dahdi-linux/trunk/debian: changelog patches/dahdi_linux_extra
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Tue Aug 3 00:11:57 UTC 2010
Author: tzafrir
Date: Tue Aug 3 00:11:55 2010
New Revision: 8595
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8595
Log:
Patch dahdi_linux_extra: revert last fix to zaphfc.
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8595&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Tue Aug 3 00:11:55 2010
@@ -7,8 +7,9 @@
DAHDI_AUDIO_NOTIFY.
* Patch oslec_include_2634: fix building with 2.6.34 (Closes: #586216).
* Patches xpp_usb_buffer_2635, voicebus_sem_h_2635: Likewise for 2.6.35.
-
- -- Tzafrir Cohen <tzafrir at debian.org> Fri, 18 Jun 2010 15:06:37 +0300
+ * Patch dahdi_linux_extra: revert last fix to zaphfc.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Tue, 03 Aug 2010 02:30:24 +0300
dahdi-linux (1:2.2.1.1+dfsg-1) unstable; urgency=low
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=8595&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Tue Aug 3 00:11:55 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-04-19
+Last-Update: 2010-08-03
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: dc5f7b425aaca0db635a54c96d6e4b90212d94d9
+Git-Commit: c394e7fc85e7019bc667461d3718e4e5b11347ac
---
diff -urN dahdi-svn-orig/drivers/dahdi/Kbuild dahdi-svn-new/drivers/dahdi/Kbuild
---- dahdi-svn-orig/drivers/dahdi/Kbuild 2010-02-25 21:10:02.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-04-19 21:02:04.000000000 +0300
+--- dahdi-svn-orig/drivers/dahdi/Kbuild 2010-02-25 21:10:02.273471000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-08-03 02:28:43.463501241 +0300
@@ -1,9 +1,15 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200) += opvxa1200.o
@@ -30,8 +30,8 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp/
diff -urN dahdi-svn-orig/drivers/dahdi/Kconfig dahdi-svn-new/drivers/dahdi/Kconfig
---- dahdi-svn-orig/drivers/dahdi/Kconfig 2010-02-25 21:10:02.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-04-19 21:02:04.000000000 +0300
+--- dahdi-svn-orig/drivers/dahdi/Kconfig 2010-02-25 21:10:02.273471000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-08-03 02:28:43.459501011 +0300
@@ -292,3 +292,54 @@
If unsure, say Y.
@@ -89,7 +89,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/opvxa1200.c 2010-08-03 02:28:43.215539013 +0300
@@ -0,0 +1,3018 @@
+/*
+ * OpenVox A1200P FXS/FXO Interface Driver for DAHDI Telephony interface
@@ -3111,7 +3111,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/wcopenpci.c 2010-08-03 02:28:43.247876223 +0300
@@ -0,0 +1,1842 @@
+/*
+ * Voicetronix OpenPCI Interface Driver for Zapata Telephony interface
@@ -4957,7 +4957,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/zaphfc/base.c 2010-08-03 02:28:43.260503735 +0300
@@ -0,0 +1,1706 @@
+/*
+ * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -5659,7 +5659,7 @@
+
+ if (i == hfccard->span.channels - 1) {
+ hfccard->chans[i].sigcap = DAHDI_SIG_HARDHDLC;
-+ hfccard->sigchan = &hfccard->chans[DAHDI_D];
++ hfccard->sigchan = &hfccard->chans[D];
+ hfccard->sigactive = 0;
+ atomic_set(&hfccard->hdlc_pending, 0);
+ } else {
@@ -6667,7 +6667,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c 2010-08-03 02:28:43.276644893 +0300
@@ -0,0 +1,375 @@
+/*
+ * fifo.c - HFC FIFO management routines
@@ -7046,7 +7046,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h 2010-08-03 02:28:43.280535261 +0300
@@ -0,0 +1,139 @@
+/*
+ * fifo.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7189,7 +7189,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild 2010-08-03 02:28:43.280535261 +0300
@@ -0,0 +1,10 @@
+obj-m += zaphfc.o
+
@@ -7203,7 +7203,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h 2010-08-03 02:28:43.280535261 +0300
@@ -0,0 +1,414 @@
+/*
+ * zaphfc.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7621,7 +7621,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/echo.c 2010-08-03 02:28:43.284503084 +0300
@@ -0,0 +1,662 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8287,7 +8287,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/echo.h 2010-08-03 02:28:43.288531389 +0300
@@ -0,0 +1,175 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8466,7 +8466,7 @@
+#endif /* __ECHO_H */
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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/fir.h 2010-08-03 02:28:43.288531389 +0300
@@ -0,0 +1,286 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8756,7 +8756,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/Kbuild 2010-08-03 02:28:43.288531389 +0300
@@ -0,0 +1,6 @@
+ifdef DAHDI_USE_MMX
+EXTRA_CFLAGS += -DUSE_MMX
@@ -8766,7 +8766,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/mmx.h 2010-08-03 02:28:43.288531389 +0300
@@ -0,0 +1,288 @@
+/*
+ * mmx.h
@@ -9058,7 +9058,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-04-19 21:02:04.000000000 +0300
++++ dahdi-svn-new/drivers/staging/echo/oslec.h 2010-08-03 02:28:43.288531389 +0300
@@ -0,0 +1,94 @@
+/*
+ * OSLEC - A line echo canceller. This code is being developed
More information about the Pkg-voip-commits
mailing list