diff -r 7bc131b92039 -r 07fd94c5119d master/master.h --- a/master/master.h Fri Aug 10 15:27:08 2007 +0000 +++ b/master/master.h Thu Sep 13 11:08:46 2007 +0000 @@ -75,8 +75,6 @@ { unsigned int timeouts; /**< datagram timeouts */ unsigned int corrupted; /**< corrupted frames */ - unsigned int skipped; /**< skipped datagrams (the ones that were - requeued when not yet received) */ unsigned int unmatched; /**< unmatched datagrams (received, but not queued any longer) */ unsigned long output_jiffies; /**< time of last output */ @@ -145,11 +143,13 @@ uint32_t idle_cycle_times[HZ]; /**< Idle cycle times ring */ unsigned int idle_cycle_time_pos; /**< time ring buffer position */ +#ifdef EC_EOE struct timer_list eoe_timer; /**< EoE timer object */ unsigned int eoe_running; /**< non-zero, if EoE processing is active. */ struct list_head eoe_handlers; /**< Ethernet-over-EtherCAT handlers */ uint32_t eoe_cycle_times[HZ]; /**< EoE cycle times ring */ unsigned int eoe_cycle_time_pos; /**< time ring buffer position */ +#endif spinlock_t internal_lock; /**< spinlock used in idle mode */ int (*request_cb)(void *); /**< lock request callback */ @@ -185,9 +185,11 @@ int ec_master_enter_operation_mode(ec_master_t *); void ec_master_leave_operation_mode(ec_master_t *); +#ifdef EC_EOE // EoE void ec_master_eoe_start(ec_master_t *); void ec_master_eoe_stop(ec_master_t *); +#endif // datagram IO void ec_master_receive_datagrams(ec_master_t *, const uint8_t *, size_t); @@ -195,7 +197,9 @@ // misc. void ec_master_output_stats(ec_master_t *); +#ifdef EC_EOE void ec_master_clear_eoe_handlers(ec_master_t *); +#endif void ec_master_destroy_slaves(ec_master_t *); /*****************************************************************************/