[Pkg-voip-commits] r6600 - in /dahdi-linux/trunk/drivers/dahdi: zaphfc.c zaphfc.h

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Jan  1 14:39:15 2009
New Revision: 6600

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6600
Log:
Fix for zaphfc with DAHDI (by  Timo Teräs <timo.teras at iki.fi>)

Modified:
    dahdi-linux/trunk/drivers/dahdi/zaphfc.c
    dahdi-linux/trunk/drivers/dahdi/zaphfc.h

Modified: dahdi-linux/trunk/drivers/dahdi/zaphfc.c
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/drivers/dahdi/zaphfc.c?rev=6600&op=diff
==============================================================================
--- dahdi-linux/trunk/drivers/dahdi/zaphfc.c (original)
+++ dahdi-linux/trunk/drivers/dahdi/zaphfc.c Thu Jan  1 14:39:15 2009
@@ -870,9 +870,10 @@
     zthfc->span.close = zthfc_close;
     zthfc->span.ioctl = zthfc_ioctl;
 
+    zthfc->span.channels = 3;
+    zthfc->span.chans = zthfc->_chans;
     for (i = 0; i < zthfc->span.channels; i++)
-    	zthfc->span.chans[i] = &zthfc->chans[i];
-    zthfc->span.channels = 3;
+        zthfc->_chans[i] = &zthfc->chans[i];
     zthfc->span.deflaw = DAHDI_LAW_ALAW;
     zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
     zthfc->span.offset = 0;

Modified: dahdi-linux/trunk/drivers/dahdi/zaphfc.h
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/drivers/dahdi/zaphfc.h?rev=6600&op=diff
==============================================================================
--- dahdi-linux/trunk/drivers/dahdi/zaphfc.h (original)
+++ dahdi-linux/trunk/drivers/dahdi/zaphfc.h Thu Jan  1 14:39:15 2009
@@ -281,6 +281,7 @@
     unsigned int usecount;
     struct dahdi_span span;
     struct dahdi_chan chans[3];
+    struct dahdi_chan _chans[3];
     struct hfc_card *card;
 } dahdi_hfc;