bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Altered master version string.

This commit is contained in:
Florian Pose 2006-09-28 13:22:43 +00:00
parent 302b826fe1
commit 2303af54b2
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devices/8139too.c
View File

@ -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) {

4
devices/Kbuild
View File

@ -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)
#------------------------------------------------------------------------------

2
master/Kbuild
View File

@ -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)
#------------------------------------------------------------------------------

10
master/globals.h
View File

@ -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

2
master/master.c
View File

@ -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:

4
master/module.c
View File

@ -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);