Added alpha support for the Realtek r8169 chipset, thanks to Scott

Hassan.

NEWS

@@ -51,9 +51,12 @@ Changes in version 1.4.0:
 * Mapping of Pdo entries is now supported.
 * Current Pdo assignment/mapping is now read via CoE during bus scan, using
   direct Sdo access, independent of the dictionary.
-* Added 8139too driver for kernel 2.6.22, thanks to Erwin Burgstaller.
-* Added 8139too driver for kernel 2.6.23, thanks to Richard Hacker.
-* Added e1000 driver for kernel 2.6.22.
+* Network driver news:
+    - Added 8139too driver for kernel 2.6.22, thanks to Erwin Burgstaller.
+    - Added 8139too driver for kernel 2.6.23, thanks to Richard Hacker.
+    - Added e1000 driver for kernel 2.6.22.
+    - Added alpha support for the Reaktek r8169 chipset, thanks to Scott
+      Hassan.
 * Added support for slaves that do not support the LRW datagram type. Separate
   domains have to be used for inputs and output.
 * Allow gaps in PDO mapping read from CoE.

configure.ac

@@ -296,6 +296,61 @@ fi
 
 AC_SUBST(KERNEL_E1000,[$kernele1000])
 
+#------------------------------------------------------------------------------
+# r8169 driver
+#------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([r8169],
+    AS_HELP_STRING([--enable-r8169],
+                   [Enable r8169 driver]),
+    [
+        case "${enableval}" in
+            yes) enabler8169=1
+                ;;
+            no) enabler8169=0
+                ;;
+            *) AC_MSG_ERROR([Invalid value for --enable-r8169])
+                ;;
+        esac
+    ],
+    [enabler8169=0] # disabled by default
+)
+
+AM_CONDITIONAL(ENABLE_R8169, test "x$enabler8169" = "x1")
+AC_SUBST(ENABLE_R8169,[$enabler8169])
+
+AC_ARG_WITH([r8169-kernel],
+    AC_HELP_STRING(
+        [--with-r8169-kernel=<X.Y.Z>],
+        [r8169 kernel (only if differing)]
+    ),
+    [
+        kernelr8169=[$withval]
+    ],
+    [
+        kernelr8169=$linuxversion
+    ]
+)
+
+if test "x${enabler8169}" = "x1"; then
+    AC_MSG_CHECKING([for kernel for r8169 driver])
+
+    kernels=`ls -1 devices/ | grep -oE "^r8169-.*-" | cut -d "-" -f 2 | uniq`
+    found=0
+    for k in $kernels; do
+        if test "$kernelr8169" = "$k"; then
+            found=1
+        fi
+    done
+    if test $found -ne 1; then
+        AC_MSG_ERROR([kernel $kernelr8169 not available for r8169 driver!])
+    fi
+
+    AC_MSG_RESULT([$kernelr8169])
+fi
+
+AC_SUBST(KERNEL_R8169,[$kernelr8169])
+
 #------------------------------------------------------------------------------
 # RTAI path (optional)
 #------------------------------------------------------------------------------

devices/Kbuild.in

@@ -64,4 +64,11 @@ ifeq (@ENABLE_E1000@,1)
     obj-m += e1000/
 endif
 
+ifeq (@ENABLE_R8169@,1)
+	EC_R8169_OBJ := r8169-@KERNEL_R8169@-ethercat.o
+	obj-m += ec_r8169.o
+	ec_r8169-objs := $(EC_R8169_OBJ)
+	CFLAGS_$(EC_R8169_OBJ) = -DSVNREV=$(REV)
+endif
+
 #------------------------------------------------------------------------------

devices/Makefile.am

@@ -36,8 +36,6 @@ SUBDIRS = e1000
 DIST_SUBDIRS = e1000
 
 EXTRA_DIST = \
-	Kbuild.in \
-	ecdev.h \
 	8139too-2.6.13-ethercat.c \
 	8139too-2.6.13-orig.c \
 	8139too-2.6.17-ethercat.c \
@@ -50,12 +48,18 @@ EXTRA_DIST = \
 	8139too-2.6.22-orig.c \
 	8139too-2.6.23-ethercat.c \
 	8139too-2.6.23-orig.c \
+	Kbuild.in \
 	e100-2.6.18-ethercat.c \
 	e100-2.6.18-orig.c \
+	ecdev.h \
 	forcedeth-2.6.17-ethercat.c \
 	forcedeth-2.6.17-orig.c \
 	forcedeth-2.6.19-ethercat.c \
-	forcedeth-2.6.19-orig.c
+	forcedeth-2.6.19-orig.c \
+    r8169-2.6.22-ethercat.c \
+    r8169-2.6.22-orig.c \
+    r8169-2.6.23-ethercat.c \
+    r8169-2.6.23-orig.c
 
 modules:
 	$(MAKE) -C "@abs_top_srcdir@" modules
@@ -68,11 +72,14 @@ endif
 if ENABLE_E100
 	cp $(srcdir)/ec_e100.ko $(DESTDIR)$(LINUX_MOD_PATH)
 endif
+if ENABLE_E1000
+	$(MAKE) -C e1000 modules_install
+endif
 if ENABLE_FORCEDETH
 	cp $(srcdir)/ec_forcedeth.ko $(DESTDIR)$(LINUX_MOD_PATH)
 endif
-if ENABLE_E1000
-	$(MAKE) -C e1000 modules_install
+if ENABLE_R8169
+	cp $(srcdir)/ec_r8169.ko $(DESTDIR)$(LINUX_MOD_PATH)
 endif
 
 clean-local: