master/master.c
branchredundancy
changeset 2305 668bdb89879b
parent 2301 01e4381ebd09
child 2336 dc82f7d09767
equal deleted inserted replaced
2304:1b0372eede04 2305:668bdb89879b
  1384         down(&master->io_sem);
  1384         down(&master->io_sem);
  1385         if (fsm_exec) {
  1385         if (fsm_exec) {
  1386             ec_master_queue_datagram(master, &master->fsm_datagram,
  1386             ec_master_queue_datagram(master, &master->fsm_datagram,
  1387                     EC_DEVICE_MAIN);
  1387                     EC_DEVICE_MAIN);
  1388         }
  1388         }
  1389         ec_master_inject_external_datagrams(master);
       
  1390         ecrt_master_send(master);
  1389         ecrt_master_send(master);
  1391         sent_bytes = master->devices[EC_DEVICE_MAIN].tx_skb[
  1390         sent_bytes = master->devices[EC_DEVICE_MAIN].tx_skb[
  1392             master->devices[EC_DEVICE_MAIN].tx_ring_index]->len;
  1391             master->devices[EC_DEVICE_MAIN].tx_ring_index]->len;
  1393         up(&master->io_sem);
  1392         up(&master->io_sem);
  1394 
  1393 
  2217         // inject datagrams produced by master & slave FSMs
  2216         // inject datagrams produced by master & slave FSMs
  2218         ec_master_queue_datagram(master, &master->fsm_datagram,
  2217         ec_master_queue_datagram(master, &master->fsm_datagram,
  2219                 EC_DEVICE_MAIN);
  2218                 EC_DEVICE_MAIN);
  2220         master->injection_seq_rt = master->injection_seq_fsm;
  2219         master->injection_seq_rt = master->injection_seq_fsm;
  2221     }
  2220     }
       
  2221 
  2222     ec_master_inject_external_datagrams(master);
  2222     ec_master_inject_external_datagrams(master);
  2223 
  2223 
  2224     for (i = 0; i < EC_NUM_DEVICES; i++) {
  2224     for (i = 0; i < EC_NUM_DEVICES; i++) {
  2225         if (unlikely(!master->devices[i].link_state)) {
  2225         if (unlikely(!master->devices[i].link_state)) {
  2226             // link is down, no datagram can be sent
  2226             // link is down, no datagram can be sent