# HG changeset patch # User Florian Pose # Date 1131717081 0 # Node ID 28b57b073f584e45eff1d94ff5fa8c5e9caa2bfe # Parent db0742533c101ccc9812e30c42f6dfc0b09589e8 Kommandoring und Co. entfernt. diff -r db0742533c10 -r 28b57b073f58 drivers/ec_command.c --- a/drivers/ec_command.c Fri Nov 11 13:46:41 2005 +0000 +++ b/drivers/ec_command.c Fri Nov 11 13:51:21 2005 +0000 @@ -30,7 +30,7 @@ cmd->type = ECAT_CMD_NONE; cmd->address.logical = 0x00000000; cmd->data_length = 0; - cmd->next = NULL; + //cmd->next = NULL; cmd->state = ECAT_CS_READY; cmd->index = 0; cmd->working_counter = 0; diff -r db0742533c10 -r 28b57b073f58 drivers/ec_command.h --- a/drivers/ec_command.h Fri Nov 11 13:46:41 2005 +0000 +++ b/drivers/ec_command.h Fri Nov 11 13:51:21 2005 +0000 @@ -69,8 +69,10 @@ EtherCAT_address_t address; /**< Adresse des/der Empfänger */ unsigned int data_length; /**< Länge der zu sendenden und/oder empfangenen Daten */ +#if 0 struct EtherCAT_command *next; /**< (Für den Master) Zeiger auf nächstes Kommando in der Liste */ +#endif EtherCAT_command_state_t state; /**< Zustand des Kommandos (bereit, gesendet, etc...) */ unsigned char index; /**< Kommando-Index, mit der das Kommando gesendet wurde (wird diff -r db0742533c10 -r 28b57b073f58 drivers/ec_master.c --- a/drivers/ec_master.c Fri Nov 11 13:46:41 2005 +0000 +++ b/drivers/ec_master.c Fri Nov 11 13:51:21 2005 +0000 @@ -44,21 +44,23 @@ master->slaves = NULL; master->slave_count = 0; - master->first_command = NULL; + //master->first_command = NULL; //master->process_data_command = NULL; master->dev = dev; master->command_index = 0x00; master->tx_data_length = 0; master->process_data = NULL; master->process_data_length = 0; - master->cmd_ring_index = 0; + //master->cmd_ring_index = 0; master->debug_level = 0; +#if 0 for (i = 0; i < ECAT_COMMAND_RING_SIZE; i++) { EtherCAT_command_init(&master->cmd_ring[i]); master->cmd_reserved[i] = 0; } +#endif return 0; } diff -r db0742533c10 -r 28b57b073f58 drivers/ec_master.h --- a/drivers/ec_master.h Fri Nov 11 13:46:41 2005 +0000 +++ b/drivers/ec_master.h Fri Nov 11 13:51:21 2005 +0000 @@ -31,8 +31,10 @@ mit Slave-Informationen */ unsigned int slave_count; /**< Anzahl der Slaves in slaves */ +#if 0 EtherCAT_command_t *first_command; /**< Zeiger auf das erste Kommando in der Liste */ +#endif EtherCAT_command_t process_data_command; /**< Kommando zum Senden und Empfangen der Prozessdaten */ @@ -50,9 +52,11 @@ unsigned char *process_data; /**< Zeiger auf Speicher mit Prozessdaten */ unsigned int process_data_length; /**< Länge der Prozessdaten */ +#if 0 EtherCAT_command_t cmd_ring[ECAT_COMMAND_RING_SIZE]; /**< Statischer Kommandoring */ int cmd_reserved[ECAT_COMMAND_RING_SIZE]; /**< Reservierungsflags für die Kommandos */ unsigned int cmd_ring_index; /**< Index des nächsten Kommandos im Ring */ +#endif int debug_level; /**< Debug-Level im Master-Code */ }