Added testing version of forcedeth driver.

NEWS

@@ -6,7 +6,8 @@ $Id$
 
 Changes in version 1.3.0:
 
-* Added Intel e100 ethernet driver.
+* Added Intel PRO/100 ethernet driver (e100).
+* Added ethernet driver for NVIDIA nForce chipsets (forcedeth).
 * Removed "ec_eoeif_count" master module parameter.
 * Introduced "device IDs" to tell a master to wait for certain ethernet
   devices.

configure.ac

@@ -164,6 +164,58 @@ if test ${enablee100} -eq 1; then
     AC_MSG_RESULT([$kernele100])
 fi
 
+#------------------------------------------------------------------------------
+# forcedeth
+#------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([forcedeth],
+    AS_HELP_STRING([--enable-forcedeth],
+                   [Enable forcedeth driver]),
+    [
+        case "${enableval}" in
+            yes) enableforcedeth=1
+                ;;
+            no) enableforcedeth=0
+                ;;
+            *) AC_MSG_ERROR([Invalid value for --enable-forcedeth])
+                ;;
+        esac
+    ],
+    [enableforcedeth=0]
+)
+
+AM_CONDITIONAL(ENABLE_FORCEDETH, test "x$enableforcedeth" = x1)
+
+AC_ARG_WITH([forcedeth-kernel],
+    AC_HELP_STRING(
+        [--with-forcedeth-kernel=<X.Y.Z>],
+        [forcedeth kernel (only if differing)]
+    ),
+    [
+        kernelforcedeth=[$withval]
+    ],
+    [
+        kernelforcedeth=$linuxversion
+    ]
+)
+
+if test ${enableforcedeth} -eq 1; then
+    AC_MSG_CHECKING([for kernel for forcedeth driver])
+
+    kernels=`ls -1 devices/ | grep -oE "^forcedeth-.*-" | cut -d "-" -f 2 | uniq`
+    found=0
+    for k in $kernels; do
+        if test "$kernelforcedeth" = "$k"; then
+            found=1
+        fi
+    done
+    if test $found -ne 1; then
+        AC_MSG_ERROR([kernel $kernelforcedeth not available for forcedeth driver!])
+    fi
+
+    AC_MSG_RESULT([$kernelforcedeth])
+fi
+
 #------------------------------------------------------------------------------
 # RTAI path (optional)
 #------------------------------------------------------------------------------
@@ -258,6 +310,8 @@ EC_DBG_IF := ${dbg}
 EC_8139TOO_KERNEL := ${kernel8139too}
 ENABLE_E100 := ${enablee100}
 EC_E100_KERNEL := ${kernele100}
+ENABLE_FORCEDETH := ${enableforcedeth}
+EC_FORCEDETH_KERNEL := ${kernelforcedeth}
 EC_RTAI_DIR := "${rtaidir}"
 EC_MSR_DIR := "${msrdir}"
 EOF

devices/Kbuild

@@ -35,14 +35,19 @@ include $(src)/../config.kbuild
 
 EC_8139TOO_OBJ = 8139too-$(EC_8139TOO_KERNEL)-ethercat.o
 EC_E100_OBJ = e100-$(EC_E100_KERNEL)-ethercat.o
+EC_FORCEDETH_OBJ = forcedeth-$(EC_FORCEDETH_KERNEL)-ethercat.o
 
 obj-m := ec_8139too.o
 ifeq ($(ENABLE_E100),1)
 	obj-m += ec_e100.o
 endif
+ifeq ($(ENABLE_FORCEDETH),1)
+	obj-m += ec_forcedeth.o
+endif
 
 ec_8139too-objs := $(EC_8139TOO_OBJ)
 ec_e100-objs := $(EC_E100_OBJ)
+ec_forcedeth-objs := $(EC_FORCEDETH_OBJ)
 
 REV := $(shell if test -s $(src)/../svnrevision; then \
 		cat $(src)/../svnrevision; \
@@ -52,5 +57,6 @@ REV := $(shell if test -s $(src)/../svnrevision; then \
 
 CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV)
 CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV)
+CFLAGS_$(EC_FORCEDETH_OBJ) = -DSVNREV=$(REV)
 
 #------------------------------------------------------------------------------

devices/Makefile.am

@@ -43,7 +43,9 @@ EXTRA_DIST = \
 	8139too-2.6.19-ethercat.c \
 	8139too-2.6.19-orig.c \
 	e100-2.6.18-ethercat.c \
-	e100-2.6.18-orig.c
+	e100-2.6.18-orig.c \
+	forcedeth-2.6.17-ethercat.c \
+	forcedeth-2.6.17-orig.c
 
 modules:
 	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_top_srcdir@" modules
@@ -54,6 +56,9 @@ modules_install:
 if ENABLE_E100
 	cp $(srcdir)/ec_e100.ko $(DESTDIR)$(LINUX_MOD_PATH)
 endif
+if ENABLE_FORCEDETH
+	cp $(srcdir)/ec_forcedeth.ko $(DESTDIR)$(LINUX_MOD_PATH)
+endif
 
 clean-local:
 	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean