# HG changeset patch # User Florian Pose # Date 1190190140 0 # Node ID 0e6e1ef2b6bcf414ae16902f9d48060a5096c5e5 # Parent b13ef712a2d758bd0d85baa7eed9d303562384e1 Removed config.kbuild and replaced Kbuild files by Kbuild.in files. diff -r b13ef712a2d7 -r 0e6e1ef2b6bc Kbuild --- a/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id$ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -obj-m := master/ devices/ dummy/ - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,36 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +obj-m := master/ devices/ dummy/ + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc Makefile.am --- a/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -39,7 +39,7 @@ Doxyfile \ FEATURES \ globals.h \ - Kbuild \ + Kbuild.in \ README.EoE modules: @@ -74,13 +74,13 @@ config.h.in \ config.log \ config.status \ - config.kbuild \ configure.in \ configure \ Makefile \ Makefile.in \ stamp-h1 \ ChangeLog \ + Kbuild \ *~ doc: diff -r b13ef712a2d7 -r 0e6e1ef2b6bc NEWS --- a/NEWS Tue Sep 18 14:19:21 2007 +0000 +++ b/NEWS Wed Sep 19 08:22:20 2007 +0000 @@ -4,6 +4,12 @@ ------------------------------------------------------------------------------- +Changes in version 1.3.2: + +* Removed config.kbuild and replaced Kbuild files by Kbuild.in files. + +------------------------------------------------------------------------------- + Changes in version 1.3.1: * Improved EoE handling: Avoided skipping of datagrams and release lock diff -r b13ef712a2d7 -r 0e6e1ef2b6bc configure.ac --- a/configure.ac Tue Sep 18 14:19:21 2007 +0000 +++ b/configure.ac Wed Sep 19 08:22:20 2007 +0000 @@ -97,6 +97,7 @@ ) AM_CONDITIONAL(ENABLE_8139TOO, test "x$enable8139too" = "x1") +AC_SUBST(ENABLE_8139TOO,[$enable8139too]) AC_ARG_WITH([8139too-kernel], AC_HELP_STRING( @@ -128,6 +129,8 @@ AC_MSG_RESULT([$kernel8139too]) fi +AC_SUBST(KERNEL_8139TOO,[$kernel8139too]) + #------------------------------------------------------------------------------ # e100 driver #------------------------------------------------------------------------------ @@ -149,6 +152,7 @@ ) AM_CONDITIONAL(ENABLE_E100, test "x$enablee100" = "x1") +AC_SUBST(ENABLE_E100,[$enablee100]) AC_ARG_WITH([e100-kernel], AC_HELP_STRING( @@ -180,6 +184,8 @@ AC_MSG_RESULT([$kernele100]) fi +AC_SUBST(KERNEL_E100,[$kernele100]) + #------------------------------------------------------------------------------ # forcedeth driver #------------------------------------------------------------------------------ @@ -201,6 +207,7 @@ ) AM_CONDITIONAL(ENABLE_FORCEDETH, test "x$enableforcedeth" = "x1") +AC_SUBST(ENABLE_FORCEDETH,[$enableforcedeth]) AC_ARG_WITH([forcedeth-kernel], AC_HELP_STRING( @@ -232,6 +239,8 @@ AC_MSG_RESULT([$kernelforcedeth]) fi +AC_SUBST(KERNEL_FORCEDETH,[$kernelforcedeth]) + #------------------------------------------------------------------------------ # e1000 driver #------------------------------------------------------------------------------ @@ -253,6 +262,7 @@ ) AM_CONDITIONAL(ENABLE_E1000, test "x$enablee1000" = "x1") +AC_SUBST(ENABLE_E1000,[$enablee1000]) AC_ARG_WITH([e1000-kernel], AC_HELP_STRING( @@ -284,6 +294,8 @@ AC_MSG_RESULT([$kernele1000]) fi +AC_SUBST(KERNEL_E1000,[$kernele1000]) + #------------------------------------------------------------------------------ # RTAI path (optional) #------------------------------------------------------------------------------ @@ -310,8 +322,9 @@ AC_MSG_ERROR([no RTAI installation found in ${rtaidir}!]) fi AC_MSG_RESULT([$rtaidir]) - AC_SUBST(RTAI_DIR,[$rtaidir]) -fi +fi + +AC_SUBST(RTAI_DIR,[$rtaidir]) #------------------------------------------------------------------------------ # MSR path (optional) @@ -339,8 +352,9 @@ AC_MSG_ERROR([no MSR installation found in ${msrdir}!]) fi AC_MSG_RESULT([$msrdir]) - AC_SUBST(MSR_DIR,[$msrdir]) -fi +fi + +AC_SUBST(MSR_DIR,[$msrdir]) #------------------------------------------------------------------------------ # Debug interface @@ -366,6 +380,7 @@ AC_DEFINE([EC_DEBUG_IF], [1], [Debug interfaces enabled]) fi AM_CONDITIONAL(ENABLE_DEBUG_IF, test "x$dbg" = "x1") +AC_SUBST(ENABLE_DEBUG_IF,[$dbg]) #------------------------------------------------------------------------------ # Debug ring @@ -412,6 +427,7 @@ ) AM_CONDITIONAL(ENABLE_DUMMY, test "x$dummy" = "x1") +AC_SUBST(ENABLE_DUMMY,[$dummy]) #------------------------------------------------------------------------------ # Ethernet-over-EtherCAT support @@ -437,45 +453,31 @@ AC_DEFINE([EC_EOE], [1], [EoE support enabled]) fi AM_CONDITIONAL(ENABLE_EOE, test "x$eoe" = "x1") - -#------------------------------------------------------------------------------ - -# Create config.kbuild - -echo configure: creating config.kbuild... - -cat > config.kbuild </dev/null || echo "unknown"; \ - fi) - -ifeq ($(ENABLE_8139TOO),1) - EC_8139TOO_OBJ := 8139too-$(KERNEL_8139TOO)-ethercat.o - obj-m += ec_8139too.o - ec_8139too-objs := $(EC_8139TOO_OBJ) - CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV) -endif - -ifeq ($(ENABLE_E100),1) - EC_E100_OBJ := e100-$(KERNEL_E100)-ethercat.o - obj-m += ec_e100.o - ec_e100-objs := $(EC_E100_OBJ) - CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV) -endif - -ifeq ($(ENABLE_FORCEDETH),1) - EC_FORCEDETH_OBJ := forcedeth-$(KERNEL_FORCEDETH)-ethercat.o - obj-m += ec_forcedeth.o - ec_forcedeth-objs := $(EC_FORCEDETH_OBJ) - CFLAGS_$(EC_FORCEDETH_OBJ) = -DSVNREV=$(REV) -endif - -ifeq ($(ENABLE_E1000),1) - obj-m += e1000/ -endif - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc devices/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devices/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,65 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +REV := $(shell if test -s $(src)/../svnrevision; then \ + cat $(src)/../svnrevision; \ + else \ + svnversion $(src)/.. 2>/dev/null || echo "unknown"; \ + fi) + +ifeq (@ENABLE_8139TOO@,1) + EC_8139TOO_OBJ := 8139too-@KERNEL_8139TOO@-ethercat.o + obj-m += ec_8139too.o + ec_8139too-objs := $(EC_8139TOO_OBJ) + CFLAGS_$(EC_8139TOO_OBJ) = -DSVNREV=$(REV) +endif + +ifeq (@ENABLE_E100@,1) + EC_E100_OBJ := e100-@KERNEL_E100@-ethercat.o + obj-m += ec_e100.o + ec_e100-objs := $(EC_E100_OBJ) + CFLAGS_$(EC_E100_OBJ) = -DSVNREV=$(REV) +endif + +ifeq (@ENABLE_FORCEDETH@,1) + EC_FORCEDETH_OBJ := forcedeth-@KERNEL_FORCEDETH@-ethercat.o + obj-m += ec_forcedeth.o + ec_forcedeth-objs := $(EC_FORCEDETH_OBJ) + CFLAGS_$(EC_FORCEDETH_OBJ) = -DSVNREV=$(REV) +endif + +ifeq (@ENABLE_E1000@,1) + obj-m += e1000/ +endif + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc devices/Makefile.am --- a/devices/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/devices/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -36,7 +36,7 @@ DIST_SUBDIRS = e1000 EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ ecdev.h \ 8139too-2.6.13-ethercat.c \ 8139too-2.6.13-orig.c \ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc devices/e1000/Kbuild --- a/devices/e1000/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id: Kbuild 790 2007-02-21 12:41:25Z fp $ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -TOPDIR := $(src)/../.. -include $(TOPDIR)/config.kbuild - -REV := $(shell if test -s $(TOPDIR)/svnrevision; then \ - cat $(TOPDIR)/svnrevision; \ - else \ - svnversion $(TOPDIR) 2>/dev/null || echo "unknown"; \ - fi) - -ifeq ($(ENABLE_E1000),1) - EC_E1000_OBJ := e1000_main-$(KERNEL_E1000)-ethercat.o \ - e1000_hw-$(KERNEL_E1000)-ethercat.o \ - e1000_ethtool-$(KERNEL_E1000)-ethercat.o \ - e1000_param-$(KERNEL_E1000)-ethercat.o - obj-m += ec_e1000.o - ec_e1000-objs := $(EC_E1000_OBJ) - CFLAGS_e1000_main-$(KERNEL_E1000)-ethercat.o = -DSVNREV=$(REV) -endif - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc devices/e1000/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devices/e1000/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,52 @@ +#------------------------------------------------------------------------------ +# +# $Id: Kbuild 790 2007-02-21 12:41:25Z fp $ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +TOPDIR := $(src)/../.. + +REV := $(shell if test -s $(TOPDIR)/svnrevision; then \ + cat $(TOPDIR)/svnrevision; \ + else \ + svnversion $(TOPDIR) 2>/dev/null || echo "unknown"; \ + fi) + +ifeq (@ENABLE_E1000@,1) + EC_E1000_OBJ := e1000_main-@KERNEL_E1000@-ethercat.o \ + e1000_hw-@KERNEL_E1000@-ethercat.o \ + e1000_ethtool-@KERNEL_E1000@-ethercat.o \ + e1000_param-@KERNEL_E1000@-ethercat.o + obj-m += ec_e1000.o + ec_e1000-objs := $(EC_E1000_OBJ) + CFLAGS_e1000_main-@KERNEL_E1000@-ethercat.o = -DSVNREV=$(REV) +endif + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc devices/e1000/Makefile.am --- a/devices/e1000/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/devices/e1000/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ e1000_ethtool-2.6.13-ethercat.c \ e1000_ethtool-2.6.13-orig.c \ e1000-2.6.13-ethercat.h \ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc dummy/Kbuild --- a/dummy/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id: Kbuild 844 2007-03-08 18:15:25Z fp $ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -include $(src)/../config.kbuild - -REV := $(shell if test -s $(src)/../svnrevision; then \ - cat $(src)/../svnrevision; \ - else \ - svnversion $(src) 2>/dev/null || echo "unknown"; \ - fi) - -ifeq ($(ENABLE_DUMMY),1) - obj-m := ec_dummy.o - ec_dummy-objs := module.o master.o slave.o domain.o - CFLAGS_dummy.o := -DSVNREV=$(REV) -endif - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc dummy/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dummy/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,46 @@ +#------------------------------------------------------------------------------ +# +# $Id: Kbuild 844 2007-03-08 18:15:25Z fp $ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +REV := $(shell if test -s $(src)/../svnrevision; then \ + cat $(src)/../svnrevision; \ + else \ + svnversion $(src) 2>/dev/null || echo "unknown"; \ + fi) + +ifeq (@ENABLE_DUMMY@,1) + obj-m := ec_dummy.o + ec_dummy-objs := module.o master.o slave.o domain.o + CFLAGS_dummy.o := -DSVNREV=$(REV) +endif + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc dummy/Makefile.am --- a/dummy/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/dummy/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ module.c \ master.c \ slave.c \ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/mini/Kbuild --- a/examples/mini/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id$ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -obj-m := ec_mini.o - -ec_mini-objs := mini.o - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/mini/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/mini/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,38 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +obj-m := ec_mini.o + +ec_mini-objs := mini.o + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/mini/Makefile.am --- a/examples/mini/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/examples/mini/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -35,7 +35,9 @@ # #------------------------------------------------------------------------------ -EXTRA_DIST = Kbuild mini.c +EXTRA_DIST = \ + Kbuild.in \ + mini.c all: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/msr/Kbuild --- a/examples/msr/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id$ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -include $(src)/../../config.kbuild - -MODULE := ec_msr_sample - -obj-m := $(MODULE).o - -$(MODULE)-objs := msr_sample.o \ - rt_lib/msr-core/msr_lists.o \ - rt_lib/msr-core/msr_main.o \ - rt_lib/msr-core/msr_charbuf.o \ - rt_lib/msr-core/msr_reg.o \ - rt_lib/msr-core/msr_interpreter.o \ - rt_lib/msr-core/msr_messages.o \ - rt_lib/msr-core/msr_proc.o \ - rt_lib/msr-core/msr_error_reg.o \ - rt_lib/msr-utils/msr_utils.o \ - rt_lib/msr-utils/msr_time.o \ - rt_lib/msr-math/msr_base64.o \ - rt_lib/msr-math/msr_hex_bin.o \ - libm.o - -EXTRA_CFLAGS := -I$(MSR_DIR)/include -I$(RTAI_DIR)/include \ - -D_SIMULATION -mhard-float - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/msr/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/msr/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,56 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +MODULE := ec_msr_sample + +obj-m := $(MODULE).o + +$(MODULE)-objs := msr_sample.o \ + rt_lib/msr-core/msr_lists.o \ + rt_lib/msr-core/msr_main.o \ + rt_lib/msr-core/msr_charbuf.o \ + rt_lib/msr-core/msr_reg.o \ + rt_lib/msr-core/msr_interpreter.o \ + rt_lib/msr-core/msr_messages.o \ + rt_lib/msr-core/msr_proc.o \ + rt_lib/msr-core/msr_error_reg.o \ + rt_lib/msr-utils/msr_utils.o \ + rt_lib/msr-utils/msr_time.o \ + rt_lib/msr-math/msr_base64.o \ + rt_lib/msr-math/msr_hex_bin.o \ + libm.o + +EXTRA_CFLAGS := -I@MSR_DIR@/include -I@RTAI_DIR@/include \ + -D_SIMULATION -mhard-float + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/msr/Makefile.am --- a/examples/msr/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/examples/msr/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ libm.o_shipped \ msr_sample.c \ msrserv.pl \ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/rtai/Kbuild --- a/examples/rtai/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id$ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -include $(src)/../../config.kbuild - -obj-m := ec_rtai_sample.o - -ec_rtai_sample-objs := rtai_sample.o - -EXTRA_CFLAGS := -I$(RTAI_DIR)/include - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/rtai/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/rtai/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,40 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +obj-m := ec_rtai_sample.o + +ec_rtai_sample-objs := rtai_sample.o + +EXTRA_CFLAGS := -I@RTAI_DIR@/include + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc examples/rtai/Makefile.am --- a/examples/rtai/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/examples/rtai/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -33,7 +33,9 @@ # #------------------------------------------------------------------------------ -EXTRA_DIST = Kbuild rtai_sample.c +EXTRA_DIST = \ + Kbuild.in \ + rtai_sample.c all: $(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules diff -r b13ef712a2d7 -r 0e6e1ef2b6bc master/Kbuild --- a/master/Kbuild Tue Sep 18 14:19:21 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -#------------------------------------------------------------------------------ -# -# $Id$ -# -# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH -# -# This file is part of the IgH EtherCAT Master. -# -# The IgH EtherCAT Master is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# The IgH EtherCAT Master is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the IgH EtherCAT Master; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# The right to use EtherCAT Technology is granted and comes free of -# charge under condition of compatibility of product made by -# Licensee. People intending to distribute/sell products based on the -# code, have to sign an agreement to guarantee that products using -# software based on IgH EtherCAT master stay compatible with the actual -# EtherCAT specification (which are released themselves as an open -# standard) as the (only) precondition to have the right to use EtherCAT -# Technology, IP and trade marks. -# -#------------------------------------------------------------------------------ - -include $(src)/../config.kbuild - -obj-m := ec_master.o - -ec_master-objs := module.o master.o device.o pdo.o sync.o fmmu.o slave.o \ - datagram.o domain.o mailbox.o canopen.o fsm_sii.o fsm_change.o \ - fsm_coe.o fsm_mapping.o fsm_slave.o fsm_master.o xmldev.o - -ifeq ($(ENABLE_EOE),1) - ec_master-objs += ethernet.o -endif -ifeq ($(ENABLE_DEBUG_IF),1) - ec_master-objs += debug.o -endif - -REV := $(shell if test -s $(src)/../svnrevision; then \ - cat $(src)/../svnrevision; \ - else \ - svnversion $(src) 2>/dev/null || echo "unknown"; \ - fi) - -CFLAGS_module.o := -DSVNREV=$(REV) - -#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc master/Kbuild.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/master/Kbuild.in Wed Sep 19 08:22:20 2007 +0000 @@ -0,0 +1,55 @@ +#------------------------------------------------------------------------------ +# +# $Id$ +# +# Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH +# +# This file is part of the IgH EtherCAT Master. +# +# The IgH EtherCAT Master is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# The IgH EtherCAT Master is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the IgH EtherCAT Master; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# The right to use EtherCAT Technology is granted and comes free of +# charge under condition of compatibility of product made by +# Licensee. People intending to distribute/sell products based on the +# code, have to sign an agreement to guarantee that products using +# software based on IgH EtherCAT master stay compatible with the actual +# EtherCAT specification (which are released themselves as an open +# standard) as the (only) precondition to have the right to use EtherCAT +# Technology, IP and trade marks. +# +#------------------------------------------------------------------------------ + +obj-m := ec_master.o + +ec_master-objs := module.o master.o device.o pdo.o sync.o fmmu.o slave.o \ + datagram.o domain.o mailbox.o canopen.o fsm_sii.o fsm_change.o \ + fsm_coe.o fsm_mapping.o fsm_slave.o fsm_master.o xmldev.o + +ifeq (@ENABLE_EOE@,1) + ec_master-objs += ethernet.o +endif +ifeq (@ENABLE_DEBUG_IF@,1) + ec_master-objs += debug.o +endif + +REV := $(shell if test -s $(src)/../svnrevision; then \ + cat $(src)/../svnrevision; \ + else \ + svnversion $(src) 2>/dev/null || echo "unknown"; \ + fi) + +CFLAGS_module.o := -DSVNREV=$(REV) + +#------------------------------------------------------------------------------ diff -r b13ef712a2d7 -r 0e6e1ef2b6bc master/Makefile.am --- a/master/Makefile.am Tue Sep 18 14:19:21 2007 +0000 +++ b/master/Makefile.am Wed Sep 19 08:22:20 2007 +0000 @@ -32,7 +32,7 @@ #------------------------------------------------------------------------------ EXTRA_DIST = \ - Kbuild \ + Kbuild.in \ canopen.c canopen.h \ datagram.c datagram.h \ debug.c debug.h \