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

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index 0f54c86..63aaea1 100644
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -1,22 +1,14 @@
 /* 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 0.7  6 Aug 2001
+ * Version lincan-0.3  17 Jun 2004
  */
 
-#include <linux/autoconf.h>
-#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
-#define MODVERSIONS
-#endif
-
-#if defined (MODVERSIONS)
-#include <linux/modversions.h>
-#endif
-
-#include <linux/fs.h>
-#include <linux/version.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/ioctl.h"
 #include "../include/i82527.h"
@@ -26,89 +18,113 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 	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 = objects_p[MINOR_NR]->hostchip;
-	struct canfifo_t *fifo = objects_p[MINOR_NR]->fifo;
-
-	/* Initialize hardware pointers */
-	if ( (obj = objects_p[MINOR_NR]) == NULL) {
+	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");
 		return -1;
 	}
-	if ( (chip = obj->hostchip) == NULL) {
+
+	qends = canuser->qends;
+	chip = obj->hostchip;
+	if (chip == NULL) {
 		CANMSG("Device is not correctly configured.\n");
 		CANMSG("Please reload the driver.\n");
 		return -1;
 	}
 
 	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));
 			break;
 		}
 		case CMD_START: {
-			if (chips_p[arg]->chipspecops->start_chip(chip))
+			if (chip->chipspecops->start_chip(chip))
 				return -1;
 			break;
 		}
 		case CMD_STOP: {
-			if (chips_p[arg]->chipspecops->stop_chip(chip))
+			if (chip->chipspecops->stop_chip(chip))
 				return -1;
 			break;
 		}
+		case CANQUE_FLUSH: {
+			canque_flush(canuser->rx_edge0);
+			break;
+		}
 		case CONF_FILTER: {
-			if (!strcmp(chip->chip_type,"i82527")) {
-			
-				unsigned char id1, id0;
-				id1 = (unsigned char) (arg << 5);
-				id0 = (unsigned char) (arg >> 3);
-
-				DEBUGMSG("configuring ID=%lx in message object:
-						 %02x, %02x\n", arg, id0, id1);
-				can_write_reg(chip,id1,MSG_OFFSET(obj->object) +
-								iMSGID1);
-				can_write_reg(chip,id0,MSG_OFFSET(obj->object) +
-								iMSGID0);
-			}
 
 			/* In- and output buffer re-initialization */
 			
-			fifo->tx_readp = fifo->buf_tx_entry;
-			fifo->tx_writep = fifo->buf_tx_entry;
-			fifo->rx_readp = fifo->buf_rx_entry;
-			fifo->rx_writep = fifo->buf_rx_entry;
-			fifo->rx_size= MAX_BUF_LENGTH * sizeof(struct canmsg_t);
-			fifo->tx_size = fifo->rx_size;
-
-			#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,2,19))
-				init_waitqueue(&fifo->readq);
-				init_waitqueue(&fifo->writeq);
-			#else
-				init_waitqueue_head(&fifo->readq);
-				init_waitqueue_head(&fifo->writeq);
-			#endif
-
-			fifo->rx_in_progress = 0;
-			fifo->tx_in_progress = 0;
+			if(canuser->rx_edge0){
+				canque_set_filt(canuser->rx_edge0, arg, ~0, 0);
+			}
 
-			fifo->head = fifo->tail = 0; //TEMP!!
-			
 			break;
 		}
+		
+		case CANQUE_FILTER: {
+			struct canfilt_t canfilt;
+			copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			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;
+			
+			copy_from_user(&rtr_msg, (void*)arg, sizeof(struct canmsg_t));
+			ret = can_ioctl_remote_read(canuser, &rtr_msg, rtr_msg.id, 0);
+			if(ret<0) return ret;
+			copy_to_user((void*)arg, &rtr_msg, sizeof(struct canmsg_t));
+		}
 
 		case CONF_BAUD: {
 			channel = arg & 0xff;
 			btr0 = (arg >> 8) & 0xff;
 			btr1 = (arg >> 16) & 0xff;
 
-			if (chips_p[channel]->chipspecops->set_btregs(chip,
-								btr0, btr1)) {
+			if (chip->chipspecops->set_btregs(chip, btr0, btr1)) {
 				CANMSG("Error setting bit timing registers\n");
 				return -1;
 			}
 			break;
 		}
+		
+		case CONF_BAUDPARAMS: {
+			struct can_baudparams_t params;
+			copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			if(params.flags == -1) params.flags = 0;
+			if(params.baudrate == -1) params.baudrate = chip->baudrate;
+			if(params.sjw == -1) params.sjw = 0;
+			if(params.sample_pt == -1) params.sample_pt = 75;
+			i=chip->chipspecops->baud_rate(chip, params.baudrate, chip->clock, params.sjw,
+                                                        params.sample_pt, params.flags);
+			if(i>=0) chip->baudrate = params.baudrate;
+			else {
+				CANMSG("Error setting baud parameters\n");
+				return -1;
+			}
+			break;
+		}
+
+
 		default: {
 			CANMSG("Not a valid ioctl command\n");
 			return -EINVAL;