[IPCop-cvs] ipcop/src/patches tg3-3.92n_linux-2.4.patch, NONE, 1.1.2.1 tg3-3.92e_le32-be32.patch, 1.1.2.1, NONE

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/src/patches
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5064/src/patches

Added Files:
      Tag: IPCOP_v1_4_0
	tg3-3.92n_linux-2.4.patch 
Removed Files:
      Tag: IPCOP_v1_4_0
	tg3-3.92e_le32-be32.patch 
Log Message:
Upgrade tg3 driver to 3.92n and define USED_PER_SEC
Update the rootfiles


--- NEW FILE: tg3-3.92n_linux-2.4.patch ---
define USED_PER_SEC when needed
silent the error when jiffies.h does not exist

USEC_TO_xx does not exist on 2.4 but will not be used so they stay commented

--- tg3-3.92n/tg3_compat.h.old	2008-09-30 00:11:05.000000000 +0200
+++ tg3-3.92n/tg3_compat.h	2009-08-19 00:24:30.000000000 +0200
@@ -50,7 +50,19 @@
 }
 #endif
 
+#ifndef BCM_HAS_USEC_PER_SEC
+#define USEC_PER_SEC 1000000L
+#endif
+
 #ifndef BCM_HAS_USECS_TO_JIFFIES
+/* borrowed to a 2.6.27 kernel timeconst.h with HZ=100
+   this may not be the right way to do that but if it work for us...
+*/
+//#define U64_C(x) x ## ULL
+//#define USEC_TO_HZ_MUL32        U64_C(0xd1b71759)
+//#define USEC_TO_HZ_ADJ32        U64_C(0x1fff2e48e8a7)
+//#define USEC_TO_HZ_SHR32        45
+
 unsigned long usecs_to_jiffies(const unsigned int u)
 {
 	if (u > jiffies_to_usecs(MAX_JIFFY_OFFSET))
--- tg3-3.92n/makeflags.sh.old	2008-09-23 00:19:03.000000000 +0200
+++ tg3-3.92n/makeflags.sh	2009-08-19 00:24:43.000000000 +0200
@@ -20,7 +20,11 @@
 	echo "#define BCM_HAS_KZALLOC"
 fi
 
-if grep -q "usecs_to_jiffies" $1/include/linux/jiffies.h ; then
+if grep -q "USEC_PER_SEC" $1/include/linux/time.h; then
+	echo "#define BCM_HAS_USEC_PER_SEC"
+fi
+
+if grep -q "usecs_to_jiffies" $1/include/linux/jiffies.h 2>/dev/null; then
 	echo "#define BCM_HAS_USECS_TO_JIFFIES"
 fi
 

--- tg3-3.92e_le32-be32.patch DELETED ---