Change to CAN_MSG_VERSION_2 and elimination of linux/*.h headers from user space...

[lincan.git] / lincan / src / sja1000.c

diff --git a/lincan/src/sja1000.c b/lincan/src/sja1000.c
index 8e41ae0ddf510c214a322adbd2e154d044ce1fc8..79ae13952f9b0fb05b0c5ff25673f7126f1a9f35 100644 (file)
--- a/lincan/src/sja1000.c
+++ b/lincan/src/sja1000.c
@@ -387,7 +387,12 @@ void sja1000_irq_read_handler(struct chip_t *chip, struct msgobj_t *obj)
                id = can_read_reg(chip, SJARXID0) | (can_read_reg(chip, SJARXID1)<<8);
                obj->rx_msg.length = len = id & 0x0f;
                obj->rx_msg.flags = id&ID0_RTR ? MSG_RTR : 0;
+               #ifdef CAN_MSG_VERSION_2
+               obj->rx_msg.timestamp.tv_sec = 0;
+               obj->rx_msg.timestamp.tv_usec = 0;
+               #else /* CAN_MSG_VERSION_2 */
                obj->rx_msg.timestamp = 0;
+               #endif /* CAN_MSG_VERSION_2 */
                obj->rx_msg.cob = 0;
                obj->rx_msg.id = id>>5;