bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed mail address; limited lines to 78 characters; removed $Id$.

This commit is contained in:
Florian Pose 2024-02-01 15:15:41 +01:00
parent 512bac72e2
commit ee55c20e28
283 changed files with 2137 additions and 2647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,7 +19,7 @@
#
# vi: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
obj-m := examples/ master/ devices/
@ -29,4 +27,4 @@ ifeq (@ENABLE_TTY@,1)
obj-m += tty/
endif
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

2
NEWS
View File

@ -1,7 +1,5 @@
-------------------------------------------------------------------------------
$Id$
vim: spelllang=en spell tw=78
-------------------------------------------------------------------------------

13
README.EoE
View File

@ -1,10 +1,8 @@
-------------------------------------------------------------------------------
$Id$
------------------------------------------------------------------------------
vim: spelllang=en spell tw=78
-------------------------------------------------------------------------------
------------------------------------------------------------------------------
This file shall give additional information on how to set up a network
environment with Ethernet over EtherCAT devices.
@ -12,8 +10,9 @@ environment with Ethernet over EtherCAT devices.
A virtual network interface will appear for every EoE-capable slave. The
interface naming scheme is either eoeXsY, where X is the master index and Y is
the slave's ring position, or (if the slave has an alias set) eoeXaZ, where Z
is the (decimal) alias address. Please provide a network configuration file for
any of these interfaces. On SUSE systems, these can look like the following:
is the (decimal) alias address. Please provide a network configuration file
for any of these interfaces. On SUSE systems, these can look like the
following:
/etc/sysconfig/network/ifcfg-eoe0s14:
IPADDRESS=10.0.0.14/8
@ -26,4 +25,4 @@ necessary. Instead, copy the file script/ifup-eoe.sh to your systems if-up.d
directory (on SUSE, this is /etc/sysconfig/network/if-up.d), and customize the
included variables.
-------------------------------------------------------------------------------
------------------------------------------------------------------------------

7
TODO
View File

@ -2,12 +2,15 @@
EtherCAT master TODO
$Id$
vim700: spelllang=en spell
-------------------------------------------------------------------------------
See issues on
https://gitlab.com/etherlab.org/ethercat/-/issues
-------------------------------------------------------------------------------
Future issues:
* Improve redundancy_active doc in ecrt.h.

8
bootstrap
View File

@ -1,7 +1,5 @@
#!/bin/bash
#----------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -20,7 +18,7 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
set -e
set -x
@ -33,4 +31,4 @@ mkdir -p m4
autoreconf -i
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------

10
devices/8139too-3.0-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -650,7 +648,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.10-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.12-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.14-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.16-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.2-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -651,7 +649,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.6-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-3.8-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -659,7 +657,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

10
devices/8139too-4.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -21,14 +19,14 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
EtherCAT driver for RTL8139-compatible NICs.
*/
/*****************************************************************************/
/****************************************************************************/
/*
Former documentation:
@ -663,7 +661,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

2
devices/8139too-5.10-ethercat.c
View File

@ -662,7 +662,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

2
devices/8139too-6.1-ethercat.c
View File

@ -663,7 +663,7 @@ struct rtl8139_private {
ec_device_t *ecdev;
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);

8
devices/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -94,4 +92,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
devices/ccat/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -50,4 +48,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

10
devices/ccat/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -19,7 +17,8 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
@ -32,5 +31,4 @@ EXTRA_DIST = \
update.h \
update.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

12
devices/e100-3.0-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -231,7 +229,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.10-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.12-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.14-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.16-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.6-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-3.8-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

12
devices/e100-4.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -23,7 +21,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -32,7 +30,7 @@
/* Former documentation: */
/*******************************************************************************
/*****************************************************************************
Intel PRO/100 Linux driver
Copyright(c) 1999 - 2006 Intel Corporation.
@ -58,7 +56,7 @@
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*******************************************************************************/
*****************************************************************************/
/*
* e100.c: Intel(R) PRO/100 ethernet driver
@ -233,7 +231,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

8
devices/e100-5.10-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -24,7 +22,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -206,7 +204,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
void e100_ec_poll(struct net_device *);

8
devices/e100-5.14-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -24,7 +22,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -218,7 +216,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
void e100_ec_poll(struct net_device *);

8
devices/e100-5.15-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -24,7 +22,7 @@
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -206,7 +204,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
void e100_ec_poll(struct net_device *);

9
devices/e100-5.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,12 +17,11 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* ---
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -209,7 +206,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION ", master " EC_MASTER_VERSION);

9
devices/e100-6.1-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,12 +17,11 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* ---
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -206,7 +203,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
void e100_ec_poll(struct net_device *);

9
devices/e100-6.4-ethercat.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2007-2012 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,12 +17,11 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
* ---
*
* vim: noexpandtab
*
*****************************************************************************/
****************************************************************************/
/**
\file
@ -206,7 +203,7 @@ MODULE_FIRMWARE(FIRMWARE_D101S);
MODULE_FIRMWARE(FIRMWARE_D102E);
MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_LICENSE("GPL");
void e100_ec_poll(struct net_device *);

8
devices/e1000/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -51,4 +49,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

9
devices/e1000/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -19,7 +17,8 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
@ -207,4 +206,4 @@ EXTRA_DIST = \
e1000_param-6.1-ethercat.c \
e1000_param-6.1-orig.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

2
devices/e1000/e1000_main-3.0-ethercat.c
View File

@ -217,7 +217,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.10-ethercat.c
View File

@ -218,7 +218,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.12-ethercat.c
View File

@ -218,7 +218,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.14-ethercat.c
View File

@ -218,7 +218,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.16-ethercat.c
View File

@ -218,7 +218,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.4-ethercat.c
View File

@ -216,7 +216,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.6-ethercat.c
View File

@ -216,7 +216,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-3.8-ethercat.c
View File

@ -216,7 +216,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

2
devices/e1000/e1000_main-4.4-ethercat.c
View File

@ -223,7 +223,7 @@ static struct pci_driver e1000_driver = {
.err_handler = &e1000_err_handler
};
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT-capable Intel(R) PRO/1000 Network Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

8
devices/e1000e/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -78,4 +76,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

9
devices/e1000e/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id: Makefile.am,v 792892ab4806 2014/10/28 15:54:59 fp $
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -19,7 +17,8 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
@ -345,4 +344,4 @@ EXTRA_DIST = \
regs-4.4-orig.h \
update.sh
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

20
devices/ecdev.h
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,7 +17,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
/** \file
*
@ -34,14 +32,14 @@
* frames through connected devices.
*/
/*****************************************************************************/
/****************************************************************************/
#ifndef __ECDEV_H__
#define __ECDEV_H__
#include <linux/netdevice.h>
/*****************************************************************************/
/****************************************************************************/
struct ec_device;
typedef struct ec_device ec_device_t; /**< \see ec_device */
@ -50,17 +48,17 @@ typedef struct ec_device ec_device_t; /**< \see ec_device */
*/
typedef void (*ec_pollfunc_t)(struct net_device *);
/******************************************************************************
/*****************************************************************************
* Offering/withdrawal functions
*****************************************************************************/
****************************************************************************/
ec_device_t *ecdev_offer(struct net_device *net_dev, ec_pollfunc_t poll,
struct module *module);
void ecdev_withdraw(ec_device_t *device);
/******************************************************************************
/*****************************************************************************
* Device methods
*****************************************************************************/
****************************************************************************/
int ecdev_open(ec_device_t *device);
void ecdev_close(ec_device_t *device);
@ -68,6 +66,6 @@ void ecdev_receive(ec_device_t *device, const void *data, size_t size);
void ecdev_set_link(ec_device_t *device, uint8_t state);
uint8_t ecdev_get_link(const ec_device_t *device);
/*****************************************************************************/
/****************************************************************************/
#endif

