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

Version 1.2.0-rc1, re-introduced ecrt_domain_queue().

This commit is contained in:
Florian Pose 2006-11-23 20:19:26 +00:00
parent 2568ef35d1
commit ded638c296
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT([ethercat],[1.1.1],[fp@igh-essen.com])
AC_INIT([ethercat],[1.2.0-rc1],[fp@igh-essen.com])
AC_CONFIG_AUX_DIR([autoconf])
AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2])
AC_PREFIX_DEFAULT([/opt/etherlab])

5
include/ecrt.h
View File

@ -109,7 +109,6 @@ void ecrt_master_callbacks(ec_master_t *master, int (*request_cb)(void *),
ec_domain_t *ecrt_master_create_domain(ec_master_t *master);
int ecrt_master_activate(ec_master_t *master);
void ecrt_master_deactivate(ec_master_t *master); // deprecated!
void ecrt_master_prepare(ec_master_t *master);
@ -149,6 +148,7 @@ ec_slave_t *ecrt_domain_register_pdo_range(ec_domain_t *domain,
void **data_ptr);
void ecrt_domain_process(ec_domain_t *domain);
void ecrt_domain_queue(ec_domain_t *domain);
int ecrt_domain_state(const ec_domain_t *domain);
/******************************************************************************
@ -162,9 +162,6 @@ int ecrt_slave_conf_sdo16(ec_slave_t *slave, uint16_t sdo_index,
int ecrt_slave_conf_sdo32(ec_slave_t *slave, uint16_t sdo_index,
uint8_t sdo_subindex, uint32_t value);
int ecrt_slave_pdo_size(ec_slave_t *slave, uint16_t pdo_index,
uint8_t pdo_subindex, size_t size); // deprecated
/******************************************************************************
* Bitwise read/write macros
*****************************************************************************/

32
master/domain.c
View File

@ -478,21 +478,6 @@ int ec_domain_alloc(ec_domain_t *domain, /**< EtherCAT domain */
/*****************************************************************************/
/**
Places all process data datagrams in the masters datagram queue.
*/
void ec_domain_queue_datagrams(ec_domain_t *domain /**< EtherCAT domain */)
{
ec_datagram_t *datagram;
list_for_each_entry(datagram, &domain->datagrams, list) {
ec_master_queue_datagram(domain->master, datagram);
}
}
/*****************************************************************************/
/**
Formats attribute data for SysFS reading.
\return number of bytes to read
@ -691,8 +676,22 @@ void ecrt_domain_process(ec_domain_t *domain /**< EtherCAT domain */)
}
domain->working_counter_changes = 0;
}
}
ec_domain_queue_datagrams(domain);
/*****************************************************************************/
/**
Places all process data datagrams in the masters datagram queue.
\ingroup RealtimeInterface
*/
void ecrt_domain_queue(ec_domain_t *domain /**< EtherCAT domain */)
{
ec_datagram_t *datagram;
list_for_each_entry(datagram, &domain->datagrams, list) {
ec_master_queue_datagram(domain->master, datagram);
}
}
/*****************************************************************************/
@ -716,6 +715,7 @@ EXPORT_SYMBOL(ecrt_domain_register_pdo);
EXPORT_SYMBOL(ecrt_domain_register_pdo_list);
EXPORT_SYMBOL(ecrt_domain_register_pdo_range);
EXPORT_SYMBOL(ecrt_domain_process);
EXPORT_SYMBOL(ecrt_domain_queue);
EXPORT_SYMBOL(ecrt_domain_state);
/** \endcond */