From a5eabfa35ddcc1c863029667962e9c62eb94ef36 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Wed, 7 Mar 2007 13:12:33 +0000 Subject: [PATCH] Moved a few constants to the files they are needed in. --- master/ethernet.c | 17 +++++++++++------ master/globals.h | 9 --------- master/slave.h | 5 +++++ master/sync.h | 5 +++++ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/master/ethernet.c b/master/ethernet.c index 9f6d08ca..3cec526f 100644 --- a/master/ethernet.c +++ b/master/ethernet.c @@ -48,16 +48,21 @@ #include "mailbox.h" #include "ethernet.h" -/** - Defines the debug level of EoE processing +/*****************************************************************************/ - 0 = No debug messages. - 1 = Output actions. - 2 = Output actions and frame data. -*/ +/** + * Defines the debug level of EoE processing. + * + * 0 = No debug messages. + * 1 = Output actions. + * 2 = Output actions and frame data. + */ #define EOE_DEBUG_LEVEL 0 +/** size of the EoE tx queue */ +#define EC_EOE_TX_QUEUE_SIZE 100 + /*****************************************************************************/ void ec_eoe_flush(ec_eoe_t *); diff --git a/master/globals.h b/master/globals.h index 21d57f8c..0a127259 100644 --- a/master/globals.h +++ b/master/globals.h @@ -49,12 +49,6 @@ * EtherCAT master *****************************************************************************/ -/** maximum number of FMMUs per slave */ -#define EC_MAX_FMMUS 16 - -/** size of the EoE tx queue */ -#define EC_EOE_TX_QUEUE_SIZE 100 - /** clock frequency for the EoE state machines */ #define EC_EOE_FREQUENCY 1000 @@ -84,9 +78,6 @@ /** size of an EtherCAT datagram footer */ #define EC_DATAGRAM_FOOTER_SIZE 2 -/** size of a sync manager configuration page */ -#define EC_SYNC_SIZE 8 - /** size of an FMMU configuration page */ #define EC_FMMU_SIZE 16 diff --git a/master/slave.h b/master/slave.h index 03652098..b2508c6a 100644 --- a/master/slave.h +++ b/master/slave.h @@ -53,6 +53,11 @@ /*****************************************************************************/ +/** maximum number of FMMUs per slave */ +#define EC_MAX_FMMUS 16 + +/*****************************************************************************/ + /** State of an EtherCAT slave. */ diff --git a/master/sync.h b/master/sync.h index 88586774..9ee910a2 100644 --- a/master/sync.h +++ b/master/sync.h @@ -48,6 +48,11 @@ /*****************************************************************************/ +/** size of a sync manager configuration page */ +#define EC_SYNC_SIZE 8 + +/*****************************************************************************/ + /** * Sync manager. */