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

Reverted default branch to stable-1.5.

Browse Source
This commit is contained in:
Florian Pose
2014-11-03 15:20:05 +01:00
parent 8479fd7675
commit 99418519bd
664 changed files with 837025 additions and 12883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/init.d/Makefile.am
+1 -1
View File
@@ -20,7 +20,7 @@
# 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.
script/init.d/ethercat.in
+7 -6
View File
@@ -24,7 +24,7 @@
# 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.
@@ -47,6 +47,7 @@
#------------------------------------------------------------------------------
LSMOD=/sbin/lsmod
MODPROBE=/sbin/modprobe
RMMOD=/sbin/rmmod
MODINFO=/sbin/modinfo
@@ -126,7 +127,7 @@ parse_mac_address() {
else
echo Invalid MAC address \"${1}\" in ${ETHERCAT_CONFIG}
exit_fail
fi
fi
}
#------------------------------------------------------------------------------
@@ -157,7 +158,7 @@ start)
parse_mac_address ${DEVICE}
DEVICES=${DEVICES}${MAC}
parse_mac_address ${BACKUP}
BACKUPS=${BACKUPS}${MAC}
@@ -177,7 +178,7 @@ start)
continue # ec_* module not found
fi
if [ ${MODULE} != "generic" ]; then
if lsmod | grep "^${MODULE} " > /dev/null; then
if ${LSMOD} | grep "^${MODULE} " > /dev/null; then
if ! ${RMMOD} ${MODULE}; then
exit_fail
fi
@@ -200,7 +201,7 @@ stop)
# unload EtherCAT device modules
for MODULE in ${DEVICE_MODULES} master; do
ECMODULE=ec_${MODULE}
if ! lsmod | grep -q "^${ECMODULE} "; then
if ! ${LSMOD} | grep -q "^${ECMODULE} "; then
continue # ec_* module not loaded
fi
if ! ${RMMOD} ${ECMODULE}; then
@@ -243,7 +244,7 @@ status)
for i in `seq 0 $(expr ${MASTER_COUNT} - 1)`; do
echo -n "Master${i} "
# Check if the master is in idle or operation phase
${ETHERCAT} master --master ${i} 2>/dev/null | \
grep -qE 'Phase:[[:space:]]*Idle|Phase:[[:space:]]*Operation'