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

Fixed FoE request states.

This commit is contained in:
Florian Pose 2009-01-30 10:56:06 +00:00
parent 96ea8a76b8
commit 5ea60780a0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
master/cdev.c
View File

@ -2454,7 +2454,7 @@ int ec_cdev_ioctl_slave_foe_read(
}
// wait until master FSM has finished processing
wait_event(master->foe_queue, request.req.state != EC_REQUEST_BUSY);
wait_event(master->foe_queue, request.req.state != EC_INT_REQUEST_BUSY);
data.result = request.req.result;
data.error_code = request.req.error_code;
@ -2464,7 +2464,7 @@ int ec_cdev_ioctl_slave_foe_read(
request.req.data_size, request.req.result);
}
if (request.req.state != EC_REQUEST_SUCCESS) {
if (request.req.state != EC_INT_REQUEST_SUCCESS) {
data.data_size = 0;
retval = -EIO;
} else {
@ -2564,12 +2564,12 @@ int ec_cdev_ioctl_slave_foe_write(
}
// wait until master FSM has finished processing
wait_event(master->foe_queue, request.req.state != EC_REQUEST_BUSY);
wait_event(master->foe_queue, request.req.state != EC_INT_REQUEST_BUSY);
data.result = request.req.result;
data.error_code = request.req.error_code;
retval = request.req.state == EC_REQUEST_SUCCESS ? 0 : -EIO;
retval = request.req.state == EC_INT_REQUEST_SUCCESS ? 0 : -EIO;
if (__copy_to_user((void __user *) arg, &data, sizeof(data))) {
retval = -EFAULT;

2
master/foe_request.h
View File

@ -63,7 +63,7 @@ typedef struct {
ec_direction_t dir; /**< Direction. EC_DIR_OUTPUT means downloading to
the slave, EC_DIR_INPUT means uploading from the
slave. */
ec_request_state_t state; /**< FoE request state. */
ec_internal_request_state_t state; /**< FoE request state. */
unsigned long jiffies_start; /**< Jiffies, when the request was issued. */
unsigned long jiffies_sent; /**< Jiffies, when the upload/download
request was sent. */

2
master/fsm_master.c
View File

@ -490,7 +490,7 @@ int ec_fsm_master_action_process_foe(
request = list_entry(master->foe_requests.next,
ec_master_foe_request_t, list);
list_del_init(&request->list); // dequeue
request->req.state = EC_REQUEST_BUSY;
request->req.state = EC_INT_REQUEST_BUSY;
slave = request->slave;
if (master->debug_level)