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

Minor: Renamed slave_sdo_requests.

This commit is contained in:
Florian Pose 2012-12-04 12:59:15 +01:00
parent 0456ad0de8
commit 6863b34ff1
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/fsm_slave.c
View File

@ -183,8 +183,7 @@ int ec_fsm_slave_action_process_sdo(
ec_master_sdo_request_t *request, *next;
// search the first external request to be processed
list_for_each_entry_safe(request, next,
&slave->slave_sdo_requests, list) {
list_for_each_entry_safe(request, next, &slave->sdo_requests, list) {
list_del_init(&request->list); // dequeue
if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {

6
master/master.c
View File

@ -2702,7 +2702,7 @@ int ecrt_master_sdo_download(ec_master_t *master, uint16_t slave_position,
EC_SLAVE_DBG(request.slave, 1, "Schedule SDO download request.\n");
// schedule request.
list_add_tail(&request.list, &request.slave->slave_sdo_requests);
list_add_tail(&request.list, &request.slave->sdo_requests);
up(&master->master_sem);
@ -2783,7 +2783,7 @@ int ecrt_master_sdo_download_complete(ec_master_t *master,
" (complete access).\n");
// schedule request.
list_add_tail(&request.list, &request.slave->slave_sdo_requests);
list_add_tail(&request.list, &request.slave->sdo_requests);
up(&master->master_sem);
@ -2854,7 +2854,7 @@ int ecrt_master_sdo_upload(ec_master_t *master, uint16_t slave_position,
EC_SLAVE_DBG(request.slave, 1, "Schedule SDO upload request.\n");
// schedule request.
list_add_tail(&request.list, &request.slave->slave_sdo_requests);
list_add_tail(&request.list, &request.slave->sdo_requests);
up(&master->master_sem);

6
master/slave.c
View File

@ -152,7 +152,7 @@ void ec_slave_init(
slave->sdo_dictionary_fetched = 0;
slave->jiffies_preop = 0;
INIT_LIST_HEAD(&slave->slave_sdo_requests);
INIT_LIST_HEAD(&slave->sdo_requests);
init_waitqueue_head(&slave->sdo_queue);
INIT_LIST_HEAD(&slave->reg_requests);
@ -194,9 +194,9 @@ void ec_slave_clear(ec_slave_t *slave /**< EtherCAT slave */)
// abort all pending requests
while (!list_empty(&slave->slave_sdo_requests)) {
while (!list_empty(&slave->sdo_requests)) {
ec_master_sdo_request_t *request =
list_entry(slave->slave_sdo_requests.next,
list_entry(slave->sdo_requests.next,
ec_master_sdo_request_t, list);
list_del_init(&request->list); // dequeue
EC_SLAVE_WARN(slave, "Discarding SDO request,"

2
master/slave.h
View File

@ -224,7 +224,7 @@ struct ec_slave
uint8_t sdo_dictionary_fetched; /**< Dictionary has been fetched. */
unsigned long jiffies_preop; /**< Time, the slave went to PREOP. */
struct list_head slave_sdo_requests; /**< SDO access requests. */
struct list_head sdo_requests; /**< SDO access requests. */
wait_queue_head_t sdo_queue; /**< Wait queue for SDO access requests
from user space. */
struct list_head reg_requests; /**< Register access requests. */