Removed sync manager assign source.
--- a/TODO Fri Aug 01 09:29:40 2008 +0000
+++ b/TODO Fri Aug 01 09:32:35 2008 +0000
@@ -11,7 +11,6 @@
* Attach Pdo names from SII or Coe dictionary to Pdos read via CoE.
* Update documentation.
* Race in jiffies frame timeout?
-* Remove ec_sync_t::assign_source?
* Repair rcethercat status.
* Abort code messages in userspace.
--- a/master/cdev.c Fri Aug 01 09:29:40 2008 +0000
+++ b/master/cdev.c Fri Aug 01 09:32:35 2008 +0000
@@ -259,7 +259,6 @@
data.default_size = sync->default_length;
data.control_register = sync->control_register;
data.enable = sync->enable;
- data.assign_source = sync->assign_source;
data.pdo_count = ec_pdo_list_count(&sync->pdos);
up(&master->master_sem);
--- a/master/fsm_pdo.c Fri Aug 01 09:29:40 2008 +0000
+++ b/master/fsm_pdo.c Fri Aug 01 09:32:35 2008 +0000
@@ -282,7 +282,6 @@
return;
}
- fsm->sync->assign_source = EC_ASSIGN_COE;
ec_pdo_list_clear_pdos(&fsm->pdos);
// next sync manager
--- a/master/ioctl.h Fri Aug 01 09:29:40 2008 +0000
+++ b/master/ioctl.h Fri Aug 01 09:32:35 2008 +0000
@@ -138,7 +138,6 @@
uint16_t default_size;
uint8_t control_register;
uint8_t enable;
- uint8_t assign_source;
uint8_t pdo_count;
} ec_ioctl_slave_sync_t;
--- a/master/slave.c Fri Aug 01 09:29:40 2008 +0000
+++ b/master/slave.c Fri Aug 01 09:32:35 2008 +0000
@@ -473,8 +473,6 @@
if (ec_pdo_list_add_pdo_copy(&sync->pdos, pdo))
return -1;
-
- sync->assign_source = EC_ASSIGN_SII;
}
}
--- a/master/sync.c Fri Aug 01 09:29:40 2008 +0000
+++ b/master/sync.c Fri Aug 01 09:32:35 2008 +0000
@@ -58,7 +58,6 @@
sync->control_register = 0x00;
sync->enable = 0x00;
ec_pdo_list_init(&sync->pdos);
- sync->assign_source = EC_ASSIGN_NONE;
}
/*****************************************************************************/
@@ -77,7 +76,6 @@
sync->enable = other->enable;
ec_pdo_list_init(&sync->pdos);
ec_pdo_list_copy(&sync->pdos, &other->pdos);
- sync->assign_source = other->assign_source;
}
/*****************************************************************************/
--- a/master/sync.h Fri Aug 01 09:29:40 2008 +0000
+++ b/master/sync.h Fri Aug 01 09:32:35 2008 +0000
@@ -47,17 +47,6 @@
/*****************************************************************************/
-/** EtherCAT Pdo assignment source.
- */
-typedef enum {
- EC_ASSIGN_NONE, /**< No Pdos assigned. */
- EC_ASSIGN_SII, /**< Pdo assignment read from SII. */
- EC_ASSIGN_COE, /**< Pdo assignment read via CoE. */
- EC_ASSIGN_CUSTOM, /**< Pdos assignment set by application. */
-} ec_assign_source_t;
-
-/*****************************************************************************/
-
/** Sync manager.
*/
typedef struct {
@@ -67,7 +56,6 @@
uint8_t control_register; /**< Control register value. */
uint8_t enable; /**< Enable bit. */
ec_pdo_list_t pdos; /**< Current Pdo assignment. */
- ec_assign_source_t assign_source; /**< Pdo assignment source. */
} ec_sync_t;
/*****************************************************************************/