diff -r f149465f4c63 -r e675450f2174 master/globals.h --- a/master/globals.h Thu Jul 13 13:10:57 2006 +0000 +++ b/master/globals.h Thu Aug 03 12:59:01 2006 +0000 @@ -51,7 +51,7 @@ #define EC_MASTER_VERSION_MAIN 1 /** master sub version (after the dot) */ -#define EC_MASTER_VERSION_SUB 0 +#define EC_MASTER_VERSION_SUB 1 /** master extra version (just a string) */ #define EC_MASTER_VERSION_EXTRA "trunk" @@ -65,6 +65,9 @@ /** clock frequency for the EoE state machines */ #define EC_EOE_FREQUENCY 1000 +/** datagram timeout in microseconds */ +#define EC_IO_TIMEOUT 500 + /****************************************************************************** * EtherCAT protocol *****************************************************************************/ @@ -170,9 +173,9 @@ /*****************************************************************************/ -extern void ec_print_data(const uint8_t *, size_t); -extern void ec_print_data_diff(const uint8_t *, const uint8_t *, size_t); -extern void ec_print_states(uint8_t); +void ec_print_data(const uint8_t *, size_t); +void ec_print_data_diff(const uint8_t *, const uint8_t *, size_t); +size_t ec_state_string(uint8_t, char *); /*****************************************************************************/ @@ -192,4 +195,3 @@ /*****************************************************************************/ #endif -