diff -r 3b81d074735c -r 3778920f61e4 master/module.c --- a/master/module.c Thu Feb 14 09:18:55 2008 +0000 +++ b/master/module.c Tue Feb 19 08:22:20 2008 +0000 @@ -31,10 +31,9 @@ * *****************************************************************************/ -/** - \file - EtherCAT master driver module. -*/ +/** \file + * EtherCAT master driver module. + */ /*****************************************************************************/ @@ -49,7 +48,7 @@ /*****************************************************************************/ -#define MAX_MASTERS 5 /**< maximum number of masters */ +#define MAX_MASTERS 5 /**< Maximum number of masters. */ /*****************************************************************************/ @@ -541,28 +540,7 @@ * Realtime interface *****************************************************************************/ -/** - * Returns the version magic of the realtime interface. - * \return ECRT version magic. - * \ingroup RealtimeInterface - */ - -unsigned int ecrt_version_magic(void) -{ - return ECRT_VERSION_MAGIC; -} - -/*****************************************************************************/ - -/** - Reserves an EtherCAT master for realtime operation. - \return pointer to reserved master, or NULL on error - \ingroup RealtimeInterface -*/ - -ec_master_t *ecrt_request_master(unsigned int master_index - /**< master index */ - ) +ec_master_t *ecrt_request_master(unsigned int master_index) { ec_master_t *master; @@ -622,12 +600,7 @@ /*****************************************************************************/ -/** - Releases a reserved EtherCAT master. - \ingroup RealtimeInterface -*/ - -void ecrt_release_master(ec_master_t *master /**< EtherCAT master */) +void ecrt_release_master(ec_master_t *master) { EC_INFO("Releasing master %u...\n", master->index); @@ -646,6 +619,13 @@ /*****************************************************************************/ +unsigned int ecrt_version_magic(void) +{ + return ECRT_VERSION_MAGIC; +} + +/*****************************************************************************/ + /** \cond */ module_init(ec_init_module);