Merge branch 'master' into can-usb1

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

diff --git a/lincan/src/ioctl_remote.c b/lincan/src/ioctl_remote.c
index 68f3670f2da77ba42228bc1fa402e730ca84df39..8c3dd77f03638d3012f6db384df5d2d2b19aca24 100644 (file)
--- a/lincan/src/ioctl_remote.c
+++ b/lincan/src/ioctl_remote.c
@@ -1,11 +1,36 @@
-/* ioctl_remote.c
- * Linux CAN-bus device driver.
- * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
- * 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.3  17 Nov 2004
- */
+/**************************************************************************/
+/* File: ioctl_remote.c - remote CAN messages support IOCTL systemcall    */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* LinCAN is free software; you can redistribute it and/or modify it      */
+/* under terms of the GNU General Public License as published by the      */
+/* Free Software Foundation; either version 2, or (at your option) any    */
+/* later version.  LinCAN is distributed in the hope that it will be      */
+/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty    */
+/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU    */
+/* General Public License for more details. You should have received a    */
+/* copy of the GNU General Public License along with LinCAN; see file     */
+/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+/* Cambridge, MA 02139, USA.                                              */
+/*                                                                        */
+/* To allow use of LinCAN in the compact embedded systems firmware        */
+/* and RT-executives (RTEMS for example), main authors agree with next    */
+/* special exception:                                                     */
+/*                                                                        */
+/* Including LinCAN header files in a file, instantiating LinCAN generics */
+/* or templates, or linking other files with LinCAN objects to produce    */
+/* an application image/executable, does not by itself cause the          */
+/* resulting application image/executable to be covered by                */
+/* the GNU General Public License.                                        */
+/* This exception does not however invalidate any other reasons           */
+/* why the executable file might be covered by the GNU Public License.    */
+/* Publication of enhanced or derived LinCAN files is required although.  */
+/**************************************************************************/
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
@@ -21,8 +46,9 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
        struct rtr_id *rtr_current, *new_rtr_entry;
        struct msgobj_t *obj;
        struct canchip_t *chip;
+       int err;
        /*struct canque_ends_t *qends;*/
-       
+
        DEBUGMSG("Remote transmission request\n");
 
        /*qends = canuser->qends;*/
@@ -44,7 +70,7 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
        if (hardware_p->rtr_queue == NULL) { //No remote messages pending
                new_rtr_entry=(struct rtr_id *)kmalloc(sizeof(struct rtr_id),GFP_ATOMIC);
                if (new_rtr_entry == NULL) {
-                       can_spin_unlock_irqrestore(&hardware_p->rtr_lock, 
+                       can_spin_unlock_irqrestore(&hardware_p->rtr_lock,
                                                                flags);
                        return -ENOMEM;
                }
@@ -59,6 +85,7 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
        }
        init_waitqueue_head(&new_rtr_entry->rtr_wq);
        new_rtr_entry->id = rtr_id;
+       new_rtr_entry->ready_fl = 0;
        new_rtr_entry->rtr_message = rtr_msg;
        new_rtr_entry->next=NULL;
 
@@ -67,11 +94,12 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
        /* Send remote transmission request */
        chip->chipspecops->remote_request(chip,obj);
        obj->ret = 0;
-       interruptible_sleep_on(&new_rtr_entry->rtr_wq);
+
+       err = wait_event_interruptible(new_rtr_entry->rtr_wq, new_rtr_entry->ready_fl);
 
        can_spin_lock_irqsave(&hardware_p->rtr_lock, flags);
        if (hardware_p->rtr_queue == new_rtr_entry) {
-               if (new_rtr_entry->next != NULL) 
+               if (new_rtr_entry->next != NULL)
                        hardware_p->rtr_queue=new_rtr_entry->next;
                else
                        hardware_p->rtr_queue=NULL;
@@ -88,6 +116,9 @@ int can_ioctl_remote_read(struct canuser_t *canuser, struct canmsg_t *rtr_msg,
        can_spin_unlock_irqrestore(&hardware_p->rtr_lock, flags);
        kfree(new_rtr_entry);
 
+       if (err)
+               return -EINTR;
+
        return obj->ret;
 }