[Pkg-voip-commits] r8630 - in /dahdi-linux/trunk/debian: changelog control patches/zaphfc

[paravoid at alioth.debian.org]

Author: paravoid
Date: Wed Sep  8 18:19:44 2010
New Revision: 8630

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8630
Log:
* Add myself to uploaders.
* New zaphfc upstream, three one-line patches:
  - Fix a typo which resulted in the driver not working at all
  - Fix a kernel warning/backtrace when loading
  - Fix compatibility with >= 2.6.32 Linux kernels

Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/control
    dahdi-linux/trunk/debian/patches/zaphfc

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Wed Sep  8 18:19:44 2010
@@ -1,3 +1,13 @@
+dahdi-linux (1:2.3.0.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add myself to uploaders.
+  * New zaphfc upstream, three one-line patches:
+    - Fix a typo which resulted in the driver not working at all
+    - Fix a kernel warning/backtrace when loading
+    - Fix compatibility with >= 2.6.32 Linux kernels
+
+ -- Faidon Liambotis <paravoid at debian.org>  Wed, 08 Sep 2010 21:07:39 +0300
+
 dahdi-linux (1:2.3.0.1+dfsg-1) unstable; urgency=low
 
   * New upstream version (Closes: #546319).

Modified: dahdi-linux/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control?rev=8630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control (original)
+++ dahdi-linux/trunk/debian/control Wed Sep  8 18:19:44 2010
@@ -2,7 +2,7 @@
 Section: comm
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Tzafrir Cohen <tzafrir at debian.org>, Mark Purcell <msp at debian.org>
+Uploaders: Tzafrir Cohen <tzafrir at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
 Build-Depends: debhelper (>= 7), bzip2, asciidoc
 Standards-Version: 3.9.1
 Homepage: http://www.asterisk.org/

Modified: dahdi-linux/trunk/debian/patches/zaphfc
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/zaphfc?rev=8630&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/zaphfc (original)
+++ dahdi-linux/trunk/debian/patches/zaphfc Wed Sep  8 18:19:44 2010
@@ -1,9 +1,15 @@
-zaphfc r5
+Description: zaphfc driver
+Forwarded: not-needed
+Origin: other, http://code.google.com/p/zaphfc/
+Last-Update: 2010-09-08
+
+zaphfc r7 + upstream's issue 2 patch
+See debian/rules for info on how to generate this
 
 diff -Npur old/drivers/dahdi/zaphfc/base.c new/drivers/dahdi/zaphfc/base.c
 --- old/drivers/dahdi/zaphfc/base.c	1970-01-01 02:00:00.000000000 +0200
-+++ new/drivers/dahdi/zaphfc/base.c	2009-09-18 04:48:13.000000000 +0300
-@@ -0,0 +1,1705 @@
++++ new/drivers/dahdi/zaphfc/base.c	2010-09-08 20:33:40.000000000 +0300
+@@ -0,0 +1,1709 @@
 +/*
 + * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
 + *
@@ -36,6 +42,9 @@
 +#include <linux/module.h>
 +#include <linux/moduleparam.h>
 +#include <linux/version.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32))
++#include <linux/sched.h>
++#endif
 +#include <linux/kernel.h>
 +#include <linux/delay.h>
 +#include <linux/proc_fs.h>
@@ -661,6 +670,7 @@
 +			hfctmp->nt_mode ? "NT" : "TE");
 +	hfccard->span.spantype = hfctmp->nt_mode ? "NT" : "TE";
 +	hfccard->span.manufacturer = "Cologne Chips";
++	hfccard->span.owner = THIS_MODULE;
 +	hfccard->span.spanconfig = hfc_zap_spanconfig;
 +	hfccard->span.chanconfig = hfc_zap_chanconfig;
 +	hfccard->span.startup = hfc_zap_startup;
@@ -703,7 +713,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 {