diff -r 17edd8a028fa -r 9b76e0881beb src/sdo.c --- a/src/sdo.c Tue Jan 22 10:27:13 2008 +0100 +++ b/src/sdo.c Wed Jan 23 10:35:52 2008 +0100 @@ -554,7 +554,7 @@ pwCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject; } /* message copy for sending */ - m.cob_id.w = *pwCobId; + m.cob_id = *pwCobId; m.rtr = NOT_A_REQUEST; /* the length of SDO must be 8 */ m.len = 8; @@ -636,7 +636,7 @@ return 0xFF; } pCobId = (UNS32*) d->objdict[offset].pSubindex[1].pObject; - if ( *pCobId == (*m).cob_id.w ) { + if ( *pCobId == (*m).cob_id ) { whoami = SDO_SERVER; MSG_WAR(0x3A62, "proceedSDO. I am server. index : ", 0x1200 + j); /* In case of server, the node id of the client may be unknown. So we put the index minus offset */ @@ -659,7 +659,7 @@ } /* a) Looking for the cobid received. */ pCobId = (UNS32*) d->objdict[offset].pSubindex[2].pObject; - if (*pCobId == (*m).cob_id.w ) { + if (*pCobId == (*m).cob_id ) { /* b) cobid found, so reading the node id of the server. */ pNodeId = (UNS8*) d->objdict[offset].pSubindex[3].pObject; whoami = SDO_CLIENT; @@ -678,7 +678,7 @@ /* Test if the size of the SDO is ok */ if ( (*m).len != 8) { - MSG_ERR(0x1A67, "Error size SDO. CobId : ", (*m).cob_id.w); + MSG_ERR(0x1A67, "Error size SDO. CobId : ", (*m).cob_id); failedSDO(d, nodeId, whoami, 0, 0, SDOABT_GENERAL_ERROR); return 0xFF; } @@ -687,7 +687,7 @@ MSG_WAR(0x3A68, "I am CLIENT. Received SDO from nodeId : ", nodeId); } else { - MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", (*m).cob_id.w); + MSG_WAR(0x3A69, "I am SERVER. Received SDO cobId : ", (*m).cob_id); } /* Testing the command specifier */