52
devices/generic.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,13 +17,13 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
/** \file
* EtherCAT generic Ethernet device module.
*/
/*****************************************************************************/
/****************************************************************************/
#include <linux/module.h>
#include <linux/device.h>
@ -43,16 +41,16 @@
#define EC_GEN_RX_BUF_SIZE 1600
/*****************************************************************************/
/****************************************************************************/
int __init ec_gen_init_module(void);
void __exit ec_gen_cleanup_module(void);
/*****************************************************************************/
/****************************************************************************/
/** \cond */
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT master generic Ethernet device module");
MODULE_LICENSE("GPL");
MODULE_VERSION(EC_MASTER_VERSION);
@ -83,7 +81,7 @@ int ec_gen_device_stop(ec_gen_device_t *);
int ec_gen_device_start_xmit(ec_gen_device_t *, struct sk_buff *);
void ec_gen_device_poll(ec_gen_device_t *);
/*****************************************************************************/
/****************************************************************************/
static int ec_gen_netdev_open(struct net_device *dev)
{
@ -91,7 +89,7 @@ static int ec_gen_netdev_open(struct net_device *dev)
return ec_gen_device_open(gendev);
}
/*****************************************************************************/
/****************************************************************************/
static int ec_gen_netdev_stop(struct net_device *dev)
{
@ -99,7 +97,7 @@ static int ec_gen_netdev_stop(struct net_device *dev)
return ec_gen_device_stop(gendev);
}
/*****************************************************************************/
/****************************************************************************/
static int ec_gen_netdev_start_xmit(
struct sk_buff *skb,
@ -110,7 +108,7 @@ static int ec_gen_netdev_start_xmit(
return ec_gen_device_start_xmit(gendev, skb);
}
/*****************************************************************************/
/****************************************************************************/
void ec_gen_poll(struct net_device *dev)
{
@ -118,7 +116,7 @@ void ec_gen_poll(struct net_device *dev)
ec_gen_device_poll(gendev);
}
/*****************************************************************************/
/****************************************************************************/
static const struct net_device_ops ec_gen_netdev_ops = {
.ndo_open = ec_gen_netdev_open,
@ -126,7 +124,7 @@ static const struct net_device_ops ec_gen_netdev_ops = {
.ndo_start_xmit = ec_gen_netdev_start_xmit,
};
/*****************************************************************************/
/****************************************************************************/
/** Init generic device.
*/
@ -159,7 +157,7 @@ int ec_gen_device_init(
return 0;
}
/*****************************************************************************/
/****************************************************************************/
/** Clear generic device.
*/
@ -181,7 +179,7 @@ void ec_gen_device_clear(
}
}
/*****************************************************************************/
/****************************************************************************/
/** Creates a network socket.
*/
@ -229,7 +227,7 @@ int ec_gen_device_create_socket(
return 0;
}
/*****************************************************************************/
/****************************************************************************/
/** Offer generic device to master.
*/
@ -264,7 +262,7 @@ int ec_gen_device_offer(
return ret;
}
/*****************************************************************************/
/****************************************************************************/
/** Open the device.
*/
@ -275,7 +273,7 @@ int ec_gen_device_open(
return 0;
}
/*****************************************************************************/
/****************************************************************************/
/** Stop the device.
*/
@ -286,7 +284,7 @@ int ec_gen_device_stop(
return 0;
}
/*****************************************************************************/
/****************************************************************************/
int ec_gen_device_start_xmit(
ec_gen_device_t *dev,
@ -309,7 +307,7 @@ int ec_gen_device_start_xmit(
return ret == len ? NETDEV_TX_OK : NETDEV_TX_BUSY;
}
/*****************************************************************************/
/****************************************************************************/
/** Polls the device.
*/
@ -339,7 +337,7 @@ void ec_gen_device_poll(
} while (budget);
}
/*****************************************************************************/
/****************************************************************************/
/** Offer device.
*/
@ -371,7 +369,7 @@ int offer_device(
return ret;
}
/*****************************************************************************/
/****************************************************************************/
/** Clear devices.
*/
@ -386,7 +384,7 @@ void clear_devices(void)
}
}
/*****************************************************************************/
/****************************************************************************/
/** Module initialization.
*
@ -442,7 +440,7 @@ out_err:
return ret;
}
/*****************************************************************************/
/****************************************************************************/
/** Module cleanup.
*
@ -454,7 +452,7 @@ void __exit ec_gen_cleanup_module(void)
printk(KERN_INFO PFX "Unloading.\n");
}
/*****************************************************************************/
/****************************************************************************/
/** \cond */
@ -463,4 +461,4 @@ module_exit(ec_gen_cleanup_module);
/** \endcond */
/*****************************************************************************/
/****************************************************************************/

8
devices/genet/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2017 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
TOPDIR := $(src)/../..
@ -47,4 +45,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
devices/igb/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2017 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -58,4 +56,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
devices/igc/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2017 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
TOPDIR := $(src)/../..
@ -57,4 +55,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

15
devices/r8169/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,16 +19,9 @@
#
# ---
#
# The license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
#
# ---
#
# vim: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
TOPDIR := $(src)/../..
@ -57,3 +48,5 @@ endif
KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#-----------------------------------------------------------------------------

12
devices/r8169/Makefile.am
View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2021 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -17,13 +17,7 @@
# 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 license mentioned above concerns the source code only. Using the
# EtherCAT technology and brand is only permitted in compliance with the
# industrial property and similar rights of Beckhoff Automation GmbH.
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
@ -68,3 +62,5 @@ EXTRA_DIST = \
r8169_phy_config-5.15-orig.c \
r8169_phy_config-6.1-ethercat.c \
r8169_phy_config-6.1-orig.c
#-----------------------------------------------------------------------------

10
documentation/Makefile
View File

@ -1,10 +1,8 @@
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
#
# LaTeX Makefile
#
# $Id$
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
FILE := ethercat_doc
@ -44,7 +42,7 @@ EXT_FILES := $(addprefix $(EXT_PREFIX),$(COMMANDS))
ETHERCAT_CMD := ../tool/ethercat
ETHERCAT_HELP := $(ETHERCAT_CMD) -h
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
all: pdf
@ -92,4 +90,4 @@ clean:
*~ \
images/*.bak
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

4
documentation/graphs/Makefile
View File

@ -1,8 +1,4 @@
#-----------------------------------------------------------------------------
#
# $Id$
#
#-----------------------------------------------------------------------------
GRAPHS := \
fsm_change \

3
documentation/graphs/fsm_change.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph change {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_eoe.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph eoe {
node [fontname="Helvetica"]
edge [fontname="Helvetica",fontsize=12]

3
documentation/graphs/fsm_master.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph master {
size="7,9"
center=1

3
documentation/graphs/fsm_pdo_conf.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph pdo_conf {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_pdo_entry_conf.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph pdo_entry_conf {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_pdo_entry_read.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph pdo_entry_read {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_pdo_read.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph pdo_read {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_sii.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph sii {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_slave_conf.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph slaveconf {
node [fontname="Helvetica"]
edge [fontname="Helvetica", fontsize="12"]

3
documentation/graphs/fsm_slave_scan.dot
View File

@ -1,6 +1,3 @@
/* $Id$ */
digraph slavescan {
node [fontname="Helvetica"]

4
documentation/images/Makefile
View File

@ -1,8 +1,4 @@
#-----------------------------------------------------------------------------
#
# $Id$
#
#-----------------------------------------------------------------------------
FIGS := \
app-config.fig \

18
ethercat.spec.in
View File

@ -1,6 +1,4 @@
#----------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2010 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,7 +19,7 @@
#
# vim: tw=78
#
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
Name: @PACKAGE@
Version: @VERSION@
@ -36,9 +34,9 @@ BuildRoot: /tmp/%{name}-%{version}
BuildRequires: %kernel_module_package_buildreqs
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Main Package
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
Summary: IgH EtherCAT Master
Group: EtherLab
@ -50,9 +48,9 @@ http://etherlab.org/en/ethercat.
%kernel_module_package
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Development package
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
%package devel
@ -64,7 +62,7 @@ This is an open-source EtherCAT master implementation for Linux 2.6. See the
FEATURES file for a list of features. For more information, see
http://etherlab.org/en/ethercat.
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
%prep
%setup
@ -120,4 +118,4 @@ rm -rf ${RPM_BUILD_ROOT}
/usr/lib/libethercat.a
/usr/lib/libethercat.la
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
examples/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,7 +19,7 @@
#
# vi: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
obj-m := mini/
@ -33,4 +31,4 @@ ifeq (@ENABLE_RTAI@,1)
obj-m += rtai/ dc_rtai/
endif
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

9
examples/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -19,7 +17,8 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
SUBDIRS =
@ -63,4 +62,4 @@ DIST_SUBDIRS = \
xenomai \
xenomai_posix
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
examples/dc_rtai/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vi: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -38,4 +36,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

11
examples/dc_rtai/Makefile.am
View File

@ -1,8 +1,4 @@
#------------------------------------------------------------------------------
#
# IgH EtherCAT master module
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,10 +17,11 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
dc_rtai_sample.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

34
examples/dc_rtai/dc_rtai_sample.c
View File

@ -1,9 +1,7 @@
/******************************************************************************
/*****************************************************************************
*
* Distributed clocks sample for the IgH EtherCAT master.
*
* $Id$
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
@ -21,7 +19,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
// Linux
#include <linux/module.h>
@ -34,7 +32,7 @@
// EtherCAT
#include "../../include/ecrt.h"
/*****************************************************************************/
/****************************************************************************/
// Module parameters
@ -47,7 +45,7 @@
#define PFX "ec_dc_rtai_sample: "
/*****************************************************************************/
/****************************************************************************/
// EtherCAT
static ec_master_t *master = NULL;
@ -61,7 +59,7 @@ static RT_TASK task;
static SEM master_sem;
static cycles_t t_last_cycle = 0, t_critical;
/*****************************************************************************/
/****************************************************************************/
// process data
static uint8_t *domain1_pd; // process data memory
@ -82,7 +80,7 @@ static unsigned int blink_counter = 0;
static unsigned int blink = 0;
static u32 counter_value = 0U;
/*****************************************************************************/
/****************************************************************************/
static ec_pdo_entry_info_t el2008_channels[] = {
{0x7000, 1, 1},
@ -112,7 +110,7 @@ static ec_sync_info_t el2008_syncs[] = {
{0xff}
};
/*****************************************************************************/
/****************************************************************************/
void check_domain1_state(void)
{
@ -130,7 +128,7 @@ void check_domain1_state(void)
domain1_state = ds;
}
/*****************************************************************************/
/****************************************************************************/
void check_master_state(void)
{
@ -150,7 +148,7 @@ void check_master_state(void)
master_state = ms;
}
/*****************************************************************************/
/****************************************************************************/
void run(long data)
{
@ -225,7 +223,7 @@ void run(long data)
}
}
/*****************************************************************************/
/****************************************************************************/
void send_callback(void *cb_data)
{
@ -239,7 +237,7 @@ void send_callback(void *cb_data)
}
}
/*****************************************************************************/
/****************************************************************************/
void receive_callback(void *cb_data)
{
@ -253,7 +251,7 @@ void receive_callback(void *cb_data)
}
}
/*****************************************************************************/
/****************************************************************************/
int __init init_mod(void)
{
@ -368,7 +366,7 @@ int __init init_mod(void)
return ret;
}
/*****************************************************************************/
/****************************************************************************/
void __exit cleanup_mod(void)
{
@ -382,13 +380,13 @@ void __exit cleanup_mod(void)
printk(KERN_INFO PFX "Unloading.\n");
}
/*****************************************************************************/
/****************************************************************************/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT distributed clocks sample module");
module_init(init_mod);
module_exit(cleanup_mod);
/*****************************************************************************/
/****************************************************************************/

