# HG changeset patch
# User etisserant
# Date 1178889405 -7200
# Node ID d3930d3f13230e75bc92bf3bcb14a8afcc24834d
# Parent  5220b201fac7b723faae358b3d219cb507220863
Fixed can_socket compilation bugs

diff -r 5220b201fac7 -r d3930d3f1323 drivers/can_socket/.cvsignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drivers/can_socket/.cvsignore	Fri May 11 15:16:45 2007 +0200
@@ -0,0 +1,2 @@
+libcanfestival_can_socket.so
+Makefile
diff -r 5220b201fac7 -r d3930d3f1323 drivers/can_socket/can_socket.c
--- a/drivers/can_socket/can_socket.c	Fri May 11 13:31:31 2007 +0200
+++ b/drivers/can_socket/can_socket.c	Fri May 11 15:16:45 2007 +0200
@@ -37,7 +37,14 @@
 #define CAN_BIND       rt_dev_bind
 #define CAN_IOCTL      rt_dev_ioctl
 #else
-#include "af_can.h"
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include "linux/can.h"
+#include "linux/can/raw.h"
+#include "net/if.h"
+#define PF_CAN 29
+#define AF_CAN PF_CAN
+//#include "af_can.h"
 #define CAN_IFNAME     "can%s"
 #define CAN_SOCKET     socket
 #define CAN_CLOSE      close
@@ -55,7 +62,7 @@
        int res;
        struct can_frame frame;
 
-       res = CAN_RECV(fd0, &frame, sizeof(frame), 0);
+       res = CAN_RECV(*(int*)fd0, &frame, sizeof(frame), 0);
        if (res < 0)
                return 1;
 
@@ -86,7 +93,7 @@
        else
                memcpy(frame.data, m->data, 8);
 
-       res = CAN_SEND(fd0, &frame, sizeof(frame), 0);
+       res = CAN_SEND(*(int*)fd0, &frame, sizeof(frame), 0);
        if (res < 0)
                return 1;
 
@@ -96,19 +103,19 @@
 /***************************************************************************/
 CAN_HANDLE canOpen_driver(s_BOARD *board)
 {
-       CAN_HANDLE fd0;
        struct ifreq ifr;
        struct sockaddr_can addr;
        int err;
+       CAN_HANDLE fd0 = malloc(sizeof(int));
 
-       fd0 = CAN_SOCKET(PF_CAN, SOCK_RAW, 0);
-       if(fd0 < 0){
+       *(int*)fd0 = CAN_SOCKET(PF_CAN, SOCK_RAW, 0);
+       if(*(int*)fd0 < 0){
                fprintf(stderr,"Socket creation failed.\n");
                goto error_ret;
        }
 
        snprintf(ifr.ifr_name, IFNAMSIZ, CAN_IFNAME, board->busname);
-       err = CAN_IOCTL(fd0, SIOCGIFINDEX, &ifr);
+       err = CAN_IOCTL(*(int*)fd0, SIOCGIFINDEX, &ifr);
        if (err) {
                fprintf(stderr, "Unknown device: %s\n", ifr.ifr_name);
                goto error_close;
@@ -116,7 +123,7 @@
 
        addr.can_family  = AF_CAN;
        addr.can_ifindex = ifr.ifr_ifindex;
-       err = CAN_BIND(fd0, (struct sockaddr *)&addr,
+       err = CAN_BIND(*(int*)fd0, (struct sockaddr *)&addr,
                              sizeof(addr));
        if (err) {
                fprintf(stderr, "Binding failed.\n");
@@ -129,6 +136,7 @@
        CAN_CLOSE(fd0);
 
  error_ret:
+       free(fd0);
        return NULL;
 }
 
@@ -136,7 +144,8 @@
 int canClose_driver(CAN_HANDLE fd0)
 {
        if (fd0) {
-               CAN_CLOSE(fd0);
+               CAN_CLOSE(*(int*)fd0);
+               free(fd0);
        }
        return 0;
 }