X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/open.c

diff --git a/lincan/src/open.c b/lincan/src/open.c
index f9ff108..e980f16 100644
--- a/lincan/src/open.c
+++ b/lincan/src/open.c
@@ -1,30 +1,24 @@
 /* open.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
  */
 
 #define __NO_VERSION__
 #include <linux/module.h> 
 
 #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>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
 #include <linux/malloc.h>
 #else
 #include <linux/slab.h>
 #endif
-#include <linux/version.h>
 
 #include "../include/main.h"
 #include "../include/open.h"
@@ -35,7 +29,8 @@ int can_open(struct inode *inode, struct file *file)
 {
 	struct msgobj_t *obj;
 	struct chip_t *chip;
-	struct canfifo_t *fifo;
+	struct canuser_t *canuser;
+	struct canque_ends_t *qends;
 
 	if ( ((obj=objects_p[MINOR_NR]) == NULL) || 
 			((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
@@ -43,64 +38,62 @@ int can_open(struct inode *inode, struct file *file)
 		return -ENODEV;
 	}
 
-	if (objects_p[MINOR_NR]->flags & OPENED) {
-		CANMSG("Sorry, only single open per device file.\n");
-		return -EBUSY;
-	}
-	else
-		objects_p[MINOR_NR]->flags |= OPENED;
+	atomic_inc(&obj->obj_used);
+	DEBUGMSG("Device %d opened %d times.\n", MINOR_NR, atomic_read(&obj->obj_used));
+	obj->flags |= OBJ_OPENED;
 
-	if (chip->flags & CONFIGURED) 
+	if (chip->flags & CHIP_CONFIGURED) 
 		DEBUGMSG("Device is already configured.\n");
 	else {
 		if (chip->chipspecops->chip_config(chip))
 			CANMSG("Error configuring chip.\n");
 		else
-			chip->flags |= CONFIGURED; 
+			chip->flags |= CHIP_CONFIGURED; 
+
+		if (chip->chipspecops->pre_read_config(chip,obj)<0)
+			CANMSG("Error initializing chip for receiving\n");
+
+		/* chip->flags |= OBJ_BUFFERS_ALLOCATED; */
+		
 	} /* End of chip configuration */
 
-	/* Allocate output buffer memory for the opened device */
-	fifo = objects_p[MINOR_NR]->fifo;
-	fifo->buf_tx_entry=(struct canmsg_t *)kmalloc(MAX_BUF_LENGTH * sizeof(struct canmsg_t), GFP_KERNEL);
-	if (fifo->buf_tx_entry == NULL)
-		return -ENOMEM;
-	else
-		if ( add_mem_to_list(fifo->buf_tx_entry) )
-			return -ENOMEM;
-	/* Allocate input buffer memory for the opened device */
-	fifo->buf_rx_entry=(struct canmsg_t *)kmalloc(MAX_BUF_LENGTH * sizeof(struct canmsg_t), GFP_KERNEL);
-	if (fifo->buf_rx_entry == NULL)
-		return -ENOMEM;
-	else
-		if ( add_mem_to_list(fifo->buf_rx_entry) )
-			return -ENOMEM;
-
-	/* In- and output buffer 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
+	canuser = (struct canuser_t *)kmalloc(sizeof(struct canuser_t), GFP_KERNEL);
+	if(canuser == NULL) goto no_canuser;
+	canuser->file = file;
+	canuser->msgobj = obj;
+	canuser->magic = CAN_USER_MAGIC;
+	file->private_data = canuser;
 
-	fifo->rx_in_progress = 0;
-	fifo->tx_in_progress = 0;
+	qends = (struct canque_ends_t *)kmalloc(sizeof(struct canque_ends_t), GFP_KERNEL);
+	if(qends == NULL) goto no_qends;
+	canqueue_ends_init_kern(qends);
+	canuser->qends = qends;
+	
+	list_add(&canuser->peers, &obj->obj_users);
 
-	chip->flags |= BUFFERS_ALLOCATED;
+	if(canqueue_connect_edge(canque_new_edge_kern(MAX_BUF_LENGTH),
+		canuser->qends, obj->qends)<0) goto no_qedge;
+
+	if(canqueue_connect_edge(canuser->rx_edge0=canque_new_edge_kern(MAX_BUF_LENGTH),
+		obj->qends, canuser->qends)<0) goto no_qedge;
 
-	if (chip->chipspecops->pre_read_config(chip,obj)<0)
-		CANMSG("Error initializing chip for receiving\n");
-		
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,50))
 	MOD_INC_USE_COUNT;
 #endif	
+
 	return 0;
+	
+    no_qedge:
+	list_del(&canuser->peers);
+	canqueue_ends_done_kern(qends, 1);
+	canuser->qends = NULL;
+	kfree(qends);
+	obj->qends = NULL;
+
+    no_qends:
+	kfree(canuser);
+
+    no_canuser:
+	atomic_dec(&obj->obj_used);
+    	return -ENOMEM;
 }