bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed ec_sii_pdo_t and ec_sii_pdo_entry_t to ec_pdo_t and 

ec_pdo_entry_t, respectively.
This commit is contained in:
Florian Pose 2007-03-07 11:18:34 +00:00
parent 0ffba7a923
commit 667e0f3e13
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
master/domain.c
View File

@ -188,8 +188,8 @@ void ec_domain_clear(struct kobject *kobj /**< kobject of the domain */)
int ec_domain_reg_pdo_entry(ec_domain_t *domain, /**< EtherCAT domain */
ec_slave_t *slave, /**< slave */
const ec_sii_pdo_t *pdo, /**< PDO */
const ec_sii_pdo_entry_t *entry,
const ec_pdo_t *pdo, /**< PDO */
const ec_pdo_entry_t *entry,
/**< PDO registration entry */
void **data_ptr /**< pointer to the process data
pointer */
@ -197,8 +197,8 @@ int ec_domain_reg_pdo_entry(ec_domain_t *domain, /**< EtherCAT domain */
{
ec_data_reg_t *data_reg;
const ec_sii_sync_t *sync;
const ec_sii_pdo_t *other_pdo;
const ec_sii_pdo_entry_t *other_entry;
const ec_pdo_t *other_pdo;
const ec_pdo_entry_t *other_entry;
unsigned int bit_offset, byte_offset;
// Find sync manager for PDO
@ -499,8 +499,8 @@ ec_slave_t *ecrt_domain_register_pdo(ec_domain_t *domain,
{
ec_slave_t *slave;
ec_master_t *master;
const ec_sii_pdo_t *pdo;
const ec_sii_pdo_entry_t *entry;
const ec_pdo_t *pdo;
const ec_pdo_entry_t *entry;
master = domain->master;

24
master/slave.c
View File

@ -241,8 +241,8 @@ void ec_slave_destroy(ec_slave_t *slave /**< EtherCAT slave */)
void ec_slave_clear(struct kobject *kobj /**< kobject of the slave */)
{
ec_slave_t *slave;
ec_sii_pdo_t *pdo, *next_pdo;
ec_sii_pdo_entry_t *entry, *next_ent;
ec_pdo_t *pdo, *next_pdo;
ec_pdo_entry_t *entry, *next_ent;
ec_sdo_data_t *sdodata, *next_sdodata;
unsigned int i;
@ -519,16 +519,15 @@ int ec_slave_fetch_sii_pdos(
ec_slave_t *slave, /**< EtherCAT slave */
const uint8_t *data, /**< category data */
size_t word_count, /**< number of words */
ec_sii_pdo_type_t pdo_type /**< PDO type */
ec_pdo_type_t pdo_type /**< PDO type */
)
{
ec_sii_pdo_t *pdo;
ec_sii_pdo_entry_t *entry;
ec_pdo_t *pdo;
ec_pdo_entry_t *entry;
unsigned int entry_count, i;
while (word_count >= 4) {
if (!(pdo = (ec_sii_pdo_t *)
kmalloc(sizeof(ec_sii_pdo_t), GFP_ATOMIC))) {
if (!(pdo = kmalloc(sizeof(ec_pdo_t), GFP_KERNEL))) {
EC_ERR("Failed to allocate PDO memory.\n");
return -1;
}
@ -547,8 +546,7 @@ int ec_slave_fetch_sii_pdos(
data += 8;
for (i = 0; i < entry_count; i++) {
if (!(entry = (ec_sii_pdo_entry_t *)
kmalloc(sizeof(ec_sii_pdo_entry_t), GFP_ATOMIC))) {
if (!(entry = kmalloc(sizeof(ec_pdo_entry_t), GFP_KERNEL))) {
EC_ERR("Failed to allocate PDO entry memory.\n");
return -1;
}
@ -657,8 +655,8 @@ size_t ec_slave_info(const ec_slave_t *slave, /**< EtherCAT slave */
{
off_t off = 0;
ec_sii_sync_t *sync;
ec_sii_pdo_t *pdo;
ec_sii_pdo_entry_t *pdo_entry;
ec_pdo_t *pdo;
ec_pdo_entry_t *pdo_entry;
int first, i;
ec_sdo_data_t *sdodata;
char str[20];
@ -1073,8 +1071,8 @@ uint16_t ec_slave_calc_sync_size(const ec_slave_t *slave,
/**< sync manager */
)
{
ec_sii_pdo_t *pdo;
ec_sii_pdo_entry_t *pdo_entry;
ec_pdo_t *pdo;
ec_pdo_entry_t *pdo_entry;
unsigned int bit_size, byte_size;
if (sync->length) return sync->length;

14
master/slave.h
View File

@ -124,29 +124,29 @@ typedef enum
EC_RX_PDO, /**< Reveive PDO */
EC_TX_PDO /**< Transmit PDO */
}
ec_sii_pdo_type_t;
ec_pdo_type_t;
/*****************************************************************************/
/**
PDO description (EEPROM).
PDO description.
*/
typedef struct
{
struct list_head list; /**< list item */
ec_sii_pdo_type_t type; /**< PDO type */
ec_pdo_type_t type; /**< PDO type */
uint16_t index; /**< PDO index */
uint8_t sync_index; /**< assigned sync manager */
char *name; /**< PDO name */
struct list_head entries; /**< entry list */
}
ec_sii_pdo_t;
ec_pdo_t;
/*****************************************************************************/
/**
PDO entry description (EEPROM).
PDO entry description.
*/
typedef struct
@ -157,7 +157,7 @@ typedef struct
char *name; /**< entry name */
uint8_t bit_length; /**< entry length in bit */
}
ec_sii_pdo_entry_t;
ec_pdo_entry_t;
/*****************************************************************************/
@ -267,7 +267,7 @@ int ec_slave_fetch_sii_strings(ec_slave_t *, const uint8_t *);
void ec_slave_fetch_sii_general(ec_slave_t *, const uint8_t *);
int ec_slave_fetch_sii_syncs(ec_slave_t *, const uint8_t *, size_t);
int ec_slave_fetch_sii_pdos(ec_slave_t *, const uint8_t *, size_t,
ec_sii_pdo_type_t);
ec_pdo_type_t);
// misc.
ec_sii_sync_t *ec_slave_get_pdo_sync(ec_slave_t *, ec_direction_t);