# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1159449763 0
# Node ID 72500991bcc377d9f4570cd083eeab4245c8ad30
# Parent  006d3653701ddb5ca98fe518c28c6a39260b50d4
Altered master version string.

diff -r 006d3653701d -r 72500991bcc3 devices/8139too.c
--- a/devices/8139too.c	Thu Sep 28 12:58:06 2006 +0000
+++ b/devices/8139too.c	Thu Sep 28 13:22:43 2006 +0000
@@ -156,17 +156,17 @@
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 
 #include "ecdev.h"
+#include "../master/globals.h"
 
 #define LIT(X) #X
 #define STR(X) LIT(X)
 
-#define COMPILE_INFO "Revision " STR(EC_REV) \
-                     ", compiled by " STR(EC_USER) \
-                     " at " __DATE__ " " __TIME__
+#define RTL8139_DRIVER_NAME DRV_NAME \
+                            " EtherCAT-capable Fast Ethernet driver " \
+                            DRV_VERSION ", master " EC_MASTER_VERSION
 
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 
-#define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION
 #define PFX DRV_NAME ": "
 
 /* Default Message level */
@@ -674,7 +674,7 @@
 MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
 MODULE_DESCRIPTION("RealTek RTL-8139 EtherCAT driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(COMPILE_INFO);
+MODULE_VERSION(EC_MASTER_VERSION);
 
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 
@@ -2900,7 +2900,7 @@
 {
     /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 
-    printk(KERN_INFO RTL8139_DRIVER_NAME " " COMPILE_INFO "\n");
+    printk(KERN_INFO RTL8139_DRIVER_NAME "\n");
     printk(KERN_INFO "ec_device_index is %i\n", ec_device_index);
 
     if (pci_module_init(&rtl8139_pci_driver) < 0) {
diff -r 006d3653701d -r 72500991bcc3 devices/Kbuild
--- a/devices/Kbuild	Thu Sep 28 12:58:06 2006 +0000
+++ b/devices/Kbuild	Thu Sep 28 13:22:43 2006 +0000
@@ -42,9 +42,9 @@
 REV := $(shell if test -s $(src)/../svnrevision; then \
 		cat $(src)/../svnrevision; \
 	else \
-		svnversion $(src) 2>/dev/null || echo "unknown"; \
+		svnversion $(src)/.. 2>/dev/null || echo "unknown"; \
 	fi)
 
-EXTRA_CFLAGS = -DEC_REV=$(REV) -DEC_USER=$(USER)
+EXTRA_CFLAGS = -DSVNREV=$(REV)
 
 #------------------------------------------------------------------------------
diff -r 006d3653701d -r 72500991bcc3 master/Kbuild
--- a/master/Kbuild	Thu Sep 28 12:58:06 2006 +0000
+++ b/master/Kbuild	Thu Sep 28 13:22:43 2006 +0000
@@ -46,6 +46,6 @@
 		svnversion $(src) 2>/dev/null || echo "unknown"; \
 	fi)
 
-EXTRA_CFLAGS := -DSVNREV=$(REV) -DUSER=$(USER)
+EXTRA_CFLAGS := -DSVNREV=$(REV)
 
 #------------------------------------------------------------------------------
diff -r 006d3653701d -r 72500991bcc3 master/globals.h
--- a/master/globals.h	Thu Sep 28 12:58:06 2006 +0000
+++ b/master/globals.h	Thu Sep 28 13:22:43 2006 +0000
@@ -58,12 +58,10 @@
 
 /** 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__
+#define EC_MASTER_VERSION EC_STR(EC_MASTER_VERSION_MAIN) \
+                          "." EC_STR(EC_MASTER_VERSION_SUB) \
+                          " " EC_MASTER_VERSION_EXTRA \
+                          " r" EC_STR(SVNREV)
 
 /** maximum number of FMMUs per slave */
 #define EC_MAX_FMMUS 16
diff -r 006d3653701d -r 72500991bcc3 master/master.c
--- a/master/master.c	Thu Sep 28 12:58:06 2006 +0000
+++ b/master/master.c	Thu Sep 28 13:22:43 2006 +0000
@@ -716,7 +716,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, "\nVersion: " EC_MASTER_VERSION);
     off += sprintf(buffer + off, "\nMode: ");
     switch (master->mode) {
         case EC_MASTER_MODE_ORPHANED:
diff -r 006d3653701d -r 72500991bcc3 master/module.c
--- a/master/module.c	Thu Sep 28 12:58:06 2006 +0000
+++ b/master/module.c	Thu Sep 28 13:22:43 2006 +0000
@@ -68,7 +68,7 @@
 MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
 MODULE_DESCRIPTION("EtherCAT master driver module");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(EC_COMPILE_INFO);
+MODULE_VERSION(EC_MASTER_VERSION);
 MODULE_PARM_DESC(ec_master_count, "number of EtherCAT masters to initialize");
 MODULE_PARM_DESC(ec_eoeif_count, "number of EoE interfaces per master");
 
@@ -87,7 +87,7 @@
     unsigned int i;
     ec_master_t *master, *next;
 
-    EC_INFO("Master driver, %s\n", EC_COMPILE_INFO);
+    EC_INFO("Master driver %s\n", EC_MASTER_VERSION);
 
     if (ec_master_count < 1) {
         EC_ERR("Invalid ec_master_count: %i\n", ec_master_count);