Separated normal read and RTR assisted read transfer.

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

diff --git a/lincan/src/open.c b/lincan/src/open.c
index 015b52107130b5c691f5a874d3be3720dc79ebd3..127fdea921884eaeea69f0c950aa2583a08ebdfa 100644 (file)
--- a/lincan/src/open.c
+++ b/lincan/src/open.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
  */
 
 #include "../include/can.h"
@@ -20,10 +20,11 @@
 int can_open(struct inode *inode, struct file *file)
 {
        struct msgobj_t *obj;
-       struct chip_t *chip;
+       struct canchip_t *chip;
        struct canuser_t *canuser;
        struct canque_ends_t *qends;
        struct canque_edge_t *edge;
+       can_spin_irqflags_t iflags;
 
        if ( ((obj=objects_p[MINOR_NR]) == NULL) || 
                        ((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
@@ -50,7 +51,8 @@ int can_open(struct inode *inode, struct file *file)
 
        canuser = (struct canuser_t *)kmalloc(sizeof(struct canuser_t), GFP_KERNEL);
        if(canuser == NULL) goto no_canuser;
-       canuser->file = file;
+       canuser->flags=0;
+       canuser->userinfo.fileinfo.file = file;
        canuser->msgobj = obj;
        canuser->magic = CAN_USER_MAGIC;
        file->private_data = canuser;
@@ -60,7 +62,10 @@ int can_open(struct inode *inode, struct file *file)
        canqueue_ends_init_kern(qends);
        canuser->qends = qends;
        
+       /*required to synchronize with RT-Linux context*/
+       can_spin_lock_irqsave(&canuser_manipulation_lock, iflags);
        list_add(&canuser->peers, &obj->obj_users);
+       can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags);
 
        if(canqueue_connect_edge(edge=canque_new_edge_kern(MAX_BUF_LENGTH),
                canuser->qends, obj->qends)<0) goto no_tx_qedge;