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

cangen: checkpatch: fix space and newline usage 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/386/head
Marc Kleine-Budde 2022-03-27 11:02:46 +02:00
parent 144d77180e
commit 77e785b022
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cangen.c
View File

@ -249,7 +249,7 @@ int main(int argc, char **argv)
} else { } else {
data_mode = MODE_FIX; data_mode = MODE_FIX;
if (hexstring2data(optarg, fixdata, CANFD_MAX_DLEN)) { if (hexstring2data(optarg, fixdata, CANFD_MAX_DLEN)) {
printf ("wrong fix data definition\n"); printf("wrong fix data definition\n");
return 1; return 1;
} }
} }
@ -357,7 +357,7 @@ int main(int argc, char **argv)
} }
/* interface is ok - try to switch the socket into CAN FD mode */ /* interface is ok - try to switch the socket into CAN FD mode */
if (setsockopt(s, SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &enable_canfd, sizeof(enable_canfd))){ if (setsockopt(s, SOL_CAN_RAW, CAN_RAW_FD_FRAMES, &enable_canfd, sizeof(enable_canfd))) {
printf("error when enabling CAN FD support\n"); printf("error when enabling CAN FD support\n");
return 1; return 1;
} }
@ -394,7 +394,7 @@ int main(int argc, char **argv)
if (count && (--count == 0)) if (count && (--count == 0))
running = 0; running = 0;
if (canfd){ if (canfd) {
mtu = CANFD_MTU; mtu = CANFD_MTU;
maxdlen = CANFD_MAX_DLEN; maxdlen = CANFD_MAX_DLEN;
if (brs) if (brs)
@ -423,7 +423,6 @@ int main(int argc, char **argv)
frame.can_id |= CAN_RTR_FLAG; frame.can_id |= CAN_RTR_FLAG;
if (dlc_mode == MODE_RANDOM) { if (dlc_mode == MODE_RANDOM) {
if (canfd) if (canfd)
frame.len = can_fd_dlc2len(random() & 0xF); frame.len = can_fd_dlc2len(random() & 0xF);
else { else {
@ -445,7 +444,6 @@ int main(int argc, char **argv)
frame.len = 1; /* min dlc value for incr. data */ frame.len = 1; /* min dlc value for incr. data */
if (data_mode == MODE_RANDOM) { if (data_mode == MODE_RANDOM) {
rnd = random(); rnd = random();
memcpy(&frame.data[0], &rnd, 4); memcpy(&frame.data[0], &rnd, 4);
rnd = random(); rnd = random();
@ -467,11 +465,10 @@ int main(int argc, char **argv)
memset(&frame.data[frame.len], 0, maxdlen - frame.len); memset(&frame.data[frame.len], 0, maxdlen - frame.len);
if (verbose) { if (verbose) {
printf(" %s ", argv[optind]); printf(" %s ", argv[optind]);
if (verbose > 1) if (verbose > 1)
fprint_long_canframe(stdout, &frame, "\n", (verbose > 2)?1:0, maxdlen); fprint_long_canframe(stdout, &frame, "\n", (verbose > 2) ? 1 : 0, maxdlen);
else else
fprint_canframe(stdout, &frame, "\n", 1, maxdlen); fprint_canframe(stdout, &frame, "\n", 1, maxdlen);
} }
@ -518,7 +515,6 @@ resend:
frame.can_id++; frame.can_id++;
if (dlc_mode == MODE_INCREMENT) { if (dlc_mode == MODE_INCREMENT) {
incdlc++; incdlc++;
incdlc %= CAN_MAX_RAW_DLC + 1; incdlc %= CAN_MAX_RAW_DLC + 1;
@ -539,22 +535,21 @@ resend:
} }
if (data_mode == MODE_INCREMENT) { if (data_mode == MODE_INCREMENT) {
incdata++; incdata++;
for (i=0; i<8 ;i++) for (i = 0; i < 8; i++)
frame.data[i] = (incdata >> i*8) & 0xFFULL; frame.data[i] = (incdata >> i * 8) & 0xFFULL;
} }
if (mix) { if (mix) {
i = random(); i = random();
extended = i&1; extended = i & 1;
canfd = i&2; canfd = i & 2;
if (canfd) { if (canfd) {
brs = i&4; brs = i & 4;
esi = i&8; esi = i & 8;
} }
rtr_frame = ((i&24) == 24); /* reduce RTR frames to 1/4 */ rtr_frame = ((i & 24) == 24); /* reduce RTR frames to 1/4 */
} }
} }