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

Avoided unused variable warnings.

This commit is contained in:
Florian Pose 2012-01-09 17:42:28 +01:00
parent 6102f449c7
commit 929df897b5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
master/ethernet.c
View File

@ -441,7 +441,10 @@ void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE handler */)
{
size_t rec_size, data_size;
uint8_t *data, frame_type, last_fragment, time_appended, mbox_prot;
uint8_t frame_number, fragment_offset, fragment_number;
uint8_t fragment_offset, fragment_number;
#if EOE_DEBUG_LEVEL >= 2
uint8_t frame_number;
#endif
off_t offset;
#if EOE_DEBUG_LEVEL >= 3
unsigned int i;
@ -497,7 +500,9 @@ void ec_eoe_state_rx_fetch(ec_eoe_t *eoe /**< EoE handler */)
time_appended = (EC_READ_U16(data) >> 9) & 0x0001;
fragment_number = EC_READ_U16(data + 2) & 0x003F;
fragment_offset = (EC_READ_U16(data + 2) >> 6) & 0x003F;
#if EOE_DEBUG_LEVEL >= 2
frame_number = (EC_READ_U16(data + 2) >> 12) & 0x000F;
#endif
#if EOE_DEBUG_LEVEL >= 2
EC_SLAVE_DBG(eoe->slave, 0, "EoE %s RX fragment %u%s, offset %u,"

3
master/fsm_foe.c
View File

@ -622,15 +622,12 @@ void ec_fsm_foe_read_start(
ec_fsm_foe_t *fsm /**< FoE statemachine. */
)
{
size_t current_size;
ec_slave_t *slave = fsm->slave;
fsm->rx_buffer_offset = 0;
fsm->rx_expected_packet_no = 1;
fsm->rx_last_packet = 0;
current_size = fsm->rx_filename_len;
#ifdef DEBUG_FOE
printk("ec_fsm_foe_read_start()\n");
#endif

4
master/master.c
View File

@ -1236,7 +1236,9 @@ static int ec_master_idle_thread(void *priv_data)
ec_master_t *master = (ec_master_t *) priv_data;
ec_slave_t *slave = NULL;
int fsm_exec;
#ifdef EC_USE_HRTIMER
size_t sent_bytes;
#endif
// send interval in IDLE phase
ec_master_set_send_interval(master, 1000000 / HZ);
@ -1271,8 +1273,10 @@ static int ec_master_idle_thread(void *priv_data)
ec_master_queue_datagram(master, &master->fsm_datagram);
}
ecrt_master_send(master);
#ifdef EC_USE_HRTIMER
sent_bytes = master->main_device.tx_skb[
master->main_device.tx_ring_index]->len;
#endif
up(&master->io_sem);
if (ec_fsm_master_idle(&master->fsm)) {