Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-08-17 16:51:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'prepare-1.6' into 'devel-1.6'

Browse Source 
Prepare release 1.6

See merge request etherlab.org/ethercat!113
This commit is contained in:
Florian Pose
2024-02-01 14:22:15 +00:00
parent 7727ac725d ee55c20e28
commit cbc1c22eaa
284 changed files with 2430 additions and 2783 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kbuild.in
+3 -5
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
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
NEWS
-2
View File
@@ -1,7 +1,5 @@
-------------------------------------------------------------------------------
$Id$
vim: spelllang=en spell tw=78
-------------------------------------------------------------------------------
README.EoE
+6 -7
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.
-------------------------------------------------------------------------------
------------------------------------------------------------------------------
TODO
+5 -2
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.
bootstrap
+3 -5
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
#----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/8139too-3.0-ethercat.c
+4 -6
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);
devices/8139too-3.10-ethercat.c
+4 -6
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);
devices/8139too-3.12-ethercat.c
+4 -6
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);
devices/8139too-3.14-ethercat.c
+4 -6
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);
devices/8139too-3.16-ethercat.c
+4 -6
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);
devices/8139too-3.2-ethercat.c
+4 -6
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);
devices/8139too-3.4-ethercat.c
+4 -6
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);
devices/8139too-3.6-ethercat.c
+4 -6
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);
devices/8139too-3.8-ethercat.c
+4 -6
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);
devices/8139too-4.4-ethercat.c
+4 -6
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);
devices/8139too-5.10-ethercat.c
+1 -1
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);
devices/8139too-6.1-ethercat.c
+1 -1
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);
devices/Kbuild.in
+3 -5
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)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/ccat/Kbuild.in
+3 -5
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)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/ccat/Makefile.am
+4 -6
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
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/e100-3.0-ethercat.c
+5 -7
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);
devices/e100-3.10-ethercat.c
+5 -7
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);
devices/e100-3.12-ethercat.c
+5 -7
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);
devices/e100-3.14-ethercat.c
+5 -7
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);
devices/e100-3.16-ethercat.c
+5 -7
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);
devices/e100-3.4-ethercat.c
+5 -7
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);
devices/e100-3.6-ethercat.c
+5 -7
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);
devices/e100-3.8-ethercat.c
+5 -7
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);
devices/e100-4.4-ethercat.c
+5 -7
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);
devices/e100-5.10-ethercat.c
+3 -5
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 *);
devices/e100-5.14-ethercat.c
+3 -5
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 *);
devices/e100-5.15-ethercat.c
+3 -5
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 *);
devices/e100-5.4-ethercat.c
+3 -6
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);
devices/e100-6.1-ethercat.c
+3 -6
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 *);
devices/e100-6.4-ethercat.c
+3 -6
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 *);
devices/e1000/Kbuild.in
+3 -5
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)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/e1000/Makefile.am
+4 -5
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
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/e1000/e1000_main-3.0-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.10-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.12-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.14-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.16-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.4-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.6-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-3.8-ethercat.c
+1 -1
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);
devices/e1000/e1000_main-4.4-ethercat.c
+1 -1
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);
devices/e1000e/Kbuild.in
+3 -5
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)
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/e1000e/Makefile.am
+4 -5
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
#------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
devices/ecdev.h
+9 -11
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
devices/generic.c
+25 -27
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 */
/*****************************************************************************/
/****************************************************************************/

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