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

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Sep 23 16:19:07 2009
New Revision: 7629

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7629
Log:
Use new zaphfc drivers (r5) from http://code.google.com/p/zaphfc/ .
Note that those use hardhdlc in system.conf (Closes: #532345). 
Leave vzaphfc for now as this is practically upstream (Completely 
closes: #548061).

Modified:
    dahdi-linux/trunk/debian/changelog
    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=7629&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Wed Sep 23 16:19:07 2009
@@ -3,14 +3,15 @@
   * New upstream release
   * New openvox drivers: r113 from their SVN.
   * Fix copyright file for origin of OpenVox drivers.
-  * Use new zaphfc drivers from http://code.google.com/p/zaphfc/ .
-    Note that those use hardhdlc in system.conf . 
+  * Use new zaphfc drivers (r5) from http://code.google.com/p/zaphfc/ .
+    Note that those use hardhdlc in system.conf (Closes: #532345). 
   * Remove obsolete bristuff drivers we don't build anyway.
-    Leave vzaphfc for now as this is practically upstream.
+    Leave vzaphfc for now as this is practically upstream (Completely 
+   closes: #548061).
   * Not applying bri_dchan. Astribank BRI spans will use hardhdlc.
   * Patch wcfxo_reset_fix: Closes: #546340 .
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 12 Sep 2009 22:21:36 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 23 Sep 2009 19:03:07 +0300
 
 dahdi-linux (1:2.2.0~dfsg~rc5-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/patches/zaphfc
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/zaphfc?rev=7629&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/zaphfc (original)
+++ dahdi-linux/trunk/debian/patches/zaphfc Wed Sep 23 16:19:07 2009
@@ -1,9 +1,9 @@
-zaphfc r4
+zaphfc r5
 
 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-08 03:49:24.000000000 +0300
-@@ -0,0 +1,1707 @@
++++ new/drivers/dahdi/zaphfc/base.c	2009-09-18 04:48:13.000000000 +0300
+@@ -0,0 +1,1705 @@
 +/*
 + * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
 + *
@@ -632,10 +632,7 @@
 +	struct hfc_card *card = chan->card;
 +	struct dahdi_hfc *hfccard = card->ztdev;
 +
-+	if ((sigtype == DAHDI_SIG_HARDHDLC) || (hfccard->sigchan == d_chan)) {
-+		hfccard->sigchan = (sigtype == DAHDI_SIG_HARDHDLC)
-+			? d_chan : NULL;
-+
++	if ((sigtype == DAHDI_SIG_HARDHDLC) && (hfccard->sigchan == d_chan)) {
 +		hfccard->sigactive = 0;
 +		atomic_set(&hfccard->hdlc_pending, 0);
 +	}
@@ -1686,6 +1683,7 @@
 +MODULE_AUTHOR("Jens Wilke <jw_vzaphfc at headissue.com>, "
 +		"Daniele (Vihai) Orlandi <daniele at orlandi.com>, "
 +		"Jose A. Deniz <odicha at hotmail.com>");
++MODULE_ALIAS("vzaphfc");
 +#ifdef MODULE_LICENSE
 +MODULE_LICENSE("GPL");
 +#endif