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

Fixed signal issue in EEPROM writing code.

This commit is contained in:
Florian Pose 2007-03-02 14:35:49 +00:00
parent 6ad6b0cb0b
commit 65572b43d7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
master/fsm_master.c
View File

@ -298,6 +298,7 @@ int ec_fsm_master_action_process_eeprom(
request = list_entry(master->eeprom_requests.next,
ec_eeprom_write_request_t, list);
list_del_init(&request->list); // dequeue
request->state = EC_EEPROM_REQ_BUSY;
up(&master->eeprom_sem);
slave = request->slave;
@ -305,7 +306,7 @@ int ec_fsm_master_action_process_eeprom(
EC_ERR("Discarding EEPROM data, slave %i not ready.\n",
slave->ring_position);
request->state = EC_EEPROM_REQ_ERROR;
wake_up_interruptible(&master->eeprom_queue);
wake_up(&master->eeprom_queue);
continue;
}
@ -794,7 +795,7 @@ void ec_fsm_master_state_write_eeprom(ec_fsm_master_t *fsm /**< master state mac
EC_ERR("Failed to write EEPROM contents to slave %i.\n",
slave->ring_position);
request->state = EC_EEPROM_REQ_ERROR;
wake_up_interruptible(&master->eeprom_queue);
wake_up(&master->eeprom_queue);
fsm->state = ec_fsm_master_state_error;
return;
}
@ -812,7 +813,7 @@ void ec_fsm_master_state_write_eeprom(ec_fsm_master_t *fsm /**< master state mac
// finished writing EEPROM
EC_INFO("Finished writing EEPROM of slave %i.\n", slave->ring_position);
request->state = EC_EEPROM_REQ_COMPLETED;
wake_up_interruptible(&master->eeprom_queue);
wake_up(&master->eeprom_queue);
// TODO: Evaluate new EEPROM contents!

1
master/fsm_master.h
View File

@ -58,6 +58,7 @@
typedef enum
{
EC_EEPROM_REQ_QUEUED,
EC_EEPROM_REQ_BUSY,
EC_EEPROM_REQ_COMPLETED,
EC_EEPROM_REQ_ERROR
}

9
master/slave.c
View File

@ -832,20 +832,21 @@ ssize_t ec_slave_write_eeprom(ec_slave_t *slave, /**< EtherCAT slave */
up(&master->eeprom_sem);
// wait for processing through FSM
while (wait_event_interruptible(master->eeprom_queue,
if (wait_event_interruptible(master->eeprom_queue,
request.state != EC_EEPROM_REQ_QUEUED)) {
// interrupted by signal
down(&master->eeprom_sem);
if (!list_empty(&request.list)) {
// still queued: safely dequeue
if (request.state == EC_EEPROM_REQ_QUEUED) {
list_del(&request.list);
up(&master->eeprom_sem);
return -EINTR;
return -EPERM;
}
// request processing: interrupt not possible.
up(&master->eeprom_sem);
}
wait_event(master->eeprom_queue, request.state != EC_EEPROM_REQ_BUSY);
return request.state == EC_EEPROM_REQ_COMPLETED ? size : -EIO;
}