Merge branch 'fix_disable_eoe' into 'stable-1.6'

Fix building without EoE

Closes #123

See merge request etherlab.org/ethercat!137

.gitlab-ci.yml

@@ -46,6 +46,15 @@ xenomai3:
         - ./configure --enable-8139too --enable-igb --enable-e100 --with-linux-dir=/usr/src/linux-obj/x86_64/0510xenomai3 --enable-rtdm --with-xenomai-dir=/usr
         - make -j8 all modules
 
+xenomai3 no eoe:
+    stage: build
+    image: registry.gitlab.com/etherlab.org/build-container-factory/ethercat-kernels:xenomai3
+
+    script:
+        - ./bootstrap
+        - ./configure --enable-8139too --enable-igb --enable-e100 --with-linux-dir=/usr/src/linux-obj/x86_64/0510xenomai3 --enable-rtdm --with-xenomai-dir=/usr --disable-eoe
+        - make -j8 all modules
+
 build:
     stage: build
 

master/fsm_master.c

@@ -104,7 +104,9 @@ void ec_fsm_master_init(
     ec_fsm_coe_init(&fsm->fsm_coe);
     ec_fsm_soe_init(&fsm->fsm_soe);
     ec_fsm_pdo_init(&fsm->fsm_pdo, &fsm->fsm_coe);
+#ifdef EC_EOE
     ec_fsm_eoe_init(&fsm->fsm_eoe);
+#endif
     ec_fsm_change_init(&fsm->fsm_change, fsm->datagram);
     ec_fsm_slave_config_init(&fsm->fsm_slave_config, fsm->datagram,
             &fsm->fsm_change, &fsm->fsm_coe, &fsm->fsm_soe, &fsm->fsm_pdo,
@@ -126,7 +128,9 @@ void ec_fsm_master_clear(
     ec_fsm_coe_clear(&fsm->fsm_coe);
     ec_fsm_soe_clear(&fsm->fsm_soe);
     ec_fsm_pdo_clear(&fsm->fsm_pdo);
+#ifdef EC_EOE
     ec_fsm_eoe_clear(&fsm->fsm_eoe);
+#endif
     ec_fsm_change_clear(&fsm->fsm_change);
     ec_fsm_slave_config_clear(&fsm->fsm_slave_config);
     ec_fsm_slave_scan_clear(&fsm->fsm_slave_scan);

master/fsm_slave_config.c

@@ -965,7 +965,7 @@ void ec_fsm_slave_config_enter_eoe_ip_param(
         ec_fsm_slave_config_t *fsm /**< slave state machine */
         )
 {
-#if EC_EOE
+#ifdef EC_EOE
     ec_slave_t *slave = fsm->slave;
     ec_eoe_request_t *request = &slave->config->eoe_ip_param_request;
 
@@ -991,6 +991,7 @@ void ec_fsm_slave_config_state_eoe_ip_param(
         ec_fsm_slave_config_t *fsm /**< slave state machine */
         )
 {
+#ifdef EC_EOE
     ec_slave_t *slave = fsm->slave;
 
     if (ec_fsm_eoe_exec(fsm->fsm_eoe, fsm->datagram)) {
@@ -1003,7 +1004,7 @@ void ec_fsm_slave_config_state_eoe_ip_param(
     else {
         EC_SLAVE_ERR(slave, "Failed to set EoE IP parameters.\n");
     }
-
+#endif
     ec_fsm_slave_config_enter_pdo_conf(fsm);
 }