# HG changeset patch # User Florian Pose # Date 1157719864 0 # Node ID 4bdc4f2e1a93dd35522b9f31671b6dc76f1aa8b2 # Parent 3a652b240c48e22f34056ed5f0c6d511c331c20f Compile/Version info in sysconfig master info file. diff -r 3a652b240c48 -r 4bdc4f2e1a93 master/globals.h --- a/master/globals.h Mon Sep 04 08:29:11 2006 +0000 +++ b/master/globals.h Fri Sep 08 12:51:04 2006 +0000 @@ -56,6 +56,15 @@ /** master extra version (just a string) */ #define EC_MASTER_VERSION_EXTRA "trunk" +/** Compile version info. */ + +#define EC_COMPILE_INFO EC_STR(EC_MASTER_VERSION_MAIN) \ + "." EC_STR(EC_MASTER_VERSION_SUB) \ + " (" EC_MASTER_VERSION_EXTRA ")" \ + " - rev. " EC_STR(SVNREV) \ + ", compiled by " EC_STR(USER) \ + " at " __DATE__ " " __TIME__ + /** maximum number of FMMUs per slave */ #define EC_MAX_FMMUS 16 diff -r 3a652b240c48 -r 4bdc4f2e1a93 master/master.c --- a/master/master.c Mon Sep 04 08:29:11 2006 +0000 +++ b/master/master.c Fri Sep 08 12:51:04 2006 +0000 @@ -705,6 +705,7 @@ ec_eoe_t *eoe; uint32_t cur, sum, min, max, pos, i; + off += sprintf(buffer + off, "\nVersion: " EC_COMPILE_INFO); off += sprintf(buffer + off, "\nMode: "); switch (master->mode) { case EC_MASTER_MODE_ORPHANED: diff -r 3a652b240c48 -r 4bdc4f2e1a93 master/module.c --- a/master/module.c Mon Sep 04 08:29:11 2006 +0000 +++ b/master/module.c Fri Sep 08 12:51:04 2006 +0000 @@ -53,19 +53,6 @@ /*****************************************************************************/ -/** - Compile version info. -*/ - -#define COMPILE_INFO EC_STR(EC_MASTER_VERSION_MAIN) \ - "." EC_STR(EC_MASTER_VERSION_SUB) \ - " (" EC_MASTER_VERSION_EXTRA ")" \ - " - rev. " EC_STR(SVNREV) \ - ", compiled by " EC_STR(USER) \ - " at " __DATE__ " " __TIME__ - -/*****************************************************************************/ - static int ec_master_count = 1; /**< parameter value, number of masters */ static int ec_eoeif_count = 0; /**< parameter value, number of EoE interf. */ static struct list_head ec_masters; /**< list of masters */ @@ -80,7 +67,7 @@ MODULE_AUTHOR("Florian Pose "); MODULE_DESCRIPTION("EtherCAT master driver module"); MODULE_LICENSE("GPL"); -MODULE_VERSION(COMPILE_INFO); +MODULE_VERSION(EC_COMPILE_INFO); MODULE_PARM_DESC(ec_master_count, "number of EtherCAT masters to initialize"); MODULE_PARM_DESC(ec_eoeif_count, "number of EoE interfaces per master"); @@ -99,7 +86,7 @@ unsigned int i; ec_master_t *master, *next; - EC_INFO("Master driver, %s\n", COMPILE_INFO); + EC_INFO("Master driver, %s\n", EC_COMPILE_INFO); if (ec_master_count < 1) { EC_ERR("Error - Invalid ec_master_count: %i\n", ec_master_count);