Schoenheitskorrekturen.
--- a/TODO Fri Dec 23 08:20:10 2005 +0000
+++ b/TODO Fri Dec 23 08:23:35 2005 +0000
@@ -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
--- a/drivers/Makefile Fri Dec 23 08:20:10 2005 +0000
+++ b/drivers/Makefile Fri Dec 23 08:23:35 2005 +0000
@@ -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
--- a/drivers/ec_command.h Fri Dec 23 08:20:10 2005 +0000
+++ b/drivers/ec_command.h Fri Dec 23 08:23:35 2005 +0000
@@ -13,6 +13,8 @@
#include "ec_globals.h"
+/*****************************************************************************/
+
/**
Status eines EtherCAT-Kommandos.
*/
@@ -23,6 +25,8 @@
}
EtherCAT_command_state_t;
+/*****************************************************************************/
+
/**
EtherCAT-Adresse.
--- a/drivers/ec_device.h Fri Dec 23 08:20:10 2005 +0000
+++ b/drivers/ec_device.h Fri Dec 23 08:23:35 2005 +0000
@@ -15,6 +15,8 @@
#include "ec_globals.h"
+/*****************************************************************************/
+
/**
Zustand eines EtherCAT-Gerätes.
--- a/drivers/ec_globals.h Fri Dec 23 08:20:10 2005 +0000
+++ b/drivers/ec_globals.h Fri Dec 23 08:23:35 2005 +0000
@@ -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 @@
}
EtherCAT_cmd_type_t;
+/*****************************************************************************/
+
/**
Zustand eines EtherCAT-Slaves
*/
--- a/drivers/ec_types.h Fri Dec 23 08:20:10 2005 +0000
+++ b/drivers/ec_types.h Fri Dec 23 08:23:35 2005 +0000
@@ -11,6 +11,8 @@
#ifndef _EC_TYPES_H_
#define _EC_TYPES_H_
+/*****************************************************************************/
+
/**
Typ eines EtherCAT-Slaves.
@@ -60,9 +62,9 @@
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;