LSS patch from Edward. Now, SetNodeId is not called from nmtslave anymore in case...

diff --git a/src/lss.c b/src/lss.c
index b47daeb6f7eee64af9412f3f85f87eb2c7cfb881..1dee612fa208e86d185c753450d9055f77fe6bbc 100644 (file)
--- a/src/lss.c
+++ b/src/lss.c
@@ -36,13 +36,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
 */
 
-#ifdef CO_ENABLE_LSS
 
 #include "data.h"
 #include "lss.h"
 #include "canfestival.h"
 #include "sysdep.h"
 
+#ifdef CO_ENABLE_LSS
+
 //#define LSS_TIMEOUT_MS       (TIMEVAL)1000  /* ms */
 //#define LSS_FS_TIMEOUT_MS    (TIMEVAL)100  /* ms */
 
@@ -645,7 +646,6 @@ UNS8 proceedLSS_Slave(CO_Data* d, Message* m )
                                        setState(d, Initialisation);
                                }
                                else{/* The nodeID will be changed on NMT_Reset Request*/
-                                       setNodeId(d, d->lss_transfer.nodeID);
                                }
                        }
                        d->lss_transfer.mode=LSS_WAITING_MODE;

diff --git a/src/nmtSlave.c b/src/nmtSlave.c
index e9bce15609f1a3bf66cacc0a1b7d63b7b8da7b3c..ac79788a76e1668a8166cf7b43018d2583616880 100644 (file)
--- a/src/nmtSlave.c
+++ b/src/nmtSlave.c
@@ -75,10 +75,6 @@ void proceedNMTstateChange(CO_Data* d, Message *m)
       case NMT_Reset_Node:
          if(d->NMT_Slave_Node_Reset_Callback != NULL)
             d->NMT_Slave_Node_Reset_Callback(d);
-#ifdef CO_ENABLE_LSS
-               if(getNodeId(d)!=d->lss_transfer.nodeID)
-                       setNodeId(d, d->lss_transfer.nodeID);
-#endif
         setState(d,Initialisation);
         break;