diff --git a/drivers/ec_command.c b/drivers/ec_command.c index 6b909285..a4d26528 100644 --- a/drivers/ec_command.c +++ b/drivers/ec_command.c @@ -30,7 +30,7 @@ void EtherCAT_command_init(EtherCAT_command_t *cmd) 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 --git a/drivers/ec_command.h b/drivers/ec_command.h index 3d2ab278..030ed576 100644 --- a/drivers/ec_command.h +++ b/drivers/ec_command.h @@ -69,8 +69,10 @@ typedef struct EtherCAT_command 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 --git a/drivers/ec_master.c b/drivers/ec_master.c index fef940bb..71556578 100644 --- a/drivers/ec_master.c +++ b/drivers/ec_master.c @@ -44,21 +44,23 @@ int EtherCAT_master_init(EtherCAT_master_t *master, 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 --git a/drivers/ec_master.h b/drivers/ec_master.h index c8bf2508..edee987c 100644 --- a/drivers/ec_master.h +++ b/drivers/ec_master.h @@ -31,8 +31,10 @@ typedef struct 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 @@ typedef struct 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 */ }