X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/dd8f5100e766813dca62a82c6b99ebf3648f2448..8d0fc60587eda616dc0697ba55a50cfe04edb3a6:/lincan/src/setup.c

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index 75ca0ef..c071b00 100644
--- a/lincan/src/setup.c
+++ b/lincan/src/setup.c
@@ -215,6 +215,29 @@ int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base)
 	return 0;
 }
 
+/**
+ * can_check_dev_taken - checks if bus device description is already taken by driver
+ * @anydev:	pointer to bus specific Linux device description 
+ *
+ * Returns: Returns 1 if device is already used by LinCAN driver, 0 otherwise.
+ */
+int can_check_dev_taken(void *anydev)
+{
+	int board_nr;
+	struct candevice_t *candev;
+	void *boarddev;
+
+	for (board_nr=hardware_p->nr_boards; board_nr--; ) {
+		if((candev=hardware_p->candevice[board_nr])==NULL)
+			continue;
+		boarddev=candev->sysdevptr.anydev;
+		if(boarddev == anydev)
+			return 1;
+	}
+	
+	return 0;
+}
+
 
 /**
  * register_obj_struct - registers message object into global array
@@ -443,6 +466,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr
 	chip->chipspecops=can_checked_malloc(sizeof(struct chipspecops_t));
 	if (chip->chipspecops==NULL)
 		return -ENOMEM;
+	memset(chip->chipspecops,0,sizeof(struct chipspecops_t));
 
 	chip->chip_idx=chipnr;
 	chip->hostdevice=candev;
@@ -587,11 +611,19 @@ int can_chip_setup_irq(struct chip_t *chip)
 	if(!chip->chipspecops->irq_handler)
 		return 0;
 			
-	if (request_irq(chip->chip_irq,chip->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chip))
-		return -1;
-	else {
-		DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);
-		chip->flags |= CHIP_IRQ_SETUP;
+	if ((chip->flags & CHIP_IRQ_VME) == 0) {
+		if (request_irq(chip->chip_irq,chip->chipspecops->irq_handler,SA_SHIRQ,DEVICE_NAME,chip))
+			return -1;
+		else {
+			DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);
+			chip->flags |= CHIP_IRQ_SETUP;
+		}
+	} else {
+#ifdef CAN_ENABLE_VME_SUPPORT		
+		/* TODO: Move here the irq setup from
+		 * unican_vme_request_io(). To do this, the VME bridge
+		 * driver should be modified. */
+#endif
 	}
 	return 1;
 }
@@ -604,8 +636,16 @@ int can_chip_setup_irq(struct chip_t *chip)
 void can_chip_free_irq(struct chip_t *chip)
 {
 	if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
-		free_irq(chip->chip_irq, chip);
-		chip->flags &= ~CHIP_IRQ_SETUP;
+		if ((chip->flags & CHIP_IRQ_VME) == 0)
+			free_irq(chip->chip_irq, chip);
+		else { 
+#ifdef CAN_ENABLE_VME_SUPPORT
+		/* TODO: Move here the irq cleanup from
+		 * unican_vme_release_io(). To do this, the VME bridge
+		 * driver should be modified. */
+#endif
+		}
+			chip->flags &= ~CHIP_IRQ_SETUP;
 	}
 }