sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #462 from marckleinebudde/lib 

lib: coding style cleanups + fix printing of CAN_ERR_CNT
pull/464/head
Marc Kleine-Budde 2023-09-27 16:30:18 +02:00 committed by GitHub
parent 1be7e0e51d 7d59157d4d
commit 4b5b524256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib.c
View File

@ -110,8 +110,8 @@ unsigned char can_fd_len2dlc(unsigned char len)
return len2dlc[len]; return len2dlc[len];
} }
unsigned char asc2nibble(char c) { unsigned char asc2nibble(char c)
{
if ((c >= '0') && (c <= '9')) if ((c >= '0') && (c <= '9'))
return c - '0'; return c - '0';
@ -124,8 +124,8 @@ unsigned char asc2nibble(char c) {
return 16; /* error */ return 16; /* error */
} }
int hexstring2data(char *arg, unsigned char *data, int maxdlen) { int hexstring2data(char *arg, unsigned char *data, int maxdlen)
{
int len = strlen(arg); int len = strlen(arg);
int i; int i;
unsigned char tmp; unsigned char tmp;
@ -136,7 +136,6 @@ int hexstring2data(char *arg, unsigned char *data, int maxdlen) {
memset(data, 0, maxdlen); memset(data, 0, maxdlen);
for (i = 0; i < len / 2; i++) { for (i = 0; i < len / 2; i++) {
tmp = asc2nibble(*(arg + (2 * i))); tmp = asc2nibble(*(arg + (2 * i)));
if (tmp > 0x0F) if (tmp > 0x0F)
return 1; return 1;
@ -153,7 +152,8 @@ int hexstring2data(char *arg, unsigned char *data, int maxdlen) {
return 0; return 0;
} }
int parse_canframe(char *cs, struct canfd_frame *cf) { int parse_canframe(char *cs, struct canfd_frame *cf)
{
/* documentation see lib.h */ /* documentation see lib.h */
int i, idx, dlen, len; int i, idx, dlen, len;
@ -226,7 +226,6 @@ int parse_canframe(char *cs, struct canfd_frame *cf) {
} }
for (i = 0, dlen = 0; i < maxdlen; i++) { for (i = 0, dlen = 0; i < maxdlen; i++) {
if (cs[idx] == DATA_SEPERATOR) /* skip (optional) separator */ if (cs[idx] == DATA_SEPERATOR) /* skip (optional) separator */
idx++; idx++;
@ -257,7 +256,8 @@ int parse_canframe(char *cs, struct canfd_frame *cf) {
return ret; return ret;
} }
void fprint_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int sep, int maxdlen) { void fprint_canframe(FILE *stream, struct canfd_frame *cf, char *eol, int sep, int maxdlen)
{
/* documentation see lib.h */ /* documentation see lib.h */
char buf[CL_CFSZ]; /* max length */ char buf[CL_CFSZ]; /* max length */
@ -268,7 +268,8 @@ void fprint_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int sep,
fprintf(stream, "%s", eol); fprintf(stream, "%s", eol);
} }
void sprint_canframe(char *buf , struct canfd_frame *cf, int sep, int maxdlen) { void sprint_canframe(char *buf, struct canfd_frame *cf, int sep, int maxdlen)
{
/* documentation see lib.h */ /* documentation see lib.h */
int i, offset; int i, offset;
@ -339,7 +340,8 @@ void sprint_canframe(char *buf , struct canfd_frame *cf, int sep, int maxdlen) {
buf[offset] = 0; buf[offset] = 0;
} }
void fprint_long_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int view, int maxdlen) { void fprint_long_canframe(FILE *stream, struct canfd_frame *cf, char *eol, int view, int maxdlen)
{
/* documentation see lib.h */ /* documentation see lib.h */
char buf[CL_LONGCFSZ]; char buf[CL_LONGCFSZ];
@ -354,7 +356,8 @@ void fprint_long_canframe(FILE *stream , struct canfd_frame *cf, char *eol, int
fprintf(stream, "%s", eol); fprintf(stream, "%s", eol);
} }
void sprint_long_canframe(char *buf , struct canfd_frame *cf, int view, int maxdlen) { void sprint_long_canframe(char *buf, struct canfd_frame *cf, int view, int maxdlen)
{
/* documentation see lib.h */ /* documentation see lib.h */
int i, j, dlen, offset; int i, j, dlen, offset;
@ -496,6 +499,7 @@ static const char *error_classes[] = {
"bus-off", "bus-off",
"bus-error", "bus-error",
"restarted-after-bus-off", "restarted-after-bus-off",
"error-counter-tx-rx",
}; };
static const char *controller_problems[] = { static const char *controller_problems[] = {
@ -633,6 +637,19 @@ static int snprintf_error_prot(char *buf, size_t len, const struct canfd_frame *
return n; return n;
} }
static int snprintf_error_cnt(char *buf, size_t len, const struct canfd_frame *cf)
{
int n = 0;
if (len <= 0)
return 0;
n += snprintf(buf + n, len - n, "{{%d}{%d}}",
cf->data[6], cf->data[7]);
return n;
}
void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf, void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf,
const char* sep) const char* sep)
{ {
@ -676,13 +693,14 @@ void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *c
n += snprintf_error_ctrl(buf + n, len - n, cf); n += snprintf_error_ctrl(buf + n, len - n, cf);
if (mask == CAN_ERR_PROT) if (mask == CAN_ERR_PROT)
n += snprintf_error_prot(buf + n, len - n, cf); n += snprintf_error_prot(buf + n, len - n, cf);
if (mask == CAN_ERR_CNT)
n += snprintf_error_cnt(buf + n, len - n, cf);
classes++; classes++;
} }
} }
if (cf->can_id & CAN_ERR_CNT || cf->data[6] || cf->data[7]) { if (!(cf->can_id & CAN_ERR_CNT) && (cf->data[6] || cf->data[7])) {
n += snprintf(buf + n, len - n, "%s", sep); n += snprintf(buf + n, len - n, "%serror-counter-tx-rx", sep);
n += snprintf(buf + n, len - n, "error-counter-tx-rx{{%d}{%d}}", n += snprintf_error_cnt(buf + n, len - n, cf);
cf->data[6], cf->data[7]);
} }
} }