Separated normal read and RTR assisted read transfer.

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

diff --git a/lincan/src/write_rtl.c b/lincan/src/write_rtl.c
index a1d4647dbf9e18eac50e941523738f19a06782e7..a078c6b2aed70e88d42061c8d7906f0ff1b7f5de 100644 (file)
--- a/lincan/src/write_rtl.c
+++ b/lincan/src/write_rtl.c
@@ -4,7 +4,7 @@
  * 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
  */
 
 #ifdef CAN_WITH_RTL
@@ -47,8 +47,10 @@ ssize_t can_write_rtl_posix(struct rtl_file *fptr, const char *buffer,
        qends = canuser->qends;
 
        msg_flags=msg_buff->flags;
-       /* Automatic selection of extended format if "extended" set and ID>2047 */
-       if (extended) if (msg_buff->id & ~0x7ffl ) msg_flags |= MSG_EXT;
+
+       /* Automatic selection of extended format if ID>2047 */
+       if (msg_buff->id & ~0x7ffl & MSG_ID_MASK ) msg_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.
@@ -82,8 +84,11 @@ ssize_t can_write_rtl_posix(struct rtl_file *fptr, const char *buffer,
        while (bytes_to_copy >= sizeof(struct canmsg_t)) {
                bytes_to_copy -= sizeof(struct canmsg_t);
                msg_flags=msg_buff->flags;
-               /* Automatic selection of extended format if "extended" set and ID>2047 */
-               if (extended) if (msg_buff->id & ~0x7ffl ) msg_flags |= MSG_EXT;
+
+               /* Automatic selection of extended format if ID>2047 */
+               if (msg_buff->id & ~0x7ffl & MSG_ID_MASK ) msg_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;