[Pkg-voip-commits] r10541 - in /dahdi-linux/trunk/debian: changelog patches/dahdi_linux_extra patches/pciradio-request_firmware patches/series patches/tor2-request_firmware patches/upstream/
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Sat Aug 9 18:14:00 UTC 2014
Author: tzafrir
Date: Sat Aug 9 18:13:59 2014
New Revision: 10541
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10541
Log:
New upstream release candidate: 2.10.0-rc1
Removed:
dahdi-linux/trunk/debian/patches/upstream/
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
dahdi-linux/trunk/debian/patches/pciradio-request_firmware
dahdi-linux/trunk/debian/patches/series
dahdi-linux/trunk/debian/patches/tor2-request_firmware
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=10541&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sat Aug 9 18:13:59 2014
@@ -1,18 +1,17 @@
-dahdi-linux (1:2.9.1.1~dfsg-1) UNRELEASED; urgency=low
-
- * New upstream release.
-
- [ Tzafrir Cohen ]
+dahdi-linux (1:2.10.0~rc1-1) UNRELEASED; urgency=low
+
+ [ Tzafrir Cohen ]
+ * New upstream release candidate (Closes: #753660).
+ - Patch dahdi_linux_extra updated to the 2.9.2 branch.
* Use hotplug support:
- patch hotplug_mod_params: change default of module parameters.
* Multiarch support.
* udev rules moved to package dahdi (in source package dahdi-tools).
- * Some extra backported patches under debian/patches/upstream/
[ Mark Purcell ]
* Update debian/watch for ~dfsg
- -- Tzafrir Cohen <tzafrir at debian.org> Wed, 02 Oct 2013 20:57:50 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org> Sat, 09 Aug 2014 19:51:53 +0300
dahdi-linux (1:2.7.0.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=10541&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Sat Aug 9 18:13:59 2014
@@ -1,18 +1,20 @@
Subject: dahdi-extra: out-of-tree DAHDI drivers
-Origin: http://gitorious.org/dahdi-extra/dahdi-linux
+Origin: http://gitorious.org/dahdi-extra/dahdi-linux-extra
Forwarded: No
-Last-Update: 2013-06-09
+Last-Update: 2013-28-08
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: 65d0c3f161befe261c86d6cadc6a23986c8d09ad
-Dahdi: v2.7.0-rc1
+Git-Commit: a882f0d0124f391d2ad8f31c6cd3fbde108232e0
+Dahdi: v2.9.2-rc2
---
+diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
+index ee2cd59..2eb039a 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
-@@ -56,6 +56,14 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECH
+@@ -56,6 +56,14 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2) += dahdi_echocan_sec2.o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1) += dahdi_echocan_kb1.o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o
@@ -27,6 +29,8 @@
obj-m += $(DAHDI_MODULES_EXTRA)
# If you want to build OSLEC, include the code in the standard location:
+diff --git a/drivers/dahdi/Kconfig b/drivers/dahdi/Kconfig
+index 6952c6a..4275775 100644
--- a/drivers/dahdi/Kconfig
+++ b/drivers/dahdi/Kconfig
@@ -292,3 +292,89 @@ config DAHDI_WCTE11XP
@@ -119,6 +123,9 @@
+
+ If unsure, say Y.
+
+diff --git a/drivers/dahdi/ap400/Kbuild b/drivers/dahdi/ap400/Kbuild
+new file mode 100644
+index 0000000..d124261
--- /dev/null
+++ b/drivers/dahdi/ap400/Kbuild
@@ -0,0 +1,26 @@
@@ -148,6 +155,9 @@
+$(src)/../firmware/make_firmware_object:
+ make -C $(src)/../firmware make_firmware_object
+
+diff --git a/drivers/dahdi/ap400/ap400.h b/drivers/dahdi/ap400/ap400.h
+new file mode 100644
+index 0000000..ba233d1
--- /dev/null
+++ b/drivers/dahdi/ap400/ap400.h
@@ -0,0 +1,107 @@
@@ -258,6 +268,9 @@
+ AP_PULS_DS1_M225DB
+} liu_mode;
+
+diff --git a/drivers/dahdi/ap400/ap400_drv.c b/drivers/dahdi/ap400/ap400_drv.c
+new file mode 100644
+index 0000000..092aefb
--- /dev/null
+++ b/drivers/dahdi/ap400/ap400_drv.c
@@ -0,0 +1,2337 @@
@@ -2598,6 +2611,9 @@
+
+module_init(ap4_init);
+module_exit(ap4_cleanup);
+diff --git a/drivers/dahdi/ap400/apec.c b/drivers/dahdi/ap400/apec.c
+new file mode 100644
+index 0000000..b43655e
--- /dev/null
+++ b/drivers/dahdi/ap400/apec.c
@@ -0,0 +1,390 @@
@@ -2991,6 +3007,9 @@
+ kfree(apec);
+ printk(KERN_INFO "APEC: Releasing...\n");
+}
+diff --git a/drivers/dahdi/ap400/apec.h b/drivers/dahdi/ap400/apec.h
+new file mode 100644
+index 0000000..483b182
--- /dev/null
+++ b/drivers/dahdi/ap400/apec.h
@@ -0,0 +1,48 @@
@@ -3042,6 +3061,9 @@
+void apec_release(struct apec_s *instance);
+
+#endif /*_APEC_H_*/
+diff --git a/drivers/dahdi/opvxa1200/Kbuild b/drivers/dahdi/opvxa1200/Kbuild
+new file mode 100644
+index 0000000..8f90819
--- /dev/null
+++ b/drivers/dahdi/opvxa1200/Kbuild
@@ -0,0 +1,19 @@
@@ -3064,6 +3086,9 @@
+ endif
+ endif
+endif
+diff --git a/drivers/dahdi/opvxa1200/Makefile b/drivers/dahdi/opvxa1200/Makefile
+new file mode 100644
+index 0000000..baaab35
--- /dev/null
+++ b/drivers/dahdi/opvxa1200/Makefile
@@ -0,0 +1,8 @@
@@ -3075,6 +3100,9 @@
+
+else
+endif
+diff --git a/drivers/dahdi/opvxa1200/base.c b/drivers/dahdi/opvxa1200/base.c
+new file mode 100644
+index 0000000..25ce3c4
--- /dev/null
+++ b/drivers/dahdi/opvxa1200/base.c
@@ -0,0 +1,3065 @@
@@ -6143,6 +6171,9 @@
+
+module_init(wctdm_init);
+module_exit(wctdm_cleanup);
+diff --git a/drivers/dahdi/opvxd115/Kbuild b/drivers/dahdi/opvxd115/Kbuild
+new file mode 100644
+index 0000000..474997d
--- /dev/null
+++ b/drivers/dahdi/opvxd115/Kbuild
@@ -0,0 +1,32 @@
@@ -6178,6 +6209,9 @@
+
+$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-032.o: $(obj)/base.o
+ $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-032.o
+diff --git a/drivers/dahdi/opvxd115/Makefile b/drivers/dahdi/opvxd115/Makefile
+new file mode 100644
+index 0000000..baaab35
--- /dev/null
+++ b/drivers/dahdi/opvxd115/Makefile
@@ -0,0 +1,8 @@
@@ -6189,6 +6223,9 @@
+
+else
+endif
+diff --git a/drivers/dahdi/opvxd115/base.c b/drivers/dahdi/opvxd115/base.c
+new file mode 100644
+index 0000000..8ef1796
--- /dev/null
+++ b/drivers/dahdi/opvxd115/base.c
@@ -0,0 +1,4908 @@
@@ -11100,6 +11137,9 @@
+
+module_init(t4_init);
+module_exit(t4_cleanup);
+diff --git a/drivers/dahdi/opvxd115/opvxd115-diag.c b/drivers/dahdi/opvxd115/opvxd115-diag.c
+new file mode 100644
+index 0000000..7d1dfdb
--- /dev/null
+++ b/drivers/dahdi/opvxd115/opvxd115-diag.c
@@ -0,0 +1,427 @@
@@ -11530,6 +11570,9 @@
+ }
+ exit(0);
+}
+diff --git a/drivers/dahdi/opvxd115/opvxd115.h b/drivers/dahdi/opvxd115/opvxd115.h
+new file mode 100644
+index 0000000..d89d5b3
--- /dev/null
+++ b/drivers/dahdi/opvxd115/opvxd115.h
@@ -0,0 +1,124 @@
@@ -11657,6 +11700,9 @@
+
+#define WCT4_GET_REGS _IOW (DAHDI_CODE, 60, struct t4_regs)
+
+diff --git a/drivers/dahdi/opvxd115/vpm450m.c b/drivers/dahdi/opvxd115/vpm450m.c
+new file mode 100644
+index 0000000..f1ed421
--- /dev/null
+++ b/drivers/dahdi/opvxd115/vpm450m.c
@@ -0,0 +1,587 @@
@@ -12247,6 +12293,9 @@
+ vfree(vpm450m->pApiInstance);
+ kfree(vpm450m);
+}
+diff --git a/drivers/dahdi/opvxd115/vpm450m.h b/drivers/dahdi/opvxd115/vpm450m.h
+new file mode 100644
+index 0000000..735a2cc
--- /dev/null
+++ b/drivers/dahdi/opvxd115/vpm450m.h
@@ -0,0 +1,43 @@
@@ -12293,6 +12342,9 @@
+void release_vpm450m(struct vpm450m *instance);
+
+#endif
+diff --git a/drivers/dahdi/wcopenpci.c b/drivers/dahdi/wcopenpci.c
+new file mode 100644
+index 0000000..d7fbc2d
--- /dev/null
+++ b/drivers/dahdi/wcopenpci.c
@@ -0,0 +1,1784 @@
@@ -14080,6 +14132,9 @@
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_VERSION(DAHDI_VERSION);
+MODULE_LICENSE("GPL");
+diff --git a/drivers/dahdi/zaphfc/Kbuild b/drivers/dahdi/zaphfc/Kbuild
+new file mode 100644
+index 0000000..960fb3a
--- /dev/null
+++ b/drivers/dahdi/zaphfc/Kbuild
@@ -0,0 +1,10 @@
@@ -14093,6 +14148,9 @@
+$(obj)/fifo.o: $(src)/fifo.h
+
+
+diff --git a/drivers/dahdi/zaphfc/base.c b/drivers/dahdi/zaphfc/base.c
+new file mode 100644
+index 0000000..fb35ba7
--- /dev/null
+++ b/drivers/dahdi/zaphfc/base.c
@@ -0,0 +1,1720 @@
@@ -14116,7 +14174,7 @@
+ * Klaus-Peter Junghanns <kpj at junghanns.net>
+ *
+ * This program is free software and may be modified and
-+ * distributed under the terms of the GNU Public License.
++ * distributed under the terms of the GNU General Public License.
+ *
+ * Please read the README file for important infos.
+ */
@@ -15722,7 +15780,7 @@
+
+
+ /*
-+ * disable memio and bustmaster
++ * disable memio and busmaster
+ */
+ pci_write_config_word(pci_dev, PCI_COMMAND, 0);
+
@@ -15816,6 +15874,9 @@
+#ifdef DEBUG
+MODULE_PARM_DESC(debug_level, "Debug verbosity level");
+#endif
+diff --git a/drivers/dahdi/zaphfc/fifo.c b/drivers/dahdi/zaphfc/fifo.c
+new file mode 100644
+index 0000000..aab46c0
--- /dev/null
+++ b/drivers/dahdi/zaphfc/fifo.c
@@ -0,0 +1,375 @@
@@ -15830,7 +15891,7 @@
+ * Daniele "Vihai" Orlandi <daniele at orlandi.com>
+ *
+ * This program is free software and may be modified and
-+ * distributed under the terms of the GNU Public License.
++ * distributed under the terms of the GNU General Public License.
+ *
+ */
+
@@ -16194,6 +16255,9 @@
+ }
+}
+
+diff --git a/drivers/dahdi/zaphfc/fifo.h b/drivers/dahdi/zaphfc/fifo.h
+new file mode 100644
+index 0000000..e2ae524
--- /dev/null
+++ b/drivers/dahdi/zaphfc/fifo.h
@@ -0,0 +1,139 @@
@@ -16209,7 +16273,7 @@
+ * Klaus-Peter Junghanns <kpj at junghanns.net>
+ *
+ * This program is free software and may be modified and
-+ * distributed under the terms of the GNU Public License.
++ * distributed under the terms of the GNU General Public License.
+ *
+ */
+
@@ -16336,6 +16400,9 @@
+void hfc_clear_fifo_tx(struct hfc_chan_simplex *chan);
+
+#endif
+diff --git a/drivers/dahdi/zaphfc/zaphfc.h b/drivers/dahdi/zaphfc/zaphfc.h
+new file mode 100644
+index 0000000..69671a7
--- /dev/null
+++ b/drivers/dahdi/zaphfc/zaphfc.h
@@ -0,0 +1,419 @@
@@ -16358,7 +16425,7 @@
+ * Klaus-Peter Junghanns <kpj at junghanns.net>
+ *
+ * This program is free software and may be modified and
-+ * distributed under the terms of the GNU Public License.
++ * distributed under the terms of the GNU General Public License.
+ *
+ */
+
@@ -16758,6 +16825,9 @@
+}
+
+#endif
+diff --git a/drivers/staging/echo/Kbuild b/drivers/staging/echo/Kbuild
+new file mode 100644
+index 0000000..f813006
--- /dev/null
+++ b/drivers/staging/echo/Kbuild
@@ -0,0 +1,6 @@
@@ -16767,6 +16837,9 @@
+
+# An explicit 'obj-m' , unlike the Makefile
+obj-m += echo.o
+diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c
+new file mode 100644
+index 0000000..4cc4f2e
--- /dev/null
+++ b/drivers/staging/echo/echo.c
@@ -0,0 +1,662 @@
@@ -17432,6 +17505,9 @@
+MODULE_AUTHOR("David Rowe");
+MODULE_DESCRIPTION("Open Source Line Echo Canceller");
+MODULE_VERSION("0.3.0");
+diff --git a/drivers/staging/echo/echo.h b/drivers/staging/echo/echo.h
+new file mode 100644
+index 0000000..754e66d
--- /dev/null
+++ b/drivers/staging/echo/echo.h
@@ -0,0 +1,175 @@
@@ -17610,6 +17686,9 @@
+};
+
+#endif /* __ECHO_H */
+diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h
+new file mode 100644
+index 0000000..288bffc
--- /dev/null
+++ b/drivers/staging/echo/fir.h
@@ -0,0 +1,286 @@
@@ -17899,6 +17978,9 @@
+}
+
+#endif
+diff --git a/drivers/staging/echo/mmx.h b/drivers/staging/echo/mmx.h
+new file mode 100644
+index 0000000..c030cdf
--- /dev/null
+++ b/drivers/staging/echo/mmx.h
@@ -0,0 +1,288 @@
@@ -18190,6 +18272,9 @@
+
+
+#endif /* AVCODEC_I386MMX_H */
+diff --git a/drivers/staging/echo/oslec.h b/drivers/staging/echo/oslec.h
+new file mode 100644
+index 0000000..f417536
--- /dev/null
+++ b/drivers/staging/echo/oslec.h
@@ -0,0 +1,94 @@
Modified: dahdi-linux/trunk/debian/patches/pciradio-request_firmware
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/pciradio-request_firmware?rev=10541&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/pciradio-request_firmware (original)
+++ dahdi-linux/trunk/debian/patches/pciradio-request_firmware Sat Aug 9 18:13:59 2014
@@ -9,13 +9,13 @@
--- a/drivers/dahdi/pciradio.c
+++ b/drivers/dahdi/pciradio.c
@@ -51,6 +51,7 @@ With driver: 303826 (1.5 %)
- #include <linux/interrupt.h>
#include <linux/moduleparam.h>
#include <linux/sched.h>
+ #include <linux/slab.h>
+#include <linux/firmware.h>
+ #include <linux/delay.h>
#include <asm/io.h>
#include <asm/delay.h>
-
@@ -220,8 +221,6 @@ struct tonedef {
unsigned char b2;
} ;
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=10541&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sat Aug 9 18:13:59 2014
@@ -6,9 +6,3 @@
tor2-request_firmware
pciradio-request_firmware
hotplug_mod_params
-
-# Included in upstream after 2.9.1.1 . Remove in next version:
-upstream/0001-xpp-fix-failed-multi-PRI-E1-T1-transition.patch
-upstream/0002-xpp-new-xbus-attribute-dahdi_registration.patch
-upstream/0003-xpp-prevent-double-dahdi-un-registration.patch
-upstream/0004-xpp-pri-Fix-more-than-a-single-CAS-R2-call.patch
Modified: dahdi-linux/trunk/debian/patches/tor2-request_firmware
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/tor2-request_firmware?rev=10541&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/tor2-request_firmware (original)
+++ dahdi-linux/trunk/debian/patches/tor2-request_firmware Sat Aug 9 18:13:59 2014
@@ -9,9 +9,9 @@
--- a/drivers/dahdi/tor2.c
+++ b/drivers/dahdi/tor2.c
@@ -31,11 +31,11 @@
- #include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/moduleparam.h>
+ #include <linux/slab.h>
+#include <linux/firmware.h>
#include <dahdi/kernel.h>
More information about the Pkg-voip-commits
mailing list