FastScan review

[CanFestival-3.git] / include / data.h

diff --git a/include/data.h b/include/data.h
index ae5df6fdf8c347e245511f7af73561333e3f72a8..0cd0a43845b4a40ff73cfca67ba97dfce2ebf040 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -55,9 +55,9 @@ struct struct_CO_Data {
        UNS8 *bDeviceNodeId;
        const indextable *objdict;
        s_PDO_status *PDO_status;
-       quick_index *firstIndex;
-       quick_index *lastIndex;
-       UNS16 *ObjdictSize;
+       const quick_index *firstIndex;
+       const quick_index *lastIndex;
+       const UNS16 *ObjdictSize;
        const UNS8 *iam_a_slave;
        valueRangeTest_t valueRangeTest;
        
@@ -72,7 +72,9 @@ struct struct_CO_Data {
        preOperational_t preOperational;
        operational_t operational;
        stopped_t stopped;
-
+     void (*NMT_Slave_Node_Reset_Callback)(CO_Data*);
+     void (*NMT_Slave_Communications_Reset_Callback)(CO_Data*);
+     
        /* NMT-heartbeat */
        UNS8 *ConsumerHeartbeatCount;
        UNS32 *ConsumerHeartbeatEntries;
@@ -93,7 +95,7 @@ struct struct_CO_Data {
        
        /* General */
        UNS8 toggle;
-       CAN_HANDLE canHandle;   
+       CAN_PORT canHandle;     
        scanIndexOD_t scanIndexOD;
        storeODSubIndex_t storeODSubIndex; 
        
@@ -155,7 +157,8 @@ struct struct_CO_Data {
                0,                                              /* LSSNext */\
                0,                                              /* LSSPos */\
                LSS_FS_RESET,                   /* FastScan_SM */\
-               -1                                              /* timerFS */
+               -1,                                             /* timerFS */\
+               {{0,0,0,0},{0,0,0,0}}   /* lss_fs_transfer */
 #else
 #define lss_fs_Initializer
 #endif         
@@ -219,6 +222,8 @@ struct struct_CO_Data {
        _preOperational,     /* preOperational */\
        _operational,        /* operational */\
        _stopped,            /* stopped */\
+       NULL,                /* NMT node reset callback */\
+       NULL,                /* NMT communications reset callback */\
        \
        /* NMT-heartbeat */\
        & NODE_PREFIX ## _highestSubIndex_obj1016, /* ConsumerHeartbeatCount */\