diff -r ad3de8730172 -r fe50ada8020b include/data.h --- a/include/data.h Thu Apr 05 10:06:11 2007 +0200 +++ b/include/data.h Fri Apr 06 16:49:28 2007 +0200 @@ -88,7 +88,7 @@ /* General */ UNS8 toggle; - canSend_t canSend; + CAN_HANDLE canHandle; scanIndexOD_t scanIndexOD; }; @@ -127,7 +127,7 @@ {\ REPEAT_SDO_MAX_SIMULTANEOUS_TRANSFERTS_TIMES(s_transfer_Initializer)\ },\ - &NODE_PREFIX ## _SDOtimeoutError, /* SDOtimeoutError */\ + _SDOtimeoutError,/*&NODE_PREFIX ## _SDOtimeoutError, /* SDOtimeoutError */\ \ /* State machine*/\ Unknown_state, /* nodeState */\ @@ -140,10 +140,10 @@ 0, /* csHeartbeat */\ 0 /* csPDO */\ },\ - &NODE_PREFIX ## _initialisation, /* initialisation */\ - &NODE_PREFIX ## _preOperational, /* preOperational */\ - &NODE_PREFIX ## _operational, /* operational */\ - &NODE_PREFIX ## _stopped, /* stopped */\ + _initialisation,/*&NODE_PREFIX ## _initialisation, /* initialisation */\ + _preOperational,/*&NODE_PREFIX ## _preOperational, /* preOperational */\ + _operational,/*&NODE_PREFIX ## _operational, /* operational */\ + _stopped,/*&NODE_PREFIX ## _stopped, /* stopped */\ \ /* NMT-heartbeat */\ & NODE_PREFIX ## _highestSubIndex_obj1016, /* ConsumerHeartbeatCount */\ @@ -151,7 +151,7 @@ NODE_PREFIX ## _heartBeatTimers, /* ConsumerHeartBeatTimers */\ & NODE_PREFIX ## _obj1017, /* ProducerHeartBeatTime */\ TIMER_NONE, /* ProducerHeartBeatTimer */\ - NODE_PREFIX ## _heartbeatError, /* heartbeatError */\ + _heartbeatError,/*NODE_PREFIX ## _heartbeatError, /* heartbeatError */\ \ {REPEAT_NMT_MAX_NODE_ID_TIMES(NMTable_Initializer)},\ /* is well initialized at "Unknown_state". Is it ok ? (FD)*/\ @@ -161,8 +161,8 @@ & NODE_PREFIX ## _obj1005, /* COB_ID_Sync */\ & NODE_PREFIX ## _obj1006, /* Sync_Cycle_Period */\ /*& NODE_PREFIX ## _obj1007, */ /* Sync_window_length */\ - NODE_PREFIX ## _post_sync, /* post_sync */\ - NODE_PREFIX ## _post_TPDO, /* post_TPDO */\ + _post_sync,/*NODE_PREFIX ## _post_sync, /* post_sync */\ + _post_TPDO,/*NODE_PREFIX ## _post_TPDO, /* post_TPDO */\ \ /* PDO, structure s_process_var */\ {\ @@ -172,7 +172,7 @@ \ /* General */\ 0, /* toggle */\ - NODE_PREFIX ## _canSend, /* canSend */\ + NULL,/*NODE_PREFIX ## _canSend, /* canSend */\ NODE_PREFIX ## _scanIndexOD /* scanIndexOD */\ }