From f7b50347f233afaf74de705a8e8913e47ffe5211 Mon Sep 17 00:00:00 2001 From: Florian Pose <fp@igh-essen.com> Date: Fri, 23 Dec 2005 08:23:35 +0000 Subject: [PATCH] Schoenheitskorrekturen. --- TODO | 9 +++++---- drivers/Makefile | 18 +++++++++--------- drivers/ec_command.h | 4 ++++ drivers/ec_device.h | 2 ++ drivers/ec_globals.h | 6 ++++++ drivers/ec_types.h | 8 +++++--- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/TODO b/TODO index 2d796cba..0e3b70b4 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,9 @@ TODO-Liste EtherCAT-Treiber -$Date$ -$Author$ +$Id$ -- Konfiguration SSI-/Inkrementalgeberklemmen +- Klasse für Prozessdaten, Kapselung +- Senden/Empfangen mit Warten, dynamische Wartezeiten +- Konfiguration SSI-/Inkrementalgeberklemmen (CoE) - Ethernet over EtherCAT (EoE) -- Retry bei Asynchroner Kommunikation +- eepro100-Kartentreiber diff --git a/drivers/Makefile b/drivers/Makefile index e4fb6d73..15b6504d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,4 +1,4 @@ -#---------------------------------------------------------------- +#------------------------------------------------------------------------------ # # Makefile # @@ -6,40 +6,40 @@ # # $Id$ # -#---------------------------------------------------------------- +#------------------------------------------------------------------------------ ifneq ($(KERNELRELEASE),) -#---------------------------------------------------------------- +#------------------------------------------------------------------------------ # Kbuild-Abschnitt obj-m := 8139too-ecat.o ecat-master.o 8139too-ecat-objs := 8139too.o -ecat-master-objs := ec_module.o ec_master.o ec_device.o \ - ec_slave.o ec_command.o ec_types.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 -#---------------------------------------------------------------- +#------------------------------------------------------------------------------ # Default-Abschnitt include ../ethercat.conf -default: +modules: $(MAKE) -C $(KERNELDIR) M=`pwd` modules clean: $(MAKE) -C $(KERNELDIR) M=`pwd` clean -#---------------------------------------------------------------- +#------------------------------------------------------------------------------ endif diff --git a/drivers/ec_command.h b/drivers/ec_command.h index df231c1f..de16689c 100644 --- a/drivers/ec_command.h +++ b/drivers/ec_command.h @@ -13,6 +13,8 @@ #include "ec_globals.h" +/*****************************************************************************/ + /** Status eines EtherCAT-Kommandos. */ @@ -23,6 +25,8 @@ typedef enum } EtherCAT_command_state_t; +/*****************************************************************************/ + /** EtherCAT-Adresse. diff --git a/drivers/ec_device.h b/drivers/ec_device.h index 41e6fe67..2ea30767 100644 --- a/drivers/ec_device.h +++ b/drivers/ec_device.h @@ -15,6 +15,8 @@ #include "ec_globals.h" +/*****************************************************************************/ + /** Zustand eines EtherCAT-Gerätes. diff --git a/drivers/ec_globals.h b/drivers/ec_globals.h index 953c1be9..a3d7a9e7 100644 --- a/drivers/ec_globals.h +++ b/drivers/ec_globals.h @@ -11,6 +11,8 @@ #ifndef _EC_GLOBALS_ #define _EC_GLOBALS_ +/*****************************************************************************/ + /** Maximale Größe eines EtherCAT-Frames */ @@ -24,6 +26,8 @@ #define NULL ((void *) 0) #endif +/*****************************************************************************/ + /** EtherCAT-Kommando-Typ */ @@ -41,6 +45,8 @@ typedef enum } EtherCAT_cmd_type_t; +/*****************************************************************************/ + /** Zustand eines EtherCAT-Slaves */ diff --git a/drivers/ec_types.h b/drivers/ec_types.h index 13490e5f..b8f88083 100644 --- a/drivers/ec_types.h +++ b/drivers/ec_types.h @@ -11,6 +11,8 @@ #ifndef _EC_TYPES_H_ #define _EC_TYPES_H_ +/*****************************************************************************/ + /** Typ eines EtherCAT-Slaves. @@ -60,9 +62,9 @@ typedef struct slave_desc int (*read) (unsigned char *, unsigned int); /**< Funktion zum Dekodieren und Lesen der Kanaldaten */ - void (*write) (unsigned char *, unsigned int, int); /**< Funktion zum Kodieren - und Schreiben der - Kanaldaten */ + void (*write) (unsigned char *, unsigned int, int); /**< Funktion zum + Kodieren und Schreiben + der Kanaldaten */ } EtherCAT_slave_desc_t; -- GitLab