X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4dc78b4651f006bf0404c8ec7db85651bcee7c2e..04ac67cc3cac14cd601daacd0592121ec0b84012:/lincan/src/open_rtl.c diff --git a/lincan/src/open_rtl.c b/lincan/src/open_rtl.c index b6cbc03..8090495 100644 --- a/lincan/src/open_rtl.c +++ b/lincan/src/open_rtl.c @@ -56,16 +56,16 @@ int can_open_rtl_common(struct canuser_t *canuser, int open_flags) can_spin_irqflags_t iflags; if(!obj) return -ENODEV; - + can_msgobj_set_fl(obj,OPENED); - + chip=obj->hostchip; if (chip) { if (!(chip->flags & CHIP_CONFIGURED)) { if (chip->chipspecops->chip_config(chip)) CANMSG("Error configuring chip.\n"); else - chip->flags |= CHIP_CONFIGURED; + chip->flags |= CHIP_CONFIGURED; if (chip->chipspecops->pre_read_config(chip,obj)<0) CANMSG("Error initializing chip for receiving\n"); @@ -80,7 +80,7 @@ int can_open_rtl_common(struct canuser_t *canuser, int open_flags) /* mark memory as allocated from RTL memory pool */ qends->ends_flags|=CAN_ENDSF_MEM_RTL; canuser->qends = qends; - + can_spin_lock_irqsave(&canuser_manipulation_lock, iflags); list_add(&canuser->peers, &obj->obj_users); can_spin_unlock_irqrestore(&canuser_manipulation_lock, iflags); @@ -96,10 +96,10 @@ int can_open_rtl_common(struct canuser_t *canuser, int open_flags) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50)) MOD_INC_USE_COUNT; /*is this enough for RT-Linux context ?*/ -#endif +#endif return 0; - + no_rx_qedge: canque_notify_bothends(edge, CANQUEUE_NOTIFY_DEAD_WANTED); canque_edge_decref(edge); @@ -121,11 +121,11 @@ int can_open_rtl_posix(struct rtl_file *fptr) struct canchip_t *chip; struct canuser_t *canuser; int minor_nr = RTL_MINOR_FROM_FILEPTR(fptr); - + if(minor_nr>=MAX_TOT_MSGOBJS) return -ENODEV; - if ( ((obj=objects_p[minor_nr]) == NULL) || + if ( ((obj=objects_p[minor_nr]) == NULL) || ((chip=objects_p[minor_nr]->hostchip) == NULL) ) { CANMSG("There is no hardware support for the device file with minor nr.: %d\n",minor_nr); return -ENODEV; @@ -156,7 +156,7 @@ int can_open_rtl_posix(struct rtl_file *fptr) no_canuser: atomic_dec(&obj->obj_used); - + return ret; }