From d0fb85938d167d1217f9c43c94b903b913909d03 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Thu, 28 Sep 2006 13:22:43 +0000
Subject: [PATCH] Altered master version string.
---
devices/8139too.c | 12 ++++++------
devices/Kbuild | 4 ++--
master/Kbuild | 2 +-
master/globals.h | 10 ++++------
master/master.c | 2 +-
master/module.c | 4 ++--
6 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/devices/8139too.c b/devices/8139too.c
index fbacdfd9..087099e4 100644
--- a/devices/8139too.c
+++ b/devices/8139too.c
@@ -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 @@ struct rtl8139_private {
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 @@ static int __init rtl8139_init_module (void)
{
/* 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 --git a/devices/Kbuild b/devices/Kbuild
index 14aaa149..fe841ff7 100644
--- a/devices/Kbuild
+++ b/devices/Kbuild
@@ -42,9 +42,9 @@ ec_8139too-objs := 8139too.o
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 --git a/master/Kbuild b/master/Kbuild
index f6c6144b..c489bcfa 100644
--- a/master/Kbuild
+++ b/master/Kbuild
@@ -46,6 +46,6 @@ REV := $(shell if test -s $(src)/../svnrevision; then \
svnversion $(src) 2>/dev/null || echo "unknown"; \
fi)
-EXTRA_CFLAGS := -DSVNREV=$(REV) -DUSER=$(USER)
+EXTRA_CFLAGS := -DSVNREV=$(REV)
#------------------------------------------------------------------------------
diff --git a/master/globals.h b/master/globals.h
index 2618c72e..488577a4 100644
--- a/master/globals.h
+++ b/master/globals.h
@@ -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 --git a/master/master.c b/master/master.c
index b96bd190..1f32d611 100644
--- a/master/master.c
+++ b/master/master.c
@@ -716,7 +716,7 @@ ssize_t ec_master_info(ec_master_t *master, /**< EtherCAT master */
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 --git a/master/module.c b/master/module.c
index a78db345..d246ed27 100644
--- a/master/module.c
+++ b/master/module.c
@@ -68,7 +68,7 @@ module_param(ec_eoeif_count, int, S_IRUGO);
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 @@ int __init ec_init_module(void)
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);
--
GitLab