changed user space programs to use new include files.

added missing include file <net/if.h> in most programs.
added volatile modifier to "int running" in candump.c.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@86 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/can-utils/Makefile b/can-utils/Makefile
index 47071540285e3cb8537bd3220bab3a58a7458240..f7c5153e8e5b3eb67ad4d125af593e3a9ff225f0 100644 (file)
--- a/can-utils/Makefile
+++ b/can-utils/Makefile
@@ -40,7 +40,8 @@
 #
 #  Send feedback to <socketcan-users@lists.berlios.de>
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.4/can -fno-strict-aliasing
+CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
+           -fno-strict-aliasing
 
 PROGRAMS = candump can-sniffer
 

diff --git a/can-utils/can-sniffer.c b/can-utils/can-sniffer.c
index d40f48c4e94fc85cfbfd93d0db3a78f719969c18..7479ea35bcfcf286208d9a5ae9139e0857280eee 100644 (file)
--- a/can-utils/can-sniffer.c
+++ b/can-utils/can-sniffer.c
@@ -62,9 +62,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
+
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
-#include "af_can.h"
-#include "bcm.h"
 #include "terminal.h"
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)

diff --git a/can-utils/candump.c b/can-utils/candump.c
index aefa02a9f90a900dbcf67f5b96fd9cc114fb9ee6..a680d2a52e5f9ab22da3d4a926cd8bdb0c38debf 100644 (file)
--- a/can-utils/candump.c
+++ b/can-utils/candump.c
@@ -60,9 +60,11 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
+
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
-#include "af_can.h"
-#include "raw.h"
 #include "terminal.h"
 
 #define USE_RECVFROM /* use read() or recvfrom() syscall */
@@ -87,7 +89,7 @@ const char anichar[MAXANI] = {'|', '/', '-', '\\', '|', '/', '-', '\\'};
 
 extern int optind, opterr, optopt;
 
-static int     running = 1;
+static volatile int running = 1;
 
 void print_usage(char *prg)
 {

diff --git a/test/Makefile b/test/Makefile
index c33f16051a4896c357a1116db015ba767872ca25..bbbbe285c3104f4e98ac5e27ab4a52c8becfb025 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -40,7 +40,8 @@
 #
 #  Send feedback to <socketcan-users@lists.berlios.de>
 
-CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.4/can -fno-strict-aliasing
+CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
+           -fno-strict-aliasing
 
 PROGRAMS =     tst-raw         \
                tst-raw-filter  \

diff --git a/test/canecho.c b/test/canecho.c
index 2c4ef2c03bf9f100da81058b2ab78e3d9ad568c4..e85b40a8a07e8ef22feb012b4643cc862d698cbe 100644 (file)
--- a/test/canecho.c
+++ b/test/canecho.c
@@ -57,8 +57,9 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
+#include <linux/can.h>
 
 extern int optind, opterr, optopt;
 

diff --git a/test/tst-bcm-cycle.c b/test/tst-bcm-cycle.c
index 4871b031f4da83ae06b2664689cabc0427bb7377..adbc6c96fef500c7c2d488a9d206e3c58852cefc 100644 (file)
--- a/test/tst-bcm-cycle.c
+++ b/test/tst-bcm-cycle.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
 

diff --git a/test/tst-bcm-filter.c b/test/tst-bcm-filter.c
index 3c7307f5eb1f522be7b792106f466be697942cf8..93b3afe4599d0c3335eb8a2ccbbd458bf383e088 100644 (file)
--- a/test/tst-bcm-filter.c
+++ b/test/tst-bcm-filter.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
 

diff --git a/test/tst-bcm-rtr.c b/test/tst-bcm-rtr.c
index 737a872122c705ddf9a6565e3362348bb9e69111..2c7d991578fd75fed9afe7a938573f3504597da8 100644 (file)
--- a/test/tst-bcm-rtr.c
+++ b/test/tst-bcm-rtr.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 #define RTR_SETUP
 

diff --git a/test/tst-bcm-single.c b/test/tst-bcm-single.c
index 5101e321255122a57e220d1489d0db0ae2160d39..540155af0b88b14486a3d38faeae2112fd2560e0 100644 (file)
--- a/test/tst-bcm-single.c
+++ b/test/tst-bcm-single.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 int main(int argc, char **argv)
 {

diff --git a/test/tst-bcm-throttle.c b/test/tst-bcm-throttle.c
index c9c3a460ffc2501f8c84ccd9f57b3ccae7c04ad6..38127efa036d6480f68988ecefe41037d9743525 100644 (file)
--- a/test/tst-bcm-throttle.c
+++ b/test/tst-bcm-throttle.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
 

diff --git a/test/tst-bcm-tx_read.c b/test/tst-bcm-tx_read.c
index d6d18860105e3e00208cdd4d463a582f757b6e08..a0132f2827653921cbc6f8547024d4114e3bcbfd 100644 (file)
--- a/test/tst-bcm-tx_read.c
+++ b/test/tst-bcm-tx_read.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "bcm.h"
+#include <linux/can.h>
+#include <linux/can/bcm.h>
 
 #define U64_DATA(p) (*(unsigned long long*)(p)->data)
 

diff --git a/test/tst-err.c b/test/tst-err.c
index 43ba07e441d09144448fba6c1c81fc25b77c6975..2150559c3141e6fb20b8d641db05bf2e88f1c322 100644 (file)
--- a/test/tst-err.c
+++ b/test/tst-err.c
@@ -54,10 +54,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "raw.h"
-#include "can_error.h"
+#include <linux/can.h>
+#include <linux/can/raw.h>
+#include <linux/can/error.h>
 
 int main(int argc, char **argv)
 {

diff --git a/test/tst-proc.c b/test/tst-proc.c
index 6a91be525be3376587ad4b664c3a3fe7782c30dd..7f4efa15a34014ff7f8e79a858ace21ed35e3d16 100644 (file)
--- a/test/tst-proc.c
+++ b/test/tst-proc.c
@@ -55,9 +55,10 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "raw.h"
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
 #define MAX_RAW 800
 

diff --git a/test/tst-raw-filter.c b/test/tst-raw-filter.c
index 96045a50f851657323c858a72725eeabc58f2162..cf201c442121cba943fdebdf96339227e17f8da3 100644 (file)
--- a/test/tst-raw-filter.c
+++ b/test/tst-raw-filter.c
@@ -54,9 +54,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "raw.h"
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
 #define MAXFILTERS 32
 

diff --git a/test/tst-raw-sendto.c b/test/tst-raw-sendto.c
index 496b15279b3b376d6a16d69fa6bc465b6e263108..ae5f6726ff85a9120c64d6f0d9a169e244de7604 100644 (file)
--- a/test/tst-raw-sendto.c
+++ b/test/tst-raw-sendto.c
@@ -54,9 +54,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "raw.h"
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
 int main(int argc, char **argv)
 {

diff --git a/test/tst-raw.c b/test/tst-raw.c
index f084dd733572413080cfe829323ad69a002e4ea5..e25c5bd0357fe3a9f02610be7ec9165bcfb4dd1b 100644 (file)
--- a/test/tst-raw.c
+++ b/test/tst-raw.c
@@ -54,9 +54,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <net/if.h>
 
-#include "af_can.h"
-#include "raw.h"
+#include <linux/can.h>
+#include <linux/can/raw.h>
 
 int main(int argc, char **argv)
 {