CAN driver infrastructure redesign to LinCAN-0.2 version

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

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index ec029abc62b90181492eeb410a16f9a61625ea66..40a420494dc0572e3e557b8ffbf1c47e1f17abee 100644 (file)
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -1,22 +1,18 @@
 /* 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.2  9 Jul 2003
  */
 
 #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 <linux/string.h>
+#include <asm/uaccess.h>
 
 #include "../include/main.h"
 #include "../include/ioctl.h"
@@ -27,16 +23,25 @@ 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 chip_t *chip;
+       struct canque_ends_t *qends;
+       
+       if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
+               CANMSG("can_close: 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;
@@ -49,60 +54,58 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
                        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 CONF_FILTER: {
+                   #if 0
                        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);
+                               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);
                        }
+                   #endif
 
                        /* 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,3,0))
-                               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);
+                               canque_flush(canuser->rx_edge0);
+                       }
 
                        break;
                }
+               
+               case CONF_FILTER_QUE0: {
+                       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);
+                               canque_flush(canuser->rx_edge0);
+                       }
+                       break;
+               }
 
                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;
                        }