2
examples/dc_user/Makefile.am
View File

@ -1,7 +1,5 @@
#------------------------------------------------------------------------------
#
# $Id$
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
# This file is part of the IgH EtherCAT Master.

2
examples/mini/Kbuild.in
View File

@ -1,7 +1,5 @@
#------------------------------------------------------------------------------
#
# $Id$
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
# This file is part of the IgH EtherCAT Master.

13
examples/mini/Makefile.am
View File

@ -1,10 +1,4 @@
#------------------------------------------------------------------------------
#
# Makefile.am
#
# IgH EtherCAT master module
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,10 +17,11 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
mini.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
examples/mini/README
View File

@ -1,8 +1,4 @@
-------------------------------------------------------------------------------
$Id$
-------------------------------------------------------------------------------
------------------------------------------------------------------------------
This is a minimal example module for the use of the EtherCAT master realtime
interface. It uses a kernel timer to generate a cyclic task.
@ -25,4 +21,4 @@ insmod ec_mini.ko
...and watch the system logs for the outputs.
-------------------------------------------------------------------------------
------------------------------------------------------------------------------

42
examples/mini/mini.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,7 +17,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
#include <linux/version.h>
#include <linux/module.h>
@ -31,7 +29,7 @@
#include "../../include/ecrt.h" // EtherCAT realtime interface
/*****************************************************************************/
/****************************************************************************/
// Module parameters
#define FREQUENCY 100
@ -45,7 +43,7 @@
#define PFX "ec_mini: "
/*****************************************************************************/
/****************************************************************************/
// EtherCAT
static ec_master_t *master = NULL;
@ -61,7 +59,7 @@ static ec_slave_config_state_t sc_ana_in_state = {};
// Timer
static struct timer_list timer;
/*****************************************************************************/
/****************************************************************************/
// process data
static uint8_t *domain1_pd; // process data memory
@ -93,7 +91,7 @@ const static ec_pdo_entry_reg_t domain1_regs[] = {
static unsigned int counter = 0;
static unsigned int blink = 0;
/*****************************************************************************/
/****************************************************************************/
#if CONFIGURE_PDOS
@ -172,7 +170,7 @@ static ec_sync_info_t el2004_syncs[] = {
};
#endif
/*****************************************************************************/
/****************************************************************************/
#if SDO_ACCESS
static ec_sdo_request_t *sdo;
@ -182,7 +180,7 @@ static ec_sdo_request_t *sdo;
static ec_voe_handler_t *voe;
#endif
/*****************************************************************************/
/****************************************************************************/
void check_domain1_state(void)
{
@ -200,7 +198,7 @@ void check_domain1_state(void)
domain1_state = ds;
}
/*****************************************************************************/
/****************************************************************************/
void check_master_state(void)
{
@ -220,7 +218,7 @@ void check_master_state(void)
master_state = ms;
}
/*****************************************************************************/
/****************************************************************************/
void check_slave_config_states(void)
{
@ -241,7 +239,7 @@ void check_slave_config_states(void)
sc_ana_in_state = s;
}
/*****************************************************************************/
/****************************************************************************/
#if SDO_ACCESS
void read_sdo(void)
@ -266,7 +264,7 @@ void read_sdo(void)
}
#endif
/*****************************************************************************/
/****************************************************************************/
#if VOE_ACCESS
void read_voe(void)
@ -291,7 +289,7 @@ void read_voe(void)
}
#endif
/*****************************************************************************/
/****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void cyclic_task(struct timer_list *t)
@ -346,7 +344,7 @@ void cyclic_task(unsigned long data)
add_timer(&timer);
}
/*****************************************************************************/
/****************************************************************************/
void send_callback(void *cb_data)
{
@ -356,7 +354,7 @@ void send_callback(void *cb_data)
up(&master_sem);
}
/*****************************************************************************/
/****************************************************************************/
void receive_callback(void *cb_data)
{
@ -366,7 +364,7 @@ void receive_callback(void *cb_data)
up(&master_sem);
}
/*****************************************************************************/
/****************************************************************************/
int __init init_mini_module(void)
{
@ -506,7 +504,7 @@ out_return:
return ret;
}
/*****************************************************************************/
/****************************************************************************/
void __exit cleanup_mini_module(void)
{
@ -524,13 +522,13 @@ void __exit cleanup_mini_module(void)
printk(KERN_INFO PFX "Unloading.\n");
}
/*****************************************************************************/
/****************************************************************************/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT minimal test environment");
module_init(init_mini_module);
module_exit(cleanup_mini_module);
/*****************************************************************************/
/****************************************************************************/

8
examples/rtai/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vi: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -38,4 +36,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

11
examples/rtai/Makefile.am
View File

@ -1,8 +1,4 @@
#------------------------------------------------------------------------------
#
# IgH EtherCAT master module
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -21,10 +17,11 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
EXTRA_DIST = \
rtai_sample.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

8
examples/rtai/README
View File

@ -1,8 +1,4 @@
-------------------------------------------------------------------------------
$Id$
-------------------------------------------------------------------------------
------------------------------------------------------------------------------
This is a minimal example module for the use of the EtherCAT master realtime
interface with an RTAI thread.
@ -28,4 +24,4 @@ insmod ec_rtai_sample.ko
...and watch the system logs for the outputs.
-------------------------------------------------------------------------------
------------------------------------------------------------------------------

39
examples/rtai/rtai_sample.c
View File

