master/master.c
branchstable-1.5
changeset 2178 3afde1f58e1a
parent 2169 1a128e86d4f6
child 2235 cd49c2c31dcb
equal deleted inserted replaced
2177:dff1cf71a8c7 2178:3afde1f58e1a
  1268         // queue and send
  1268         // queue and send
  1269         down(&master->io_sem);
  1269         down(&master->io_sem);
  1270         if (fsm_exec) {
  1270         if (fsm_exec) {
  1271             ec_master_queue_datagram(master, &master->fsm_datagram);
  1271             ec_master_queue_datagram(master, &master->fsm_datagram);
  1272         }
  1272         }
  1273         ec_master_inject_external_datagrams(master);
       
  1274         ecrt_master_send(master);
  1273         ecrt_master_send(master);
  1275         sent_bytes = master->main_device.tx_skb[
  1274         sent_bytes = master->main_device.tx_skb[
  1276             master->main_device.tx_ring_index]->len;
  1275             master->main_device.tx_ring_index]->len;
  1277         up(&master->io_sem);
  1276         up(&master->io_sem);
  1278 
  1277 
  2098     if (master->injection_seq_rt != master->injection_seq_fsm) {
  2097     if (master->injection_seq_rt != master->injection_seq_fsm) {
  2099         // inject datagrams produced by master & slave FSMs
  2098         // inject datagrams produced by master & slave FSMs
  2100         ec_master_queue_datagram(master, &master->fsm_datagram);
  2099         ec_master_queue_datagram(master, &master->fsm_datagram);
  2101         master->injection_seq_rt = master->injection_seq_fsm;
  2100         master->injection_seq_rt = master->injection_seq_fsm;
  2102     }
  2101     }
       
  2102 
  2103     ec_master_inject_external_datagrams(master);
  2103     ec_master_inject_external_datagrams(master);
  2104 
  2104 
  2105     if (unlikely(!master->main_device.link_state)) {
  2105     if (unlikely(!master->main_device.link_state)) {
  2106         // link is down, no datagram can be sent
  2106         // link is down, no datagram can be sent
  2107         list_for_each_entry_safe(datagram, n, &master->datagram_queue, queue) {
  2107         list_for_each_entry_safe(datagram, n, &master->datagram_queue, queue) {