X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/95c031e101c74ae6472a7e538f3128f67a490082..fd883ff8b15778611731b6e7c9cdacb5470c3901:/lincan/src/can_devrtl.c

diff --git a/lincan/src/can_devrtl.c b/lincan/src/can_devrtl.c
index 4557531..c7ff970 100644
--- a/lincan/src/can_devrtl.c
+++ b/lincan/src/can_devrtl.c
@@ -31,6 +31,7 @@ unsigned int can_rtl_isr( unsigned int irq_num, struct pt_regs *r )
 	int board_nr;
 	int chip_nr;
 	int irq2linux=0;
+	int ret;
 	pthread_t thread=NULL;
 
 	DEBUGMSG("can_rtl_isr invoked for irq %d\n",irq_num);
@@ -44,6 +45,9 @@ unsigned int can_rtl_isr( unsigned int irq_num, struct pt_regs *r )
 				continue;
 			if(chip->chip_irq!=irq_num) continue;
 
+			if(chip->chipspecops->irq_accept)
+				ret=chip->chipspecops->irq_accept(chip->chip_irq,chip);
+
 			set_bit(MSGOBJ_IRQ_REQUEST_b,&chip->pend_flags);
 			set_bit(MSGOBJ_WORKER_WAKE_b,&chip->pend_flags);
 			if(chip->flags & CHIP_IRQ_PCI)
@@ -135,9 +139,17 @@ void * can_chip_worker_thread(void *arg)
 		if(chip->chip_irq>=0) {
 			if ((chip->flags & CHIP_IRQ_VME) == 0) can_enable_irq(chip->chip_irq);
 		    #ifdef CAN_ENABLE_VME_SUPPORT
-			else tundra_rtl_enable_pci_irq(); 
+		      #if 0
+			else tundra_rtl_enable_pci_irq();
+		      #endif
 			/* FIXME: Bad practice. Doesn't work with more
-			 * than one card. */
+			 * than one card.
+			 *
+			 * irq_accept added to the LinCAN driver now,
+			 * and above workaround should not be required.
+			 * Enable rtl_hard_enable_irq() at line 
+			 * ca91c042.c:1045
+			 */
 		    #endif /*CAN_ENABLE_VME_SUPPORT*/
 
 		}
@@ -172,7 +184,7 @@ int can_chip_setup_irq(struct canchip_t *chip)
 		attrib_p=&attrib;
 	}
 	
-	if(chip->chipspecops->irq_handler){
+	if(chip->chipspecops->irq_handler && !(chip->flags & CHIP_IRQ_CUSTOM)){
 		int (*my_request_irq)(unsigned int vector, unsigned int (*rtl_handler)(unsigned int irq, struct pt_regs *regs));
 #ifdef CAN_ENABLE_VME_SUPPORT
 		if ((chip->flags & CHIP_IRQ_VME) != 0)
@@ -199,7 +211,8 @@ void can_chip_free_irq(struct canchip_t *chip)
 {
 	if(chip->worker_thread)
 		pthread_delete_np(chip->worker_thread);
-	if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
+	if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)
+	    && !(chip->flags & CHIP_IRQ_CUSTOM)) {
 		int (*my_free_irq)(unsigned int vector);
 #ifdef CAN_ENABLE_VME_SUPPORT
 		if ((chip->flags & CHIP_IRQ_VME) != 0)