-int can_frame_sprintf(char *buf, struct can_frame *frame)
-{
- char datastr[17];
- int i;
- for (i=0; i<8; i++)
- sprintf(&datastr[i*2], "%02x", frame->data[i]);
- sprintf(buf, "id=0x%x, len=%d, data=%s",
- frame->can_id, frame->can_dlc, datastr);
+void sprint_canframe(char *buf , struct can_frame *cf, int sep) {
+ /* documentation see lib.h */
+
+ int i,offset;
+ int dlc = (cf->can_dlc > 8)? 8 : cf->can_dlc;
+
+ if (cf->can_id & CAN_ERR_FLAG) {
+ sprintf(buf, "%08X#", cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
+ offset = 9;
+ } else if (cf->can_id & CAN_EFF_FLAG) {
+ sprintf(buf, "%08X#", cf->can_id & CAN_EFF_MASK);
+ offset = 9;
+ } else {
+ sprintf(buf, "%03X#", cf->can_id & CAN_SFF_MASK);
+ offset = 4;
+ }
+
+ if (cf->can_id & CAN_RTR_FLAG) /* there are no ERR frames with RTR */
+ sprintf(buf+offset, "R");
+ else
+ for (i = 0; i < dlc; i++) {
+ sprintf(buf+offset, "%02X", cf->data[i]);
+ offset += 2;
+ if (sep && (i+1 < dlc))
+ sprintf(buf+offset++, ".");
+ }