diff -r d6145fc87a74 -r f3352378b4d4 master/canopen.c --- a/master/canopen.c Mon Jun 26 15:33:18 2006 +0000 +++ b/master/canopen.c Mon Jun 26 16:05:30 2006 +0000 @@ -54,10 +54,6 @@ /*****************************************************************************/ -const ec_code_msg_t sdo_abort_messages[]; - -/*****************************************************************************/ - /** Reads 32 bit of a CANopen SDO in expedited mode. \return 0 in case of success, else < 0 @@ -529,25 +525,11 @@ /*****************************************************************************/ /** - Outputs an SDO abort message. -*/ - -void ec_canopen_abort_msg(uint32_t abort_code) -{ - const ec_code_msg_t *abort_msg; - - for (abort_msg = sdo_abort_messages; abort_msg->code; abort_msg++) { - if (abort_msg->code == abort_code) { - EC_ERR("SDO abort message 0x%08X: \"%s\".\n", - abort_msg->code, abort_msg->message); - return; - } - } - - EC_ERR("Unknown SDO abort code 0x%08X.\n", abort_code); -} - -/*****************************************************************************/ + SDO abort messages. + The "abort SDO transfer request" supplies an abort code, + which can be translated to clear text. This table does + the mapping of the codes and messages. +*/ const ec_code_msg_t sdo_abort_messages[] = { {0x05030000, "Toggle bit not changed"}, @@ -586,6 +568,27 @@ {} }; +/*****************************************************************************/ + +/** + Outputs an SDO abort message. +*/ + +void ec_canopen_abort_msg(uint32_t abort_code) +{ + const ec_code_msg_t *abort_msg; + + for (abort_msg = sdo_abort_messages; abort_msg->code; abort_msg++) { + if (abort_msg->code == abort_code) { + EC_ERR("SDO abort message 0x%08X: \"%s\".\n", + abort_msg->code, abort_msg->message); + return; + } + } + + EC_ERR("Unknown SDO abort code 0x%08X.\n", abort_code); +} + /****************************************************************************** * Realtime interface *****************************************************************************/