[Pkg-voip-commits] r7591 - in /dahdi-linux/trunk/debian: changelog patches/series patches/wcfxo_reset_fix

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Sep 12 19:23:48 2009
New Revision: 7591

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7591
Log:
Patch wcfxo_reset_fix: Closes: #546340 .

Added:
    dahdi-linux/trunk/debian/patches/wcfxo_reset_fix
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=7591&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sat Sep 12 19:23:48 2009
@@ -8,8 +8,9 @@
   * Remove obsolete bristuff drivers we don't build anyway.
     Leave vzaphfc for now as this is practically upstream.
   * Not applying bri_dchan. Astribank BRI spans will use hardhdlc.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 12 Sep 2009 21:27:40 +0300
+  * Patch wcfxo_reset_fix: Closes: #546340 .
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 12 Sep 2009 22:21:36 +0300
 
 dahdi-linux (1:2.2.0~dfsg~rc5-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7591&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sat Sep 12 19:23:48 2009
@@ -13,3 +13,4 @@
 oslec_kbuild
 no_firmware_download
 mmx_auto
+wcfxo_reset_fix

Added: dahdi-linux/trunk/debian/patches/wcfxo_reset_fix
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/wcfxo_reset_fix?rev=7591&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/wcfxo_reset_fix (added)
+++ dahdi-linux/trunk/debian/patches/wcfxo_reset_fix Sat Sep 12 19:23:48 2009
@@ -1,0 +1,46 @@
+wcfxo: Reset the DAA on module initialization.
+
+The X100p and clones will sometimes work and sometimes not depending on wether
+the DAA powers up in running state- this seems to be related to the power
+supply. This problem is caused by the driver not reseting the DAA and may be
+the source of a great many intermittent problems with this card.
+
+(closes issue #14232)
+Reported by: tallen8840
+Patch by: tallen8840
+Tested by: explidous, Flavio
+
+Source: http://svn.digium.com/svn/dahdi/linux/trunk@7008
+
+To be included in dahdi-linux 2.3 .
+
+diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
+index 69b42a0..5e61edb 100644
+--- a/drivers/dahdi/wcfxo.c
++++ b/drivers/dahdi/wcfxo.c
+@@ -674,6 +674,16 @@ static int wcfxo_hardware_init(struct wcfxo *wc)
+ 	/* Hardware stuff */
+ 	/* Reset PCI Interface chip and registers */
+ 	outb(0x0e, wc->ioaddr + WC_CNTL);
++
++	/* Set all to outputs except AUX 4, which is an input */
++	outb(0xef, wc->ioaddr + WC_AUXC);
++
++	/* Reset the DAA (DAA uses AUX5 for reset) */
++	outb(0x00, wc->ioaddr + WC_AUXD);
++	set_current_state(TASK_INTERRUPTIBLE);
++	schedule_timeout(1 + HZ / 800);
++
++	/* Set hook state to on hook & un-reset the DAA */
+ 	if (wc->flags & FLAG_RESET_ON_AUX5) {
+ 		/* Set hook state to on hook for when we switch.
+ 		   Make sure reset is high */
+@@ -682,8 +692,6 @@ static int wcfxo_hardware_init(struct wcfxo *wc)
+ 		/* Set hook state to on hook for when we switch */
+ 		outb(0x24, wc->ioaddr + WC_AUXD);
+ 	}
+-	/* Set all to outputs except AUX 4, which is an input */
+-	outb(0xef, wc->ioaddr + WC_AUXC);
+ 
+ 	/* Back to normal, with automatic DMA wrap around */
+ 	outb(0x01, wc->ioaddr + WC_CNTL);