X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/92b76dca553a98a228f368f8ff6eedc25e33b870..4dc78b4651f006bf0404c8ec7db85651bcee7c2e:/lincan/src/ioctl.c

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index 0c11ebd..e6dee36 100644
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -1,26 +1,50 @@
-/* ioctl.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.2  9 Jul 2003
- */
+/**************************************************************************/
+/* File: ioctl.c - CAN driver IOCTL functions support                     */
+/*                                                                        */
+/* 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"
 #include "../include/main.h"
 #include "../include/ioctl.h"
-#include "../include/i82527.h"
 
-int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+long can_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	int i=0;
 	unsigned short channel=0;
 	unsigned btr0=0, btr1=0;
 	struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
 	struct msgobj_t *obj;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	struct canque_ends_t *qends;
 	
 	if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
@@ -78,12 +102,27 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 		
 		case CANQUE_FILTER: {
 			struct canfilt_t canfilt;
-			copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			int ret;
+			ret = copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			if(ret)	return -EFAULT;
 			if(canuser->rx_edge0){
 				canque_set_filt(canuser->rx_edge0, canfilt.id, canfilt.mask, canfilt.flags);
 			}
 			break;
 		}
+		
+		case CANRTR_READ: {
+			int ret;
+			struct canmsg_t rtr_msg;
+			
+			ret = copy_from_user(&rtr_msg, (void*)arg, sizeof(struct canmsg_t));
+			if(ret)	return -EFAULT;
+			ret = can_ioctl_remote_read(canuser, &rtr_msg, rtr_msg.id, 0);
+			if(ret<0) return ret;
+			ret = copy_to_user((void*)arg, &rtr_msg, sizeof(struct canmsg_t));
+			if(ret)	return -EFAULT;
+			break;
+		}
 
 		case CONF_BAUD: {
 			channel = arg & 0xff;
@@ -99,7 +138,11 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 		
 		case CONF_BAUDPARAMS: {
 			struct can_baudparams_t params;
-			copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			int ret;
+			
+			ret = copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			if(ret)	return -EFAULT;
+
 			if(params.flags == -1) params.flags = 0;
 			if(params.baudrate == -1) params.baudrate = chip->baudrate;
 			if(params.sjw == -1) params.sjw = 0;