-/*
- * $Id$
- */
-
/*
* lib.c - library for command line tools
*
#define CANID_DELIM '#'
#define DATA_SEPERATOR '.'
-#define MAX_CANFRAME "12345678#01.23.45.67.89.AB.CD.EF"
-#define MAX_LONG_CANFRAME_SIZE 256
+const char hex_asc_upper[] = "0123456789ABCDEF";
+
+#define hex_asc_upper_lo(x) hex_asc_upper[((x) & 0x0F)]
+#define hex_asc_upper_hi(x) hex_asc_upper[((x) & 0xF0) >> 4]
+
+static inline void put_hex_byte(char *buf, __u8 byte)
+{
+ buf[0] = hex_asc_upper_hi(byte);
+ buf[1] = hex_asc_upper_lo(byte);
+}
+
+static inline void _put_id(char *buf, int end_offset, canid_t id)
+{
+ /* build 3 (SFF) or 8 (EFF) digit CAN identifier */
+ while (end_offset >= 0) {
+ buf[end_offset--] = hex_asc_upper[id & 0xF];
+ id >>= 4;
+ }
+}
+
+#define put_sff_id(buf, id) _put_id(buf, 2, id)
+#define put_eff_id(buf, id) _put_id(buf, 7, id)
+
+/* CAN DLC to real data length conversion helpers */
+
+static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 12, 16, 20, 24, 32, 48, 64};
+
+/* get data length from can_dlc with sanitized can_dlc */
+unsigned char can_dlc2len(unsigned char can_dlc)
+{
+ return dlc2len[can_dlc & 0x0F];
+}
+
+static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */
+ 9, 9, 9, 9, /* 9 - 12 */
+ 10, 10, 10, 10, /* 13 - 16 */
+ 11, 11, 11, 11, /* 17 - 20 */
+ 12, 12, 12, 12, /* 21 - 24 */
+ 13, 13, 13, 13, 13, 13, 13, 13, /* 25 - 32 */
+ 14, 14, 14, 14, 14, 14, 14, 14, /* 33 - 40 */
+ 14, 14, 14, 14, 14, 14, 14, 14, /* 41 - 48 */
+ 15, 15, 15, 15, 15, 15, 15, 15, /* 49 - 56 */
+ 15, 15, 15, 15, 15, 15, 15, 15}; /* 57 - 64 */
+
+/* map the sanitized data length to an appropriate data length code */
+unsigned char can_len2dlc(unsigned char len)
+{
+ if (len > 64)
+ return 0xF;
+
+ return len2dlc[len];
+}
unsigned char asc2nibble(char c) {
return 16; /* error */
}
-int hexstring2candata(char *arg, struct can_frame *cf) {
+int hexstring2data(char *arg, unsigned char *data, int maxdlen) {
int len = strlen(arg);
int i;
unsigned char tmp;
- if (!len || len%2 || len > 16)
+ if (!len || len%2 || len > maxdlen*2)
return 1;
+ memset(data, 0, maxdlen);
+
for (i=0; i < len/2; i++) {
tmp = asc2nibble(*(arg+(2*i)));
if (tmp > 0x0F)
return 1;
- cf->data[i] = (tmp << 4);
+ data[i] = (tmp << 4);
tmp = asc2nibble(*(arg+(2*i)+1));
if (tmp > 0x0F)
return 1;
- cf->data[i] |= tmp;
+ data[i] |= tmp;
}
return 0;
}
-int parse_canframe(char *cs, struct can_frame *cf) {
+int parse_canframe(char *cs, struct canfd_frame *cf) {
/* documentation see lib.h */
- int i, idx, dlc, len;
+ int i, idx, dlen, len;
+ int maxdlen = CAN_MAX_DLEN;
+ int ret = CAN_MTU;
unsigned char tmp;
len = strlen(cs);
//printf("'%s' len %d\n", cs, len);
- memset(cf, 0, sizeof(*cf)); /* init CAN frame, e.g. DLC = 0 */
+ memset(cf, 0, sizeof(*cf)); /* init CAN FD frame, e.g. LEN = 0 */
if (len < 4)
- return 1;
+ return 0;
if (cs[3] == CANID_DELIM) { /* 3 digits */
idx = 4;
for (i=0; i<3; i++){
if ((tmp = asc2nibble(cs[i])) > 0x0F)
- return 1;
+ return 0;
cf->can_id |= (tmp << (2-i)*4);
}
idx = 9;
for (i=0; i<8; i++){
if ((tmp = asc2nibble(cs[i])) > 0x0F)
- return 1;
+ return 0;
cf->can_id |= (tmp << (7-i)*4);
}
if (!(cf->can_id & CAN_ERR_FLAG)) /* 8 digits but no errorframe? */
cf->can_id |= CAN_EFF_FLAG; /* then it is an extended frame */
} else
- return 1;
+ return 0;
if((cs[idx] == 'R') || (cs[idx] == 'r')){ /* RTR frame */
cf->can_id |= CAN_RTR_FLAG;
- return 0;
+
+ /* check for optional DLC value for CAN 2.0B frames */
+ if(cs[++idx] && (tmp = asc2nibble(cs[idx])) <= CAN_MAX_DLC)
+ cf->len = tmp;
+
+ return ret;
}
- for (i=0, dlc=0; i<8; i++){
+ if (cs[idx] == CANID_DELIM) { /* CAN FD frame escape char '##' */
- if(cs[idx] == DATA_SEPERATOR) /* skip (optional) seperator */
+ maxdlen = CANFD_MAX_DLEN;
+ ret = CANFD_MTU;
+
+ /* CAN FD frame <canid>##<flags><data>* */
+ if ((tmp = asc2nibble(cs[idx+1])) > 0x0F)
+ return 0;
+
+ cf->flags = tmp;
+ idx += 2;
+ }
+
+ for (i=0, dlen=0; i < maxdlen; i++){
+
+ if(cs[idx] == DATA_SEPERATOR) /* skip (optional) separator */
idx++;
if(idx >= len) /* end of string => end of data */
break;
if ((tmp = asc2nibble(cs[idx++])) > 0x0F)
- return 1;
+ return 0;
cf->data[i] = (tmp << 4);
if ((tmp = asc2nibble(cs[idx++])) > 0x0F)
- return 1;
+ return 0;
cf->data[i] |= tmp;
- dlc++;
+ dlen++;
}
+ cf->len = dlen;
- cf->can_dlc = dlc;
-
- return 0;
+ return ret;
}
-void fprint_canframe(FILE *stream , struct can_frame *cf, char *eol, int sep) {
+void fprint_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int sep, int maxdlen) {
/* documentation see lib.h */
- char buf[sizeof(MAX_CANFRAME)+1]; /* max length */
+ char buf[CL_CFSZ]; /* max length */
- sprint_canframe(buf, cf, sep);
+ sprint_canframe(buf, cf, sep, maxdlen);
fprintf(stream, "%s", buf);
if (eol)
fprintf(stream, "%s", eol);
}
-void sprint_canframe(char *buf , struct can_frame *cf, int sep) {
+void sprint_canframe(char *buf , struct canfd_frame *cf, int sep, int maxdlen) {
/* documentation see lib.h */
int i,offset;
- int dlc = (cf->can_dlc > 8)? 8 : cf->can_dlc;
+ int len = (cf->len > maxdlen) ? maxdlen : cf->len;
if (cf->can_id & CAN_ERR_FLAG) {
- sprintf(buf, "%08X#", cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
+ put_eff_id(buf, cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
+ buf[8] = '#';
offset = 9;
} else if (cf->can_id & CAN_EFF_FLAG) {
- sprintf(buf, "%08X#", cf->can_id & CAN_EFF_MASK);
+ put_eff_id(buf, cf->can_id & CAN_EFF_MASK);
+ buf[8] = '#';
offset = 9;
} else {
- sprintf(buf, "%03X#", cf->can_id & CAN_SFF_MASK);
+ put_sff_id(buf, cf->can_id & CAN_SFF_MASK);
+ buf[3] = '#';
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++, ".");
- }
+ /* standard CAN frames may have RTR enabled. There are no ERR frames with RTR */
+ if (maxdlen == CAN_MAX_DLEN && cf->can_id & CAN_RTR_FLAG) {
+ buf[offset++] = 'R';
+ /* print a given CAN 2.0B DLC if it's not zero */
+ if (cf->len && cf->len <= CAN_MAX_DLC)
+ buf[offset++] = hex_asc_upper[cf->len & 0xF];
+
+ buf[offset] = 0;
+ return;
+ }
+
+ if (maxdlen == CANFD_MAX_DLEN) {
+ /* add CAN FD specific escape char and flags */
+ buf[offset++] = '#';
+ buf[offset++] = hex_asc_upper[cf->flags & 0xF];
+ if (sep && len)
+ buf[offset++] = '.';
+ }
+ for (i = 0; i < len; i++) {
+ put_hex_byte(buf + offset, cf->data[i]);
+ offset += 2;
+ if (sep && (i+1 < len))
+ buf[offset++] = '.';
+ }
+ buf[offset] = 0;
}
-void fprint_long_canframe(FILE *stream , struct can_frame *cf, char *eol, int view) {
+void fprint_long_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int view, int maxdlen) {
/* documentation see lib.h */
- char buf[MAX_LONG_CANFRAME_SIZE];
+ char buf[CL_LONGCFSZ];
- sprint_long_canframe(buf, cf, view);
+ sprint_long_canframe(buf, cf, view, maxdlen);
fprintf(stream, "%s", buf);
if ((view & CANLIB_VIEW_ERROR) && (cf->can_id & CAN_ERR_FLAG)) {
snprintf_can_error_frame(buf, sizeof(buf), cf, "\n\t");
fprintf(stream, "%s", eol);
}
-void sprint_long_canframe(char *buf , struct can_frame *cf, int view) {
+void sprint_long_canframe(char *buf , struct canfd_frame *cf, int view, int maxdlen) {
/* documentation see lib.h */
int i, j, dlen, offset;
- int dlc = (cf->can_dlc > 8)? 8 : cf->can_dlc;
+ int len = (cf->len > maxdlen)? maxdlen : cf->len;
+
+ /* initialize space for CAN-ID and length information */
+ memset(buf, ' ', 15);
if (cf->can_id & CAN_ERR_FLAG) {
- sprintf(buf, "%8X ", cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
+ put_eff_id(buf, cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
offset = 10;
} else if (cf->can_id & CAN_EFF_FLAG) {
- sprintf(buf, "%8X ", cf->can_id & CAN_EFF_MASK);
+ put_eff_id(buf, cf->can_id & CAN_EFF_MASK);
offset = 10;
} else {
- sprintf(buf, "%3X ", cf->can_id & CAN_SFF_MASK);
- offset = 5;
+ if (view & CANLIB_VIEW_INDENT_SFF) {
+ put_sff_id(buf + 5, cf->can_id & CAN_SFF_MASK);
+ offset = 10;
+ } else {
+ put_sff_id(buf, cf->can_id & CAN_SFF_MASK);
+ offset = 5;
+ }
}
- sprintf(buf+offset, "[%d]", dlc);
- offset += 3;
+ /* The len value is sanitized by maxdlen (see above) */
+ if (maxdlen == CAN_MAX_DLEN) {
+ buf[offset + 1] = '[';
+ buf[offset + 2] = len + '0';
+ buf[offset + 3] = ']';
- if (cf->can_id & CAN_RTR_FLAG) { /* there are no ERR frames with RTR */
- sprintf(buf+offset, " remote request");
- return;
+ /* standard CAN frames may have RTR enabled */
+ if (cf->can_id & CAN_RTR_FLAG) {
+ sprintf(buf+offset+5, " remote request");
+ return;
+ }
+ } else {
+ buf[offset] = '[';
+ buf[offset + 1] = (len/10) + '0';
+ buf[offset + 2] = (len%10) + '0';
+ buf[offset + 3] = ']';
}
+ offset += 5;
if (view & CANLIB_VIEW_BINARY) {
dlen = 9; /* _10101010 */
if (view & CANLIB_VIEW_SWAP) {
- for (i = dlc - 1; i >= 0; i--) {
- buf[offset++] = (i == dlc-1)?' ':SWAP_DELIMITER;
+ for (i = len - 1; i >= 0; i--) {
+ buf[offset++] = (i == len-1)?' ':SWAP_DELIMITER;
for (j = 7; j >= 0; j--)
buf[offset++] = (1<<j & cf->data[i])?'1':'0';
}
} else {
- for (i = 0; i < dlc; i++) {
+ for (i = 0; i < len; i++) {
buf[offset++] = ' ';
for (j = 7; j >= 0; j--)
buf[offset++] = (1<<j & cf->data[i])?'1':'0';
}
}
- buf[offset] = 0; /* terminate string */
} else {
dlen = 3; /* _AA */
if (view & CANLIB_VIEW_SWAP) {
- for (i = dlc - 1; i >= 0; i--) {
- sprintf(buf+offset, "%c%02X",
- (i == dlc-1)?' ':SWAP_DELIMITER,
- cf->data[i]);
- offset += dlen;
+ for (i = len - 1; i >= 0; i--) {
+ if (i == len-1)
+ buf[offset++] = ' ';
+ else
+ buf[offset++] = SWAP_DELIMITER;
+
+ put_hex_byte(buf + offset, cf->data[i]);
+ offset += 2;
}
} else {
- for (i = 0; i < dlc; i++) {
- sprintf(buf+offset, " %02X", cf->data[i]);
- offset += dlen;
+ for (i = 0; i < len; i++) {
+ buf[offset++] = ' ';
+ put_hex_byte(buf + offset, cf->data[i]);
+ offset += 2;
}
}
}
+ buf[offset] = 0; /* terminate string */
+
+ /*
+ * The ASCII & ERRORFRAME output is put at a fixed len behind the data.
+ * For now we support ASCII output only for payload length up to 8 bytes.
+ * Does it make sense to write 64 ASCII byte behind 64 ASCII HEX data on the console?
+ */
+ if (len > CAN_MAX_DLEN)
+ return;
+
if (cf->can_id & CAN_ERR_FLAG)
- sprintf(buf+offset, "%*s", dlen*(8-dlc)+13, "ERRORFRAME");
+ sprintf(buf+offset, "%*s", dlen*(8-len)+13, "ERRORFRAME");
else if (view & CANLIB_VIEW_ASCII) {
- j = dlen*(8-dlc)+4;
+ j = dlen*(8-len)+4;
if (view & CANLIB_VIEW_SWAP) {
sprintf(buf+offset, "%*s", j, "`");
offset += j;
- for (i = dlc - 1; i >= 0; i--)
+ for (i = len - 1; i >= 0; i--)
if ((cf->data[i] > 0x1F) && (cf->data[i] < 0x7F))
buf[offset++] = cf->data[i];
else
} else {
sprintf(buf+offset, "%*s", j, "'");
offset += j;
- for (i = 0; i < dlc; i++)
+ for (i = 0; i < len; i++)
if ((cf->data[i] > 0x1F) && (cf->data[i] < 0x7F))
buf[offset++] = cf->data[i];
else
"tx-error-warning",
"rx-error-passive",
"tx-error-passive",
+ "back-to-error-active",
};
static const char *protocol_violation_types[] = {
"tx-dominant-bit-error",
"tx-recessive-bit-error",
"bus-overload",
- "back-to-error-active",
+ "active-error",
"error-on-tx",
};
return n;
}
-static int snprintf_error_lostarb(char *buf, size_t len, struct can_frame *cf)
+static int snprintf_error_lostarb(char *buf, size_t len, const struct canfd_frame *cf)
{
if (len <= 0)
return 0;
return snprintf(buf, len, "{at bit %d}", cf->data[0]);
}
-static int snprintf_error_ctrl(char *buf, size_t len, struct can_frame *cf)
+static int snprintf_error_ctrl(char *buf, size_t len, const struct canfd_frame *cf)
{
int n = 0;
return n;
}
-static int snprintf_error_prot(char *buf, size_t len, struct can_frame *cf)
+static int snprintf_error_prot(char *buf, size_t len, const struct canfd_frame *cf)
{
int n = 0;
return n;
}
-void snprintf_can_error_frame(char *buf, size_t len, struct can_frame *cf,
- char* sep)
+void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf,
+ const char* sep)
{
canid_t class, mask;
int i, n = 0, classes = 0;
projects / can-utils.git / blobdiff