Remove ecx_config_init usetable argument

The usetable argument was a leftover from the legacy API which was
removed in a previous commit.

Change-Id: I2fe5fdf9ed2e2c0b118dff43bf5d50b5809adbd7

diff --git a/include/soem/ec_config.h b/include/soem/ec_config.h
index 3c34ce17546d6ec26c9df149ecba97a8e48b81d3..c0291177b467f7c3b37f6d1e5d49d6e13d97898c 100644 (file)
--- a/include/soem/ec_config.h
+++ b/include/soem/ec_config.h
@@ -19,7 +19,7 @@ extern "C" {
 #define EC_NODEOFFSET 0x1000
 #define EC_TEMPNODE   0xffff
 
-int ecx_config_init(ecx_contextt *context, uint8 usetable);
+int ecx_config_init(ecx_contextt *context);
 int ecx_config_map_group(ecx_contextt *context, void *pIOmap, uint8 group);
 int ecx_recover_slave(ecx_contextt *context, uint16 slave, int timeout);
 int ecx_reconfig_slave(ecx_contextt *context, uint16 slave, int timeout);

diff --git a/samples/coetest/coetest.c b/samples/coetest/coetest.c
index 5b9fec209af58d088eb7c2b88454cec47e2c419a..625446a59d9ffeef9741518f7d011d5db5af97eb 100644 (file)
--- a/samples/coetest/coetest.c
+++ b/samples/coetest/coetest.c
@@ -225,7 +225,7 @@ void ethercatstartup(char *ifname)
    if (rv)
    {
       adapterisbound = 1;
-      ecx_config_init(&ctx, FALSE);
+      ecx_config_init(&ctx);
       if (ec_slavecount > 0)
       {
          conf_io_size = ecx_config_map_group(&ctx, &IOmap, 0);

diff --git a/samples/eni_test/eni_test.c b/samples/eni_test/eni_test.c
index 83d1e9ed4a95c0cfade9646fdfc19241dcc18915..56712a946c0de2f6ce49018d429f59cc280ac3f4 100644 (file)
--- a/samples/eni_test/eni_test.c
+++ b/samples/eni_test/eni_test.c
@@ -85,7 +85,7 @@ void eni_test(char *ifname)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          ecx_config_map_group(&ctx, &IOmap, 0);
 

diff --git a/samples/eoe_test/eoe_test.c b/samples/eoe_test/eoe_test.c
index 3f20e65f67b9a2093537a738f7306ef5aaf5957d..2ea986e6ef90a9b39784899252c47bd3879ad39c 100644 (file)
--- a/samples/eoe_test/eoe_test.c
+++ b/samples/eoe_test/eoe_test.c
@@ -214,7 +214,7 @@ void teststarter(char *ifname)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          ecx_config_map_group(&ctx, &IOmap, 0);
 

diff --git a/samples/firm_update/firm_update.c b/samples/firm_update/firm_update.c
index fec2729335d17e2c58a9376cbe69620979d78ecb..234eaa1aa34a285a7119c65d01de195313cf4685 100644 (file)
--- a/samples/firm_update/firm_update.c
+++ b/samples/firm_update/firm_update.c
@@ -99,7 +99,7 @@ void boottest(char *ifname, uint16 slave, char *filename)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          printf("%d slaves found and configured.\n", ec_slavecount);
 

diff --git a/samples/red_test/red_test.c b/samples/red_test/red_test.c
index 6f21b9466c457686134624a1d765bf363885b7a6..cb33fcf705d6c006981cbb8bee539f8d39ce8de7 100644 (file)
--- a/samples/red_test/red_test.c
+++ b/samples/red_test/red_test.c
@@ -89,7 +89,7 @@ void redtest(char *ifname, char *ifname2)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          ecx_config_map_group(&ctx, &IOmap, 0);
 

diff --git a/samples/simple_ng/simple_ng.c b/samples/simple_ng/simple_ng.c
index d345f3aa62d79dfe13cc85054be6eebeec7f2da5..b30724896dd1f5f7a8ace1303718998c8d594c29 100644 (file)
--- a/samples/simple_ng/simple_ng.c
+++ b/samples/simple_ng/simple_ng.c
@@ -117,7 +117,7 @@ fieldbus_start(Fieldbus *fieldbus)
    printf("done\n");
 
    printf("Finding autoconfig slaves... ");
-   if (ecx_config_init(context, FALSE) <= 0)
+   if (ecx_config_init(context) <= 0)
    {
       printf("no slaves found\n");
       return FALSE;

diff --git a/samples/simple_test/simple_test.c b/samples/simple_test/simple_test.c
index a54764f4e695270b00ae6beffa9c3bdea4ca31b2..210d7d622cd2fa8c4d02a67a5785f39832687872 100644 (file)
--- a/samples/simple_test/simple_test.c
+++ b/samples/simple_test/simple_test.c
@@ -82,7 +82,7 @@ void simpletest(char *ifname)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          ecx_config_map_group(&ctx, &IOmap, 0);
 

diff --git a/samples/slaveinfo/slaveinfo.c b/samples/slaveinfo/slaveinfo.c
index 0845a8cb69f92a9ad1f788b2ab6f1d288f77ee49..55701caeadcbeed53705cfd2236f89ece3216de1 100644 (file)
--- a/samples/slaveinfo/slaveinfo.c
+++ b/samples/slaveinfo/slaveinfo.c
@@ -648,7 +648,7 @@ void slaveinfo(char *ifname)
       printf("ecx_init on %s succeeded.\n", ifname);
 
       /* find and auto-config slaves */
-      if (ecx_config_init(&ctx, FALSE) > 0)
+      if (ecx_config_init(&ctx) > 0)
       {
          ecx_config_map_group(&ctx, &IOmap, 0);
 

diff --git a/src/ec_config.c b/src/ec_config.c
index a9573c5a2c6c72125f43c9a5c1b714bfdc894a40..efa67eacbbd2a712d2e77d16efb5515a10ad437f 100644 (file)
--- a/src/ec_config.c
+++ b/src/ec_config.c
@@ -117,13 +117,6 @@ static void ecx_set_slaves_to_default(ecx_contextt *context)
    ecx_BWR(context->port, 0x0000, ECT_REG_EEPCFG, sizeof(b), &b, EC_TIMEOUTRET3); /* set Eeprom to master */
 }
 
-static int ecx_config_from_table(ecx_contextt *context, uint16 slave)
-{
-   (void)context;
-   (void)slave;
-   return 0;
-}
-
 /* If slave has SII and same slave ID done before, use previous data.
  * This is safe because SII is constant for same slave ID.
  */
@@ -174,10 +167,9 @@ static int ecx_lookup_prev_sii(ecx_contextt *context, uint16 slave)
 /** Enumerate and init all slaves.
  *
  * @param[in] context      = context struct
- * @param[in] usetable     = TRUE when using configtable to init slaves, FALSE otherwise
  * @return Workcounter of slave discover datagram = number of slaves found
  */
-int ecx_config_init(ecx_contextt *context, uint8 usetable)
+int ecx_config_init(ecx_contextt *context)
 {
    uint16 slave, ADPh, configadr, ssigen;
    uint16 topology, estat;
@@ -185,10 +177,10 @@ int ecx_config_init(ecx_contextt *context, uint8 usetable)
    uint8 b, h;
    uint8 SMc;
    uint32 eedat;
-   int wkc, cindex, nSM;
+   int wkc, nSM;
    uint16 val16;
 
-   EC_PRINT("ec_config_init %d\n", usetable);
+   EC_PRINT("ec_config_init\n");
    ecx_init_context(context);
    wkc = ecx_detect_slaves(context);
    if (wkc > 0)
@@ -363,14 +355,8 @@ int ecx_config_init(ecx_contextt *context, uint8 usetable)
             eedat = ecx_readeeprom2(context, slave, EC_TIMEOUTEEP);
             context->slavelist[slave].mbx_proto = (uint16)etohl(eedat);
          }
-         cindex = 0;
-         /* use configuration table ? */
-         if (usetable == 1)
-         {
-            cindex = ecx_config_from_table(context, slave);
-         }
-         /* slave not in configuration table, find out via SII */
-         if (!cindex && !ecx_lookup_prev_sii(context, slave))
+         /* find configuration via SII */
+         if (!ecx_lookup_prev_sii(context, slave))
          {
             ssigen = ecx_siifind(context, slave, ECT_SII_GENERAL);
             /* SII general section */