Separated normal read and RTR assisted read transfer.

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

diff --git a/lincan/src/write.c b/lincan/src/write.c
index 1760bc2fdba740085e9b4f876414dfe4771010c7..dccade1edbfc1a0e5eb88ebadb8d668752669d0d 100644 (file)
--- a/lincan/src/write.c
+++ b/lincan/src/write.c
@@ -4,12 +4,13 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
+#include "../include/write.h"
 
 ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t *offset)
 {
@@ -53,8 +54,10 @@ ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t *
 
        /* Prepare first message */
        copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t));
-       /* Automatic selection of extended format if "extended" set and ID>2047 */
-       if (extended) if (msg_buff.id & ~0x7ffl ) msg_buff.flags |= MSG_EXT;
+
+       /* Automatic selection of extended format if ID>2047 */
+       if (msg_buff.id & ~0x7ffl & MSG_ID_MASK ) msg_buff.flags |= MSG_EXT;
+       /* has been dependent on "extended" option */
 
        /* If the output buffer is full, return immediately in case O_NONBLOCK
         * has been specified or loop until space becomes available.
@@ -89,8 +92,11 @@ ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t *
                bytes_to_copy -= sizeof(struct canmsg_t);
                /* Prepare first message */
                copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t));
-               /* Automatic selection of extended format if "extended" set and ID>2047 */
-               if (extended) if (msg_buff.id & ~0x7ffl ) msg_buff.flags |= MSG_EXT;
+
+               /* Automatic selection of extended format if ID>2047 */
+               if (msg_buff.id & ~0x7ffl & MSG_ID_MASK ) msg_buff.flags |= MSG_EXT;
+               /* has been dependent on "extended" option */
+
                /* Get slot */
                if(canque_get_inslot4id(qends, &qedge, &slot, 
                        0, msg_buff.id, 0) < 0) break;