]> rtime.felk.cvut.cz Git - CanFestival-3.git/commitdiff
Fixed (again) return of abortcode value in SDO's getReadResultNetworkDict
authoretisserant <etisserant>
Fri, 25 Jul 2008 07:34:08 +0000 (07:34 +0000)
committeretisserant <etisserant>
Fri, 25 Jul 2008 07:34:08 +0000 (07:34 +0000)
src/sdo.c

index 531adb81f9928539736d1520489fa83d2865ba86..b75c857c6c330d05c8bdbbc6c41ed177122aaa3d 100644 (file)
--- a/src/sdo.c
+++ b/src/sdo.c
@@ -1547,6 +1547,7 @@ UNS8 getReadResultNetworkDict (CO_Data* d, UNS8 nodeId, void* data, UNS8 *size,
     MSG_ERR(0x1AF0, "SDO error : No line found for communication with node : ", nodeId); 
     return SDO_ABORTED_INTERNAL;
   }
+  * abortCode = d->transfers[line].abortCode;
   if (d->transfers[line].state != SDO_FINISHED)
     return d->transfers[line].state;
 
@@ -1564,7 +1565,6 @@ UNS8 getReadResultNetworkDict (CO_Data* d, UNS8 nodeId, void* data, UNS8 *size,
     ( (char *) data)[i] = d->transfers[line].data[i];
 # endif
   } 
-  * abortCode = d->transfers[line].abortCode;
   return SDO_FINISHED;
 }