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

can: rename CAN FD related can_len2dlc and can_dlc2len helpers 

The helper functions can_len2dlc and can_dlc2len are only relevant for
CAN FD data length code (DLC) conversion.

Update to latest in-kernel naming scheme:

can_dlc2len -> can_fd_dlc2len to get the payload length from the DLC
can_len2dlc -> can_fd_len2dlc to get the DLC from the payload length

Suggested-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/260/head
Oliver Hartkopp 2020-11-09 19:30:22 +01:00
parent f567b75c6c
commit 76285153b9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asc2log.c
View File

@ -270,7 +270,7 @@ void eval_canfd(char* buf, struct timeval *date_tvp, char timestamps, int dplace
extra_info = " T\n"; extra_info = " T\n";
/* don't trust ASCII content - sanitize data length */ /* don't trust ASCII content - sanitize data length */
if (dlen != can_dlc2len(can_len2dlc(dlen))) if (dlen != can_fd_dlc2len(can_fd_len2dlc(dlen)))
return; return;
get_can_id(&cf, tmp1, 16); get_can_id(&cf, tmp1, 16);

6
cangen.c
View File

@ -367,7 +367,7 @@ int main(int argc, char **argv)
} }
/* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */ /* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */
frame.len = can_dlc2len(can_len2dlc(frame.len)); frame.len = can_fd_dlc2len(can_fd_len2dlc(frame.len));
} else { } else {
/* sanitize Classical CAN 2.0 frame length */ /* sanitize Classical CAN 2.0 frame length */
if (len8_dlc) { if (len8_dlc) {
@ -425,7 +425,7 @@ int main(int argc, char **argv)
if (dlc_mode == MODE_RANDOM) { if (dlc_mode == MODE_RANDOM) {
if (canfd) if (canfd)
frame.len = can_dlc2len(random() & 0xF); frame.len = can_fd_dlc2len(random() & 0xF);
else { else {
frame.len = random() & 0xF; frame.len = random() & 0xF;
@ -519,7 +519,7 @@ resend:
incdlc %= CAN_MAX_RAW_DLC + 1; incdlc %= CAN_MAX_RAW_DLC + 1;
if (canfd && !mix) if (canfd && !mix)
frame.len = can_dlc2len(incdlc); frame.len = can_fd_dlc2len(incdlc);
else if (len8_dlc) { else if (len8_dlc) {
if (incdlc > CAN_MAX_DLEN) { if (incdlc > CAN_MAX_DLEN) {
frame.len = CAN_MAX_DLEN; frame.len = CAN_MAX_DLEN;

2
cansend.c
View File

@ -147,7 +147,7 @@ int main(int argc, char **argv)
} }
/* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */ /* ensure discrete CAN FD length values 0..8, 12, 16, 20, 24, 32, 64 */
frame.len = can_dlc2len(can_len2dlc(frame.len)); frame.len = can_fd_dlc2len(can_fd_len2dlc(frame.len));
} }
/* disable default receive filter on this RAW socket */ /* disable default receive filter on this RAW socket */

8
lib.c
View File

@ -84,10 +84,10 @@ static inline void _put_id(char *buf, int end_offset, canid_t id)
static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7, static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
8, 12, 16, 20, 24, 32, 48, 64}; 8, 12, 16, 20, 24, 32, 48, 64};
/* get data length from can_dlc with sanitized can_dlc */ /* get data length from raw data length code (DLC) */
unsigned char can_dlc2len(unsigned char can_dlc) unsigned char can_fd_dlc2len(unsigned char dlc)
{ {
return dlc2len[can_dlc & 0x0F]; return dlc2len[dlc & 0x0F];
} }
static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */ static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */
@ -102,7 +102,7 @@ static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */
15, 15, 15, 15, 15, 15, 15, 15}; /* 57 - 64 */ 15, 15, 15, 15, 15, 15, 15, 15}; /* 57 - 64 */
/* map the sanitized data length to an appropriate data length code */ /* map the sanitized data length to an appropriate data length code */
unsigned char can_len2dlc(unsigned char len) unsigned char can_fd_len2dlc(unsigned char len)
{ {
if (len > 64) if (len > 64)
return 0xF; return 0xF;

6
lib.h
View File

@ -61,11 +61,11 @@
/* CAN DLC to real data length conversion helpers especially for CAN FD */ /* CAN DLC to real data length conversion helpers especially for CAN FD */
/* get data length from can_dlc with sanitized can_dlc */ /* get data length from raw data length code (DLC) */
unsigned char can_dlc2len(unsigned char can_dlc); unsigned char can_fd_dlc2len(unsigned char dlc);
/* map the sanitized data length to an appropriate data length code */ /* map the sanitized data length to an appropriate data length code */
unsigned char can_len2dlc(unsigned char len); unsigned char can_fd_len2dlc(unsigned char len);
unsigned char asc2nibble(char c); unsigned char asc2nibble(char c);
/* /*

2
log2asc.c
View File

@ -116,7 +116,7 @@ void canfd_asc(struct canfd_frame *cf, int devno, int mtu, char *extra_info, FIL
char *dir = "Rx"; char *dir = "Rx";
unsigned int flags = 0; unsigned int flags = 0;
unsigned int dlen = cf->len; unsigned int dlen = cf->len;
unsigned int dlc = can_len2dlc(dlen); unsigned int dlc = can_fd_len2dlc(dlen);
/* relevant flags in Flags field */ /* relevant flags in Flags field */
#define ASC_F_RTR 0x00000010 #define ASC_F_RTR 0x00000010