From 4d31f406550329b9e83af60344244efd9fbc261f Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 16 Dec 2005 14:16:54 +0000
Subject: [PATCH] =?UTF-8?q?Compile-Informationen=20hinzugef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--HG--
branch : kernel2.6
---
drivers/8139too.c | 15 +++++++++++++--
drivers/Makefile | 14 ++++++++------
drivers/ec_module.c | 13 ++++++++++---
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/drivers/8139too.c b/drivers/8139too.c
index bbb15c9e..6e16f7f9 100644
--- a/drivers/8139too.c
+++ b/drivers/8139too.c
@@ -138,6 +138,13 @@
#include "ec_master.h"
#include "ec_module.h"
+#define LITERAL(X) #X
+#define STRINGIFY(X) LITERAL(X)
+
+#define COMPILE_INFO "Revision " STRINGIFY(EC_REV) \
+ ", compiled by " STRINGIFY(EC_USER) \
+ " at " STRINGIFY(EC_DATE)
+
/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
#define RTL8139_DRIVER_NAME DRV_NAME " Fast Ethernet driver " DRV_VERSION
@@ -642,10 +649,14 @@ struct rtl8139_private {
unsigned long fifo_copy_timeout;
};
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+
MODULE_AUTHOR ("Wilhelm Hagemeister <hm@igh-essen.com>, Florian Pose <fp@igh-essen.com>");
MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver with EtherCAT functionality");
MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
+MODULE_VERSION(COMPILE_INFO);
+
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
module_param(multicast_filter_limit, int, 0);
module_param_array(media, int, NULL, 0);
@@ -2962,7 +2973,7 @@ static int __init rtl8139_init_module (void)
/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
- printk(KERN_INFO "Initializing RTL8139-EtherCAT module.\n");
+ printk(KERN_INFO "Initializing RTL8139-EtherCAT module. %s\n", COMPILE_INFO);
EtherCAT_device_init(&rtl_ecat_dev);
rtl_ecat_dev.isr = rtl8139_interrupt;
diff --git a/drivers/Makefile b/drivers/Makefile
index 5e4a53cf..e4fb6d73 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -20,6 +20,11 @@ obj-m := 8139too-ecat.o ecat-master.o
ecat-master-objs := ec_module.o ec_master.o ec_device.o \
ec_slave.o ec_command.o ec_types.o
+REV = `svnversion $(src)`
+DATE = `date`
+
+EXTRA_CFLAGS = -DEC_REV="$(REV)" -DEC_USER="$(USER)" -DEC_DATE="$(DATE)"
+
#----------------------------------------------------------------
else
@@ -27,16 +32,13 @@ else
#----------------------------------------------------------------
# Default-Abschnitt
-CONFIG_FILE = ../ethercat.conf
-PWD = $(shell pwd)
-
-include $(CONFIG_FILE)
+include ../ethercat.conf
default:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+ $(MAKE) -C $(KERNELDIR) M=`pwd` modules
clean:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+ $(MAKE) -C $(KERNELDIR) M=`pwd` clean
#----------------------------------------------------------------
diff --git a/drivers/ec_module.c b/drivers/ec_module.c
index bbfe3fb2..9f8ad5b2 100644
--- a/drivers/ec_module.c
+++ b/drivers/ec_module.c
@@ -26,7 +26,14 @@
/******************************************************************************/
-#define SUBVERSION_ID "$Id$"
+#define LITERAL(X) #X
+#define STRINGIFY(X) LITERAL(X)
+
+#define COMPILE_INFO "Revision " STRINGIFY(EC_REV) \
+ ", compiled by " STRINGIFY(EC_USER) \
+ " at " STRINGIFY(EC_DATE)
+
+/******************************************************************************/
int ecat_master_count = 1;
EtherCAT_master_t *ecat_masters = NULL;
@@ -37,7 +44,7 @@ int *ecat_masters_reserved = NULL;
MODULE_AUTHOR ("Wilhelm Hagemeister <hm@igh-essen.com>, Florian Pose <fp@igh-essen.com>");
MODULE_DESCRIPTION ("EtherCAT master driver module");
MODULE_LICENSE("GPL");
-MODULE_VERSION(SUBVERSION_ID);
+MODULE_VERSION(COMPILE_INFO);
module_param(ecat_master_count, int, 1);
MODULE_PARM_DESC(ecat_master_count, "Number of EtherCAT master to initialize.");
@@ -66,7 +73,7 @@ int __init ecat_init_module(void)
{
unsigned int i;
- printk(KERN_ERR "EtherCAT: Master driver %s\n", SUBVERSION_ID);
+ printk(KERN_ERR "EtherCAT: Master driver, %s\n", COMPILE_INFO);
if (ecat_master_count < 1)
{
--
GitLab