@ -1,9 +1,7 @@
/******************************************************************************
/*****************************************************************************
*
* RTAI sample for the IgH EtherCAT master.
*
* $Id$
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
@ -21,7 +19,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
// Linux
#include <linux/module.h>
@ -34,7 +32,7 @@
// EtherCAT
#include "../../include/ecrt.h"
/*****************************************************************************/
/****************************************************************************/
// Module parameters
@ -48,7 +46,7 @@
#define PFX "ec_rtai_sample: "
/*****************************************************************************/
/****************************************************************************/
// EtherCAT
static ec_master_t *master = NULL;
@ -65,7 +63,7 @@ static RT_TASK task;
static SEM master_sem;
static cycles_t t_last_cycle = 0, t_critical;
/*****************************************************************************/
/****************************************************************************/
// process data
static uint8_t *domain1_pd; // process data memory
@ -88,7 +86,7 @@ const static ec_pdo_entry_reg_t domain1_regs[] = {
static unsigned int counter = 0;
static unsigned int blink = 0;
/*****************************************************************************/
/****************************************************************************/
#ifdef CONFIGURE_PDOS
static ec_pdo_entry_info_t el3162_channel1[] = {
@ -133,7 +131,7 @@ static ec_sync_info_t el2004_syncs[] = {
};
#endif
/*****************************************************************************/
/****************************************************************************/
void check_domain1_state(void)
{
@ -151,7 +149,7 @@ void check_domain1_state(void)
domain1_state = ds;
}
/*****************************************************************************/
/****************************************************************************/
void check_master_state(void)
{
@ -171,7 +169,7 @@ void check_master_state(void)
master_state = ms;
}
/*****************************************************************************/
/****************************************************************************/
void check_slave_config_states(void)
{
@ -192,7 +190,7 @@ void check_slave_config_states(void)
sc_ana_in_state = s;
}
/*****************************************************************************/
/****************************************************************************/
void run(long data)
{
@ -235,7 +233,7 @@ void run(long data)
}
}
/*****************************************************************************/
/****************************************************************************/
void send_callback(void *cb_data)
{
@ -249,7 +247,7 @@ void send_callback(void *cb_data)
}
}
/*****************************************************************************/
/****************************************************************************/
void receive_callback(void *cb_data)
{
@ -263,7 +261,7 @@ void receive_callback(void *cb_data)
}
}
/*****************************************************************************/
/****************************************************************************/
int __init init_mod(void)
{
@ -307,7 +305,8 @@ int __init init_mod(void)
goto out_release_master;
}
if (!(sc = ecrt_master_slave_config(master, DigOutSlavePos, Beckhoff_EL2004))) {
if (!(sc = ecrt_master_slave_config(master, DigOutSlavePos,
Beckhoff_EL2004))) {
printk(KERN_ERR PFX "Failed to get slave configuration.\n");
goto out_release_master;
}
@ -366,7 +365,7 @@ int __init init_mod(void)
return ret;
}
/*****************************************************************************/
/****************************************************************************/
void __exit cleanup_mod(void)
{
@ -380,13 +379,13 @@ void __exit cleanup_mod(void)
printk(KERN_INFO PFX "Unloading.\n");
}
/*****************************************************************************/
/****************************************************************************/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT RTAI sample module");
module_init(init_mod);
module_exit(cleanup_mod);
/*****************************************************************************/
/****************************************************************************/

2
examples/rtai_rtdm/Makefile.am
View File

@ -1,7 +1,5 @@
#------------------------------------------------------------------------------
#
# $Id$
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
# This file is part of the IgH EtherCAT Master.

8
examples/rtai_rtdm/main.c
View File

@ -1,9 +1,7 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2011 IgH Andreas Stewering-Bone
* 2012 Florian Pose <fp@igh-essen.com>
* 2012 Florian Pose <fp@igh.de>
*
* This file is part of the IgH EtherCAT master
*
@ -19,7 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with the IgH EtherCAT master. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
****************************************************************************/
#include <sched.h>
#include <stdio.h>

14
examples/rtai_rtdm_dc/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -15,11 +13,11 @@
# 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
# 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
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
noinst_PROGRAMS = ec_rtai_rtdm_dc_example
@ -34,4 +32,4 @@ ec_rtai_rtdm_dc_example_LDFLAGS = \
$(RTAI_LXRT_LDFLAGS) -llxrt -lrtdm \
-L$(top_builddir)/lib/.libs -lethercat_rtdm
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

22
examples/rtai_rtdm_dc/main.c
View File

