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

Removed tabulators.

This commit is contained in:
Florian Pose 2010-02-05 10:29:47 +01:00
parent 0f104bbc83
commit a144042657
50 changed files with 682 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/cdev.c
View File

@ -1686,7 +1686,8 @@ int ec_cdev_ioctl_set_send_interval(
{
size_t send_interval;
if (copy_from_user(&send_interval, (void __user *) arg, sizeof(send_interval))) {
if (copy_from_user(&send_interval, (void __user *) arg,
sizeof(send_interval))) {
return -EFAULT;
}

14
master/fsm_slave.c
View File

@ -62,8 +62,10 @@ void ec_fsm_slave_init(
fsm->slave = slave;
fsm->datagram = datagram;
fsm->datagram->data_size = 0;
if (slave->master->debug_level)
EC_DBG("init fsm for slave %u...\n",slave->ring_position);
EC_DBG("Init FSM for slave %u...\n", slave->ring_position);
fsm->state = ec_fsm_slave_state_idle;
// init sub-state-machines
@ -117,7 +119,8 @@ void ec_fsm_slave_ready(
{
if (fsm->state == ec_fsm_slave_state_idle) {
if (fsm->slave->master->debug_level) {
EC_DBG("Slave %u ready for SDO/FOE.\n",fsm->slave->ring_position);
EC_DBG("Slave %u ready for SDO/FOE.\n",
fsm->slave->ring_position);
}
fsm->state = ec_fsm_slave_state_ready;
}
@ -155,13 +158,12 @@ void ec_fsm_slave_state_ready(
// Check for pending external SDO requests
if (ec_fsm_slave_action_process_sdo(fsm))
return;
// Check for pending FOE requests
if (ec_fsm_slave_action_process_foe(fsm))
return;
}
/*****************************************************************************/
/** Check for pending SDO requests and process one.
@ -189,6 +191,7 @@ int ec_fsm_slave_action_process_sdo(
fsm->state = ec_fsm_slave_state_idle;
return 0;
}
if (slave->current_state == EC_SLAVE_STATE_INIT) {
EC_WARN("Aborting SDO request, slave %u is in INIT.\n",
slave->ring_position);
@ -198,6 +201,7 @@ int ec_fsm_slave_action_process_sdo(
fsm->state = ec_fsm_slave_state_idle;
return 0;
}
request->req.state = EC_INT_REQUEST_BUSY;
// Found pending SDO request. Execute it!
@ -300,7 +304,6 @@ void ec_fsm_slave_state_sdo_request(
fsm->state = ec_fsm_slave_state_ready;
}
/*****************************************************************************/
/** Slave state: FOE REQUEST.
@ -341,3 +344,4 @@ void ec_fsm_slave_state_foe_request(
fsm->state = ec_fsm_slave_state_ready;
}
/*****************************************************************************/

2
script/ifup-eoe.sh
View File

@ -27,6 +27,8 @@
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
#
# vim: expandtab
#
#------------------------------------------------------------------------------
# this ifup.d script adds special network interfaces to a network bridge

2
script/init.d/ethercat.in
View File

@ -29,6 +29,8 @@
# technology and brand is only permitted in compliance with the industrial
# property and similar rights of Beckhoff Automation GmbH.
#
# vim: expandtab
#
#------------------------------------------------------------------------------
### BEGIN INIT INFO