MERGE trunk -r682:685 -> branches/stable-1.1 (Fixed dist files, source docs, version 1.1.1)
--- a/Makefile.am Tue Nov 07 12:13:30 2006 +0000
+++ b/Makefile.am Tue Nov 07 13:47:50 2006 +0000
@@ -36,12 +36,11 @@
DIST_SUBDIRS = master devices script include examples
EXTRA_DIST = \
- bootstrap \
documentation/ethercat_doc.pdf \
Doxyfile \
FEATURES \
globals.h \
- LICENSE
+ Kbuild
modules:
$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
--- a/include/ecrt.h Tue Nov 07 12:13:30 2006 +0000
+++ b/include/ecrt.h Tue Nov 07 13:47:50 2006 +0000
@@ -120,7 +120,9 @@
ec_slave_t *ecrt_master_get_slave(const ec_master_t *, const char *);
+/** \cond */
int ecrt_master_state(const ec_master_t *master);
+/** \endcond */
/******************************************************************************
* Domain Methods
--- a/master/fsm.h Tue Nov 07 12:13:30 2006 +0000
+++ b/master/fsm.h Tue Nov 07 13:47:50 2006 +0000
@@ -90,9 +90,12 @@
int ec_fsm_success(ec_fsm_t *);
// TODO: layout slave state machines
+
+/** \cond */
void ec_fsm_slaveconf_state_start(ec_fsm_t *);
void ec_fsm_slave_state_end(ec_fsm_t *);
void ec_fsm_slave_state_error(ec_fsm_t *);
+/** \endcond */
/*****************************************************************************/