Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / canmsg.h

diff --git a/lincan/include/canmsg.h b/lincan/include/canmsg.h
index 8277b9e1b2d2b8428d4bd0f8b34b91824bf4cdc4..0738fc9bdc4adbfcc1ecbf999529500c6c7d8b6b 100644 (file)
--- a/lincan/include/canmsg.h
+++ b/lincan/include/canmsg.h
@@ -1,3 +1,11 @@
+/* canmsg.h - common kernel-space and user-space CAN message structure
+ * Linux CAN-bus device driver.
+ * Written by Pavel Pisa - OCERA team member
+ * email:pisa@cmp.felk.cvut.cz
+ * This software is released under the GPL-License.
+ * Version lincan-0.3  17 Jun 2004
+ */
+
 #ifndef _CANMSG_T_H
 #define _CANMSG_T_H
 
@@ -8,6 +16,7 @@
 
 #else /* __KERNEL__ */
 
+#include <inttypes.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -31,6 +40,8 @@ extern "C" {
 
 typedef struct timeval canmsg_tstamp_t ;
 
+typedef unsigned long canmsg_id_t;
+
 /**
  * struct canmsg_t - structure representing CAN message
  * @flags:  message flags
@@ -49,7 +60,7 @@ typedef struct timeval canmsg_tstamp_t ;
 struct canmsg_t {
        int             flags;
        int             cob;
-       unsigned long   id;
+       canmsg_id_t     id;
        canmsg_tstamp_t timestamp;
        unsigned short  length;
        unsigned char   data[CAN_MSG_LENGTH];
@@ -63,7 +74,7 @@ struct canmsg_t {
 struct canmsg_t {
        short           flags;
        int             cob;
-       unsigned long   id;
+       canmsg_id_t     id;
        unsigned long   timestamp;
        unsigned int    length;
        unsigned char   data[CAN_MSG_LENGTH];
@@ -96,8 +107,8 @@ struct canfilt_t {
        int             flags;
        int             queid;
        int             cob;
-       unsigned long   id;
-       unsigned long   mask;
+       canmsg_id_t     id;
+       canmsg_id_t     mask;
 };
 
 typedef struct canfilt_t canfilt_t;