# HG changeset patch # User Christian Taedcke # Date 1296222678 -3600 # Node ID c0e68a63f600f6883abe90f7b6aaadd46b9022de # Parent f923456f01e59b37d8a4ce81aaae46245ce529f7 FIX: - if a sdo transfer timeout occurres, reset the sdo line even if the callback function does not. diff -r f923456f01e5 -r c0e68a63f600 src/sdo.c --- a/src/sdo.c Thu Jan 27 17:45:48 2011 +0100 +++ b/src/sdo.c Fri Jan 28 14:51:18 2011 +0100 @@ -143,12 +143,10 @@ if(d->transfers[id].Callback) /*If ther is a callback, it is responsible to close SDO transfer (client)*/ (*d->transfers[id].Callback)(d,d->transfers[id].nodeId); - else if(d->transfers[id].whoami == SDO_SERVER) - /*Else, if server, reset the line*/ /*Reset the line if (whoami == SDO_SERVER) or the callback did not close the line. Otherwise this sdo transfer would never be closed. */ - resetSDOline(d, (UNS8)id); + resetSDOline(d, (UNS8)id); } #define StopSDO_TIMER(id) \