+#ifndef _CAN_DRVAPI_T_H
+#define _CAN_DRVAPI_T_H
+
+#ifdef __KERNEL__
+
+#include <linux/time.h>
#include <linux/types.h>
#include <linux/ioctl.h>
-#ifndef PACKED
-#define PACKED __attribute__((packed))
-#endif
+#else /* __KERNEL__ */
-#define CAN_MSG_LENGTH 8
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
-struct canmsg_t {
- short flags;
- int cob;
- unsigned long id;
- unsigned long timestamp;
- unsigned int length;
- char data[CAN_MSG_LENGTH];
-} PACKED;
+#endif /* __KERNEL__ */
-/* Definitions to use for canmsg_t flags */
-#define MSG_RTR (1<<0)
-#define MSG_OVR (1<<1)
-#define MSG_EXT (1<<2)
+#include "./canmsg.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/* CAN ioctl magic number */
#define CAN_IOC_MAGIC 'd'
-unsigned long bittiming;
-unsigned short channel;
+typedef unsigned long bittiming_t;
+typedef unsigned short channel_t;
/* CAN ioctl functions */
-#define CMD_START _IOW(CAN_IOC_MAGIC, 1, channel)
-#define CMD_STOP _IOW(CAN_IOC_MAGIC, 2, channel)
+#define CMD_START _IOW(CAN_IOC_MAGIC, 1, channel_t)
+#define CMD_STOP _IOW(CAN_IOC_MAGIC, 2, channel_t)
//#define CMD_RESET 3
-#define CONF_BAUD _IOW(CAN_IOC_MAGIC, 4, bittiming)
+#define CONF_BAUD _IOW(CAN_IOC_MAGIC, 4, bittiming_t)
//#define CONF_ACCM
//#define CONF_XTDACCM
//#define CONF_TIMING
//#define CONF_OMODE
#define CONF_FILTER _IOW(CAN_IOC_MAGIC, 8, unsigned char)
+
//#define CONF_FENABLE
//#define CONF_FDISABLE
-
#define STAT _IO(CAN_IOC_MAGIC, 9)
+#define CANQUE_FILTER _IOW(CAN_IOC_MAGIC, 10, struct canfilt_t)
+#define CANQUE_FLUSH _IO(CAN_IOC_MAGIC, 11)
+
+#ifdef __cplusplus
+} /* extern "C"*/
+#endif
+
+#endif /*_CAN_DRVAPI_T_H*/