[Pkg-voip-commits] r4501 - in /zaptel/trunk: debian/changelog vzaphfc/ChangeLog vzaphfc/vzaphfc.h vzaphfc/vzaphfc_main.c

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Sep 15 10:24:51 2007
New Revision: 4501

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4501
Log:
* vzaphfc: update to 1.44, and apply our fixes.
* vzaphfc: fix building with Sarge 2.6 kernels.

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/vzaphfc/ChangeLog
    zaptel/trunk/vzaphfc/vzaphfc.h
    zaptel/trunk/vzaphfc/vzaphfc_main.c

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=4501&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sat Sep 15 10:24:51 2007
@@ -9,7 +9,11 @@
   [ Mark Purcell ]
   * Remove Build-Depends restrictions for packages in stable
 
- -- Mark Purcell <msp at debian.org>  Sun, 02 Sep 2007 10:56:23 +0100
+  [ Tzafrir Cohen ]
+  * vzaphfc: update to 1.44, and apply our fixes.
+  * vzaphfc: fix building with Sarge 2.6 kernels.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 15 Sep 2007 04:43:53 +0300
 
 zaptel (1:1.4.5.1~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/vzaphfc/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/vzaphfc/ChangeLog?rev=4501&op=diff
==============================================================================
--- zaptel/trunk/vzaphfc/ChangeLog (original)
+++ zaptel/trunk/vzaphfc/ChangeLog Sat Sep 15 10:24:51 2007
@@ -1,3 +1,12 @@
+1.44 - 2007aug26 - Jens Wilke <jw_vzaphfc at headissue.com>
+- Fix for changes irq callback signature (pt_reqs removed)
+- Fix for missing CHECKSUM_COMPLETE in newer kernel version
+- Fix for missing linux/config.h in kernel headers
+- tested with Linux kernel 2.6.20
+
+1.43 - 2006oct03 - Jens Wilke <jw_vzaphfc at headissue.com>
+- fix wrong nt_modes parsing, found with kernel 2.6.15
+
 1.42 - 2006jun06 - Jens Wilke <jw_vzaphfc at headissue.com>
 - fixed fifo timing issue
 - added statistics for fifo underruns (RXU&TXU)

Modified: zaptel/trunk/vzaphfc/vzaphfc.h
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/vzaphfc/vzaphfc.h?rev=4501&op=diff
==============================================================================
--- zaptel/trunk/vzaphfc/vzaphfc.h (original)
+++ zaptel/trunk/vzaphfc/vzaphfc.h Sat Sep 15 10:24:51 2007
@@ -29,7 +29,7 @@
 #define hfc_DRIVER_NAME "vzaphfc"
 #define hfc_DRIVER_PREFIX hfc_DRIVER_NAME ": "
 #define hfc_DRIVER_DESCR "HFC-S PCI A Zaptel Driver"
-#define hfc_DRIVER_VERSION "1.42"
+#define hfc_DRIVER_VERSION "1.44"
 #define hfc_DRIVER_STRING hfc_DRIVER_DESCR " (V" hfc_DRIVER_VERSION ")"
 
 #define hfc_MAX_BOARDS 32

Modified: zaptel/trunk/vzaphfc/vzaphfc_main.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/vzaphfc/vzaphfc_main.c?rev=4501&op=diff
==============================================================================
--- zaptel/trunk/vzaphfc/vzaphfc_main.c (original)
+++ zaptel/trunk/vzaphfc/vzaphfc_main.c Sat Sep 15 10:24:51 2007
@@ -32,8 +32,6 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 
-#include "../zaptel.h"
-
 #include "vzaphfc.h"
 #include "fifo.h"
 #include "lapd.h"
@@ -49,8 +47,7 @@
 #define B2 2
 
 static int modes = 0; // all TE
-static int nt_modes[hfc_MAX_BOARDS];
-static int nt_modes_count;
+static int nt_modes[hfc_MAX_BOARDS] = { [0 ... (hfc_MAX_BOARDS-1)] = -1 };
 static int force_l1_up = 0;
 static int sniff_zaptel_d_channel = 0;
 static struct proc_dir_entry *hfc_proc_zaphfc_dir;
@@ -1330,7 +1327,7 @@
 	skb->ip_summed = CHECKSUM_COMPLETE;
 #else
 	skb->ip_summed = CHECKSUM_HW;
-#endif
+#endif	
 	skb->pkt_type = PACKET_OUTGOING;
 
 	memcpy(skb_put(skb, card->chans[D].tx.ugly_framebuf_size),
@@ -1527,7 +1524,6 @@
 			skb->pkt_type = PACKET_HOST;
 		}
 
-               // HFC does the checksum
 #ifndef CHECKSUM_HW
 		skb->ip_summed = CHECKSUM_COMPLETE;
 #else
@@ -1693,9 +1689,11 @@
 	if (modes & (1 << card->cardnum))
 		card->nt_mode = TRUE;
 
-	for (i=0; i<nt_modes_count; i++) {
-		if (nt_modes[i] == card->cardnum)
+	for (i=0; i<hfc_MAX_BOARDS; i++) {
+		/* DEBUG printk(KERN_INFO "nt_modes[%i]=%i\n", i, nt_modes[i]); */
+		if (nt_modes[i] == card->cardnum) {
 			card->nt_mode=TRUE;
+		}
 	}
 
 //---------------------------------- D
@@ -1999,10 +1997,15 @@
 
 module_param(modes, int, 0444);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-module_param_array(nt_modes, int, &nt_modes_count, 0444);
+/*
+ * Old 2.6 kernels had module_param_array() macro that receive the counter 
+ * by value.
+ */
+int nt_modes_num_values;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+module_param_array(nt_modes, int, nt_modes_num_values, 0444);
 #else
-module_param_array(nt_modes, int, nt_modes_count, 0444);
+module_param_array(nt_modes, int, &nt_modes_num_values, 0444);
 #endif
 
 module_param(force_l1_up, int, 0444);