From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Sat, 14 May 2005 19:24:00 +0000 (+0200)
Subject: Merge: Message declaration updated to match VCA provided version.
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~67
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/788c3cf8927276615d7f30fa2409eb9baac4f6ce?hp=39d5e39630626077e0fc8b882fac32d40b1723b9

Merge: Message declaration updated to match VCA provided version.

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/include/canmsg.h b/lincan/include/canmsg.h
index 61f327a..779f68c 100644
--- a/lincan/include/canmsg.h
+++ b/lincan/include/canmsg.h
@@ -39,6 +39,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
@@ -57,7 +59,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];
@@ -67,15 +69,12 @@ struct canmsg_t {
 #ifndef PACKED
 #define PACKED __attribute__((packed))
 #endif
-
-typedef unsigned long canmsg_tstamp_t ;
-
 /* Old, deprecated version of canmsg_t structure */
 struct canmsg_t {
 	short		flags;
 	int		cob;
-	unsigned long	id;
-	canmsg_tstamp_t	timestamp;
+	canmsg_id_t	id;
+	unsigned long	timestamp;
 	unsigned int	length;
 	unsigned char	data[CAN_MSG_LENGTH];
 } PACKED;
@@ -107,8 +106,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;