@ -1,9 +1,7 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2011 IgH Andreas Stewering-Bone
* 2012 Florian Pose <fp@igh-essen.com>
* 2012 Florian Pose <fp@igh.de>
*
* This file is part of the IgH EtherCAT master
*
@ -19,7 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with the IgH EtherCAT master. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
****************************************************************************/
#include <sched.h>
#include <stdio.h>
@ -174,7 +172,7 @@ RTIME system2count(
return nano2count(ret);
}
/*****************************************************************************/
/****************************************************************************/
/** Synchronise the distributed clocks
*/
@ -200,7 +198,7 @@ void sync_distributed_clocks(void)
ecrt_master_sync_slave_clocks(master);
}
/*****************************************************************************/
/****************************************************************************/
/** Return the sign of a number
*
@ -212,7 +210,7 @@ void sync_distributed_clocks(void)
({ typeof (val) _val = (val); \
((_val > 0) - (_val < 0)); })
/*****************************************************************************/
/****************************************************************************/
/** Update the master time based on ref slaves time diff
*
@ -430,18 +428,18 @@ void my_cyclic(void)
stop_rt_timer();
}
/****************************************************************************
/*****************************************************************************
* Signal handler
***************************************************************************/
****************************************************************************/
void signal_handler(int sig)
{
run = 0;
}
/****************************************************************************
/*****************************************************************************
* Main function
***************************************************************************/
****************************************************************************/
int main(int argc, char *argv[])
{

8
examples/tty/Kbuild.in
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +21,7 @@
#
# vi: syntax=make
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
src := @abs_srcdir@
ccflags-y := -I@abs_top_builddir@
@ -40,4 +38,4 @@ KBUILD_EXTRA_SYMBOLS := \
@abs_top_builddir@/$(LINUX_SYMVERS) \
@abs_top_builddir@/master/$(LINUX_SYMVERS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

13
examples/tty/Makefile.am
View File

@ -1,10 +1,4 @@
#------------------------------------------------------------------------------
#
# Makefile.am
#
# IgH EtherCAT master module
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,7 +17,8 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include $(top_srcdir)/Makefile.kbuild
noinst_HEADERS = \
@ -31,4 +26,4 @@ noinst_HEADERS = \
serial.h \
tty.c
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

27
examples/tty/serial.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,7 +17,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
#include <linux/module.h>
#include <linux/err.h>
@ -29,14 +27,14 @@
#include "../../include/ecrt.h" // EtherCAT realtime interface
#include "../../include/ectty.h" // EtherCAT TTY interface
/*****************************************************************************/
/****************************************************************************/
// Optional features
#define PFX "ec_tty_example: "
#define DEBUG 0
/*****************************************************************************/
/****************************************************************************/
#define VendorIdBeckhoff 0x00000002
#define ProductCodeBeckhoffEL6002 0x17723052
@ -44,7 +42,7 @@
#define VendorIdIds 0x000012ad
#define ProductCodeIdsCSI71A 0x17723052
/*****************************************************************************/
/****************************************************************************/
typedef enum {
SER_REQUEST_INIT,
@ -108,7 +106,7 @@ typedef struct {
LIST_HEAD(handlers);
/*****************************************************************************/
/****************************************************************************/
/* Beckhoff EL6002
* Vendor ID: 0x00000002
@ -546,7 +544,8 @@ void el60xx_port_run(el60xx_port_t *port, u8 *pd)
tx_accepted_toggle = status & 0x0001;
if (tx_accepted_toggle != port->tx_accepted_toggle) { // ready
port->tx_data_size =
ectty_tx_data(port->tty, port->tx_data, port->max_tx_data_size);
ectty_tx_data(port->tty, port->tx_data,
port->max_tx_data_size);
if (port->tx_data_size) {
#if DEBUG
printk(KERN_INFO PFX "%s: Sending %u bytes.\n",
@ -723,7 +722,7 @@ void el6002_run(el6002_t *el6002, u8 *pd)
}
}
/*****************************************************************************/
/****************************************************************************/
void run_serial_devices(u8 *pd)
{
@ -734,7 +733,7 @@ void run_serial_devices(u8 *pd)
}
}
/*****************************************************************************/
/****************************************************************************/
int create_el6002_handler(ec_master_t *master, ec_domain_t *domain,
u16 position, u32 vendor, u32 product)
@ -761,7 +760,7 @@ int create_el6002_handler(ec_master_t *master, ec_domain_t *domain,
return 0;
}
/*****************************************************************************/
/****************************************************************************/
int create_serial_devices(ec_master_t *master, ec_domain_t *domain)
{
@ -815,7 +814,7 @@ out_return:
return ret;
}
/*****************************************************************************/
/****************************************************************************/
void free_serial_devices(void)
{
@ -832,4 +831,4 @@ void free_serial_devices(void)
printk(KERN_INFO PFX "Finished cleaning up serial devices.\n");
}
/*****************************************************************************/
/****************************************************************************/

8
examples/tty/serial.h
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,11 +17,11 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
int create_serial_devices(ec_master_t *, ec_domain_t *);
void free_serial_devices(void);
void run_serial_devices(u8 *);
/*****************************************************************************/
/****************************************************************************/

32
examples/tty/tty.c
View File

@ -1,6 +1,4 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -19,7 +17,7 @@
* with the IgH EtherCAT Master; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
****************************************************************************/
#include <linux/version.h>
#include <linux/module.h>
@ -32,7 +30,7 @@
#include "serial.h"
/*****************************************************************************/
/****************************************************************************/
// Module parameters
#define FREQUENCY 100
@ -41,7 +39,7 @@
#define PFX "ec_tty_example: "
/*****************************************************************************/
/****************************************************************************/
// EtherCAT
static ec_master_t *master = NULL;
@ -54,7 +52,7 @@ static ec_domain_state_t domain1_state = {};
// Timer
static struct timer_list timer;
/*****************************************************************************/
/****************************************************************************/
// process data
static uint8_t *domain1_pd; // process data memory
@ -65,7 +63,7 @@ static uint8_t *domain1_pd; // process data memory
static unsigned int counter = 0;
/*****************************************************************************/
/****************************************************************************/
void check_domain1_state(void)
{
@ -83,7 +81,7 @@ void check_domain1_state(void)
domain1_state = ds;
}
/*****************************************************************************/
/****************************************************************************/
void check_master_state(void)
{
@ -103,7 +101,7 @@ void check_master_state(void)
master_state = ms;
}
/*****************************************************************************/
/****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void cyclic_task(struct timer_list *t)
@ -142,7 +140,7 @@ void cyclic_task(unsigned long data)
add_timer(&timer);
}
/*****************************************************************************/
/****************************************************************************/
void send_callback(void *cb_data)
{
@ -152,7 +150,7 @@ void send_callback(void *cb_data)
up(&master_sem);
}
/*****************************************************************************/
/****************************************************************************/
void receive_callback(void *cb_data)
{
@ -162,7 +160,7 @@ void receive_callback(void *cb_data)
up(&master_sem);
}
/*****************************************************************************/
/****************************************************************************/
int __init init_mini_module(void)
{
@ -229,7 +227,7 @@ out_return:
return ret;
}
/*****************************************************************************/
/****************************************************************************/
void __exit cleanup_mini_module(void)
{
@ -245,13 +243,13 @@ void __exit cleanup_mini_module(void)
printk(KERN_INFO PFX "Unloading.\n");
}
/*****************************************************************************/
/****************************************************************************/
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
MODULE_AUTHOR("Florian Pose <fp@igh.de>");
MODULE_DESCRIPTION("EtherCAT minimal test environment");
module_init(init_mini_module);
module_exit(cleanup_mini_module);
/*****************************************************************************/
/****************************************************************************/

8
examples/user/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -19,7 +17,7 @@
# the IgH EtherCAT Master; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
noinst_PROGRAMS = ec_user_example
@ -27,4 +25,4 @@ ec_user_example_SOURCES = main.c
ec_user_example_CFLAGS = -I$(top_srcdir)/include -Wall
ec_user_example_LDFLAGS = -L$(top_builddir)/lib/.libs -lethercat -lrt
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

12
examples/user/main.c
View File

@ -1,6 +1,4 @@
/*****************************************************************************
*
* $Id$
*
* Copyright (C) 2007-2009 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -98,7 +96,7 @@ const static ec_pdo_entry_reg_t domain1_regs[] = {
static unsigned int counter = 0;
static unsigned int blink = 0;
/*****************************************************************************/
/****************************************************************************/
// Analog in --------------------------
@ -162,7 +160,7 @@ static ec_sync_info_t el2004_syncs[] = {
{0xff}
};
/*****************************************************************************/
/****************************************************************************/
void check_domain1_state(void)
{
@ -180,7 +178,7 @@ void check_domain1_state(void)
domain1_state = ds;
}
/*****************************************************************************/
/****************************************************************************/
void check_master_state(void)
{
@ -201,7 +199,7 @@ void check_master_state(void)
master_state = ms;
}
/*****************************************************************************/
/****************************************************************************/
void check_slave_config_states(void)
{
@ -222,7 +220,7 @@ void check_slave_config_states(void)
sc_ana_in_state = s;
}
/*****************************************************************************/
/****************************************************************************/
void cyclic_task()
{

2
examples/xenomai/Makefile.am
View File

@ -1,7 +1,5 @@
#------------------------------------------------------------------------------
#
# $Id$
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
# This file is part of the IgH EtherCAT Master.

8
examples/xenomai/main.c
View File

@ -1,10 +1,8 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2009-2010 Moehwald GmbH B. Benner
* 2011 IgH Andreas Stewering-Bone
* 2012 Florian Pose <fp@igh-essen.com>
* 2012 Florian Pose <fp@igh.de>
*
* This file is part of the IgH EtherCAT master
*
@ -20,7 +18,7 @@
* You should have received a copy of the GNU General Public License along
* with the IgH EtherCAT master. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
****************************************************************************/
#include <errno.h>
#include <signal.h>

14
examples/xenomai_posix/Makefile.am
View File

@ -1,6 +1,4 @@
#------------------------------------------------------------------------------
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2012 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -15,11 +13,11 @@
# 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
# 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
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
noinst_PROGRAMS = ec_xenomai_posix_example
@ -36,4 +34,4 @@ ec_xenomai_posix_example_LDFLAGS = \
$(XENOMAI_POSIX_LDFLAGS) \
$(XENOMAI_RTDM_LDFLAGS)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

16
examples/xenomai_posix/main.c
View File

@ -1,9 +1,7 @@
/******************************************************************************
*
* $Id$
/*****************************************************************************
*
* Copyright (C) 2011 IgH Andreas Stewering-Bone
* 2012 Florian Pose <fp@igh-essen.com>
* 2012 Florian Pose <fp@igh.de>
*
* This file is part of the IgH EtherCAT master
*
@ -19,7 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with the IgH EtherCAT master. If not, see <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
****************************************************************************/
#include <errno.h>
#include <mqueue.h>
@ -196,18 +194,18 @@ void *my_thread(void *arg)
return NULL;
}
/****************************************************************************
/*****************************************************************************
* Signal handler
***************************************************************************/
****************************************************************************/
void signal_handler(int sig)
{
run = 0;
}
/****************************************************************************
/*****************************************************************************
* Main function
***************************************************************************/
****************************************************************************/
int main(int argc, char *argv[])
{

12
include/Makefile.am
View File

@ -1,10 +1,4 @@
#------------------------------------------------------------------------------
#
# Makefile.am
#
# IgH EtherCAT master
#
# $Id$
#-----------------------------------------------------------------------------
#
# Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH
#
@ -23,10 +17,10 @@
# with the IgH EtherCAT Master; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include_HEADERS = \
ecrt.h \
ectty.h
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------

102
include/ecrt.h
View File

@ -1,4 +1,4 @@
/******************************************************************************
/*****************************************************************************
*
* Copyright (C) 2006-2024 Florian Pose, Ingenieurgemeinschaft IgH
*
@ -18,7 +18,7 @@
* along with the IgH EtherCAT master userspace library. If not, see
* <http://www.gnu.org/licenses/>.
*
*****************************************************************************/
****************************************************************************/
/** \file
*
@ -150,7 +150,7 @@
* @{
*/
/*****************************************************************************/
/****************************************************************************/
#ifndef __ECRT_H__
#define __ECRT_H__
@ -165,9 +165,9 @@
#include <sys/time.h> // for struct timeval
#endif
/******************************************************************************
/*****************************************************************************
* Global definitions
*****************************************************************************/
****************************************************************************/
/** EtherCAT realtime interface major version number.
*/
@ -185,9 +185,9 @@
*/
#define ECRT_VERSION_MAGIC ECRT_VERSION(ECRT_VER_MAJOR, ECRT_VER_MINOR)
/******************************************************************************
/*****************************************************************************
* Feature flags
*****************************************************************************/
****************************************************************************/
/** Defined, if the redundancy features are available.
*
@ -243,7 +243,7 @@
*/
#define EC_HAVE_SCAN_PROGRESS
/*****************************************************************************/
/****************************************************************************/
/** Symbol visibility control macro.
*/
@ -255,7 +255,7 @@
# endif
#endif
/*****************************************************************************/
/****************************************************************************/
/** End of list marker.
*
@ -293,9 +293,9 @@
*/
#define EC_COE_EMERGENCY_MSG_SIZE 8
/******************************************************************************
/*****************************************************************************
* Data types
*****************************************************************************/
****************************************************************************/
struct ec_master;
typedef struct ec_master ec_master_t; /**< \see ec_master */
@ -318,7 +318,7 @@ typedef struct ec_voe_handler ec_voe_handler_t; /**< \see ec_voe_handler. */
struct ec_reg_request;
typedef struct ec_reg_request ec_reg_request_t; /**< \see ec_reg_request. */
/*****************************************************************************/
/****************************************************************************/
/** Master state.
*
@ -342,7 +342,7 @@ typedef struct {
up. */
} ec_master_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Redundant link state.
*
@ -366,7 +366,7 @@ typedef struct {
*/
} ec_master_link_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Slave configuration state.
*
@ -388,7 +388,7 @@ typedef struct {
bit! */
} ec_slave_config_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Master information.
*
@ -403,7 +403,7 @@ typedef struct {
uint64_t app_time; /**< Application time. */
} ec_master_info_t;
/*****************************************************************************/
/****************************************************************************/
/** Master scan progress information.
*
@ -418,7 +418,7 @@ typedef struct {
network scan is in progress. */
} ec_master_scan_progress_t;
/*****************************************************************************/
/****************************************************************************/
/** EtherCAT slave port descriptor.
*/
@ -429,7 +429,7 @@ typedef enum {
EC_PORT_MII /**< Port is a MII. */
} ec_slave_port_desc_t;
/*****************************************************************************/
/****************************************************************************/
/** EtherCAT slave port information.
*/
@ -439,7 +439,7 @@ typedef struct {
uint8_t signal_detected; /**< Detected signal on RX port. */
} ec_slave_port_link_t;
/*****************************************************************************/
/****************************************************************************/
/** Slave information.
*
@ -471,7 +471,7 @@ typedef struct {
char name[EC_MAX_STRING_LENGTH]; /**< Name of the slave. */
} ec_slave_info_t;
/*****************************************************************************/
/****************************************************************************/
/** Domain working counter interpretation.
*
@ -484,7 +484,7 @@ typedef enum {
EC_WC_COMPLETE /**< All registered process data were exchanged. */
} ec_wc_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Domain state.
*
@ -496,7 +496,7 @@ typedef struct {
unsigned int redundancy_active; /**< Redundant link is in use. */
} ec_domain_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Direction type for PDO assignment functions.
*/
@ -507,7 +507,7 @@ typedef enum {
EC_DIR_COUNT /**< Number of directions. For internal use only. */
} ec_direction_t;
/*****************************************************************************/
/****************************************************************************/
/** Watchdog mode for sync manager configuration.
*
@ -519,7 +519,7 @@ typedef enum {
EC_WD_DISABLE, /**< Disable the watchdog. */
} ec_watchdog_mode_t;
/*****************************************************************************/
/****************************************************************************/
/** PDO entry configuration information.
*
@ -533,7 +533,7 @@ typedef struct {
uint8_t bit_length; /**< Size of the PDO entry in bit. */
} ec_pdo_entry_info_t;
/*****************************************************************************/
/****************************************************************************/
/** PDO configuration information.
*
@ -552,7 +552,7 @@ typedef struct {
least \a n_entries values. */
} ec_pdo_info_t;
/*****************************************************************************/
/****************************************************************************/
/** Sync manager configuration information.
*
@ -571,7 +571,7 @@ typedef struct {
ec_watchdog_mode_t watchdog_mode; /**< Watchdog mode. */
} ec_sync_info_t;
/*****************************************************************************/
/****************************************************************************/
/** List record type for PDO entry mass-registration.
*
@ -593,7 +593,7 @@ typedef struct {
PDO entry does not byte-align. */
} ec_pdo_entry_reg_t;
/*****************************************************************************/
/****************************************************************************/
/** Request state.
*
@ -607,7 +607,7 @@ typedef enum {
EC_REQUEST_ERROR, /**< Request processing failed. */
} ec_request_state_t;
/*****************************************************************************/
/****************************************************************************/
/** Application-layer state.
*/
@ -618,9 +618,9 @@ typedef enum {
EC_AL_STATE_OP = 8, /**< Operational. */
} ec_al_state_t;
/******************************************************************************
/*****************************************************************************
* Global functions
*****************************************************************************/
****************************************************************************/
#ifdef __cplusplus
extern "C" {
@ -684,9 +684,9 @@ EC_PUBLIC_API void ecrt_release_master(
ec_master_t *master /**< EtherCAT master */
);
/******************************************************************************
/*****************************************************************************
* Master methods
*****************************************************************************/
****************************************************************************/
#ifndef __KERNEL__
@ -1232,9 +1232,9 @@ EC_PUBLIC_API void ecrt_master_reset(
ec_master_t *master /**< EtherCAT master. */
);
/******************************************************************************
/*****************************************************************************
* Slave configuration methods
*****************************************************************************/
****************************************************************************/
/** Configure a sync manager.
*
@ -1792,9 +1792,9 @@ EC_PUBLIC_API int ecrt_slave_config_flag(
int32_t value /**< Value to store. */
);
/******************************************************************************
/*****************************************************************************
* Domain methods
*****************************************************************************/
****************************************************************************/
/** Registers a bunch of PDO entries for a domain.
*
@ -2301,9 +2301,9 @@ EC_PUBLIC_API void ecrt_reg_request_read(
size_t size /**< Size to write. */
);
/******************************************************************************
/*****************************************************************************
* Bitwise read/write macros
*****************************************************************************/
****************************************************************************/
/** Read a certain bit of an EtherCAT data byte.
*
@ -2324,9 +2324,9 @@ EC_PUBLIC_API void ecrt_reg_request_read(
else *((uint8_t *) (DATA)) &= ~(1 << (POS)); \
} while (0)
/******************************************************************************
/*****************************************************************************
* Byte-swapping functions for user space
*****************************************************************************/
****************************************************************************/
#ifndef __KERNEL__
@ -2379,9 +2379,9 @@ EC_PUBLIC_API void ecrt_reg_request_read(
#endif /* ifndef __KERNEL__ */
/******************************************************************************
/*****************************************************************************
* Read macros
*****************************************************************************/
****************************************************************************/
/** Read an 8-bit unsigned value from EtherCAT data.
*
@ -2446,9 +2446,9 @@ EC_PUBLIC_API void ecrt_reg_request_read(
#define EC_READ_S64(DATA) \
((int64_t) le64_to_cpup((void *) (DATA)))
/******************************************************************************
/*****************************************************************************
* Floating-point read functions and macros (userspace only)
*****************************************************************************/
****************************************************************************/
#ifndef __KERNEL__
@ -2482,9 +2482,9 @@ EC_PUBLIC_API double ecrt_read_lreal(const void *data);
#endif // ifndef __KERNEL__
/******************************************************************************
/*****************************************************************************
* Write macros
*****************************************************************************/
****************************************************************************/
/** Write an 8-bit unsigned value to EtherCAT data.
*
@ -2554,9 +2554,9 @@ EC_PUBLIC_API double ecrt_read_lreal(const void *data);
*/
#define EC_WRITE_S64(DATA, VAL) EC_WRITE_U64(DATA, VAL)
/******************************************************************************
/*****************************************************************************
* Floating-point write functions and macros (userspace only)
*****************************************************************************/
****************************************************************************/
#ifndef __KERNEL__
@ -2590,13 +2590,13 @@ EC_PUBLIC_API void ecrt_write_lreal(void *data, double value);
#endif // ifndef __KERNEL__
/*****************************************************************************/
/****************************************************************************/
#ifdef __cplusplus
}
#endif
/*****************************************************************************/
/****************************************************************************/
/** @} */

Some files were not shown because too many files have changed in this diff Show More