Structured comments updated.

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

diff --git a/lincan/src/open.c b/lincan/src/open.c
index 38ee4d4c8d91ba4b16044379bf024b8ba020f1e8..deb027ca8e8a430ffeb205e89e0721ca0bd921b0 100644 (file)
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -24,6 +24,7 @@ int can_open(struct inode *inode, struct file *file)
        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) ) {
@@ -33,7 +34,7 @@ int can_open(struct inode *inode, struct file *file)
 
        atomic_inc(&obj->obj_used);
        DEBUGMSG("Device %d opened %d times.\n", MINOR_NR, atomic_read(&obj->obj_used));
-       obj->flags |= OBJ_OPENED;
+       can_msgobj_set_fl(obj,OPENED);
 
        if (chip->flags & CHIP_CONFIGURED) 
                DEBUGMSG("Device is already configured.\n");
@@ -46,13 +47,12 @@ int can_open(struct inode *inode, struct file *file)
                if (chip->chipspecops->pre_read_config(chip,obj)<0)
                        CANMSG("Error initializing chip for receiving\n");
 
-               /* chip->flags |= OBJ_BUFFERS_ALLOCATED; */
-               
        } /* End of chip configuration */
 
        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;
@@ -62,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;