X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/fb2dd0f20bd6264291dccb5e97609a23cae2fd1a..HEAD:/lincan/src/ioctl_rtl.c

diff --git a/lincan/src/ioctl_rtl.c b/lincan/src/ioctl_rtl.c
index 449b345..d811866 100644
--- a/lincan/src/ioctl_rtl.c
+++ b/lincan/src/ioctl_rtl.c
@@ -1,11 +1,36 @@
-/* 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_rtl.c - RT-Linux variant of IOCTL system call              */
+/*                                                                        */
+/* 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.  */
+/**************************************************************************/
 
 #ifdef CAN_WITH_RTL
 
@@ -14,6 +39,7 @@
 #include "../include/main.h"
 
 #include <rtl_posixio.h>
+#include "../include/ioctl.h"
 #include "../include/can_iortl.h"
 
 
@@ -25,14 +51,14 @@ int can_ioctl_rtl_posix(struct rtl_file *fptr, unsigned int cmd, unsigned long a
 	unsigned short channel=0;
 	unsigned btr0=0, btr1=0;
 	struct msgobj_t *obj;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	struct canque_ends_t *qends;
-	
+
 	if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
 		CANMSG("can_ioctl_: bad canuser magic\n");
 		return -ENODEV;
 	}
-	
+
 	obj = canuser->msgobj;
 	if (obj == NULL) {
 		CANMSG("Could not assign buffer structure\n");
@@ -48,6 +74,9 @@ int can_ioctl_rtl_posix(struct rtl_file *fptr, unsigned int cmd, unsigned long a
 	}
 
 	switch (cmd) {
+		case CAN_DRV_QUERY: {
+			return can_ioctl_query(canuser, arg);
+		}
 		case STAT: {
 			for (i=0x0; i<0x100; i++)
 				CANMSG("0x%x is 0x%x\n",i,can_read_reg(chip,i));
@@ -74,10 +103,9 @@ int can_ioctl_rtl_posix(struct rtl_file *fptr, unsigned int cmd, unsigned long a
 
 			break;
 		}
-		
+
 		case CANQUE_FILTER: {
-			struct canfilt_t canfilt;
-			copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			struct canfilt_t canfilt=*(struct canfilt_t *)arg;
 			if(canuser->rx_edge0){
 				canque_set_filt(canuser->rx_edge0, canfilt.id, canfilt.mask, canfilt.flags);
 			}
@@ -99,7 +127,7 @@ int can_ioctl_rtl_posix(struct rtl_file *fptr, unsigned int cmd, unsigned long a
 			CANMSG("Not a valid ioctl command\n");
 			return -EINVAL;
 		}
-		
+
 	}
 
 	return 0;