From b46070f27931f8b7af6a03f1d028b154cf721e7d Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 1 Aug 2008 09:32:35 +0000 Subject: [PATCH] Removed sync manager assign source. --- TODO | 1 - master/cdev.c | 1 - master/fsm_pdo.c | 1 - master/ioctl.h | 1 - master/slave.c | 2 -- master/sync.c | 2 -- master/sync.h | 12 ------------ 7 files changed, 20 deletions(-) diff --git a/TODO b/TODO index f2066c1f..ab101380 100644 --- a/TODO +++ b/TODO @@ -11,7 +11,6 @@ Version 1.4.0: * 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. diff --git a/master/cdev.c b/master/cdev.c index bbceede9..bc06346d 100644 --- a/master/cdev.c +++ b/master/cdev.c @@ -259,7 +259,6 @@ int ec_cdev_ioctl_slave_sync( 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); diff --git a/master/fsm_pdo.c b/master/fsm_pdo.c index dc812940..54b7c07f 100644 --- a/master/fsm_pdo.c +++ b/master/fsm_pdo.c @@ -282,7 +282,6 @@ void ec_fsm_pdo_read_action_next_pdo( return; } - fsm->sync->assign_source = EC_ASSIGN_COE; ec_pdo_list_clear_pdos(&fsm->pdos); // next sync manager diff --git a/master/ioctl.h b/master/ioctl.h index ce100588..76e12765 100644 --- a/master/ioctl.h +++ b/master/ioctl.h @@ -138,7 +138,6 @@ typedef struct { uint16_t default_size; uint8_t control_register; uint8_t enable; - uint8_t assign_source; uint8_t pdo_count; } ec_ioctl_slave_sync_t; diff --git a/master/slave.c b/master/slave.c index f486ac88..e0de5f3d 100644 --- a/master/slave.c +++ b/master/slave.c @@ -473,8 +473,6 @@ int ec_slave_fetch_sii_pdos( if (ec_pdo_list_add_pdo_copy(&sync->pdos, pdo)) return -1; - - sync->assign_source = EC_ASSIGN_SII; } } diff --git a/master/sync.c b/master/sync.c index 1965501d..4ad45529 100644 --- a/master/sync.c +++ b/master/sync.c @@ -58,7 +58,6 @@ void ec_sync_init( sync->control_register = 0x00; sync->enable = 0x00; ec_pdo_list_init(&sync->pdos); - sync->assign_source = EC_ASSIGN_NONE; } /*****************************************************************************/ @@ -77,7 +76,6 @@ void ec_sync_init_copy( sync->enable = other->enable; ec_pdo_list_init(&sync->pdos); ec_pdo_list_copy(&sync->pdos, &other->pdos); - sync->assign_source = other->assign_source; } /*****************************************************************************/ diff --git a/master/sync.h b/master/sync.h index 5cf60e51..63b64eb1 100644 --- a/master/sync.h +++ b/master/sync.h @@ -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 @@ typedef struct { 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; /*****************************************************************************/