diff -r 3b7eec329112 -r 8fede404c01f master/master.h --- a/master/master.h Wed Oct 25 16:53:17 2006 +0000 +++ b/master/master.h Thu Oct 26 16:29:26 2006 +0000 @@ -148,35 +148,31 @@ /*****************************************************************************/ -// master creation and deletion +// master creation int ec_master_init(ec_master_t *, unsigned int, unsigned int, dev_t); -void ec_master_reset(ec_master_t *); -// free run -void ec_master_idle_start(ec_master_t *); -void ec_master_idle_stop(ec_master_t *); +// mode transitions +int ec_master_enter_idle_mode(ec_master_t *); +void ec_master_leave_idle_mode(ec_master_t *); +int ec_master_enter_operation_mode(ec_master_t *); +void ec_master_leave_operation_mode(ec_master_t *); // EoE void ec_master_eoe_start(ec_master_t *); void ec_master_eoe_stop(ec_master_t *); -// IO +// datagram IO void ec_master_receive_datagrams(ec_master_t *, const uint8_t *, size_t); void ec_master_queue_datagram(ec_master_t *, ec_datagram_t *); -// slave management -int ec_master_bus_scan(ec_master_t *); - // misc. void ec_master_output_stats(ec_master_t *); void ec_master_clear_slaves(ec_master_t *); -int ec_master_measure_bus_time(ec_master_t *); +void ec_master_calc_addressing(ec_master_t *); -// other methods +// helper functions void ec_sync_config(const ec_sii_sync_t *, const ec_slave_t *, uint8_t *); void ec_fmmu_config(const ec_fmmu_t *, const ec_slave_t *, uint8_t *); -void ec_master_calc_addressing(ec_master_t *); -void ec_master_flush_sdo_requests(ec_master_t *); /*****************************************************************************/