sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-09-22 16:09:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reverted most of the changes since r500 except the changes in

Browse Source 
drivers/net/can/* after discussion with Urs.
TODO: Documentation & new Version.
This commit is contained in:
Oliver Hartkopp
2007-10-01 05:48:50 +00:00
parent 6689e9600d
commit d72681c442
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cangen.c
+8 -8
View File
@@ -88,8 +88,8 @@ void print_usage(char *prg)
"default: 8\n");
fprintf(stderr, " -f <canframe> (other fixed CAN frame) "
"default: 123#0123456789ABCDEF\n");
fprintf(stderr, " -x (disable echo) "
"default: standard echo\n");
fprintf(stderr, " -x (disable loopback) "
"default: standard loopback\n");
fprintf(stderr, " -v (verbose) "
"default: don't print sent frames\n");
}
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
unsigned char fix_data = 0;
unsigned char fix_dlc = 0;
unsigned char default_frame = 1;
unsigned char echo_disable = 0;
unsigned char loopback_disable = 0;
unsigned char verbose = 0;
int opt;
@@ -159,7 +159,7 @@ int main(int argc, char **argv)
break;
case 'x':
echo_disable = 1;
loopback_disable = 1;
break;
default:
@@ -216,11 +216,11 @@ int main(int argc, char **argv)
/* little (really a very little!) CPU usage. */
setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, NULL, 0);
if (echo_disable) {
int echo = 0;
if (loopback_disable) {
int loopback = 0;
setsockopt(s, SOL_CAN_RAW, CAN_RAW_ECHO,
&echo, sizeof(echo));
setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK,
&loopback, sizeof(loopback));
}
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {