Added support for VME bus under RT Linux.

diff --git a/lincan/src/can_devrtl.c b/lincan/src/can_devrtl.c
index 25b8b482f8a9d7a0b57d7319835e512fb7b0a577..5db8b82e8ed298a50b92839d21f9ff73b3982dd4 100644 (file)
--- a/lincan/src/can_devrtl.c
+++ b/lincan/src/can_devrtl.c
@@ -16,6 +16,12 @@
 
 #include <rtl_malloc.h>
 
 
 #include <rtl_malloc.h>
 

+#ifdef CAN_ENABLE_VME_SUPPORT
+#include "ca91c042.h"
+/* Modified version of ca91c042 driver can be found in
+ * components/comm/contrib directory. */
+#endif
+

 can_spinlock_t can_irq_manipulation_lock;
 
 unsigned int can_rtl_isr( unsigned int irq_num, struct pt_regs *r )
 can_spinlock_t can_irq_manipulation_lock;
 
 unsigned int can_rtl_isr( unsigned int irq_num, struct pt_regs *r )


@@ -160,7 +166,15 @@ int can_chip_setup_irq(struct chip_t *chip)
        }
        
        if(chip->chipspecops->irq_handler){
        }
        
        if(chip->chipspecops->irq_handler){

-               if (rtl_request_irq(chip->chip_irq,can_rtl_isr))
+               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)
+                       my_request_irq = rtl_request_vmeirq;
+               else
+#endif
+                       my_request_irq = rtl_request_irq;
+
+               if (my_request_irq(chip->chip_irq,can_rtl_isr))

                        return -1;
                else {
                        DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);
                        return -1;
                else {
                        DEBUGMSG("Registered interrupt %d\n",chip->chip_irq);


@@ -179,7 +193,14 @@ void can_chip_free_irq(struct chip_t *chip)
        if(chip->worker_thread)
                pthread_delete_np(chip->worker_thread);
        if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {
        if(chip->worker_thread)
                pthread_delete_np(chip->worker_thread);
        if((chip->flags & CHIP_IRQ_SETUP) && (chip->chip_irq>=0)) {

-               rtl_free_irq(chip->chip_irq);
+               int (*my_free_irq)(unsigned int vector);
+#ifdef CAN_ENABLE_VME_SUPPORT
+               if ((chip->flags & CHIP_IRQ_VME) != 0)
+                       my_free_irq = rtl_free_vmeirq;
+               else
+#endif
+                       my_free_irq = rtl_free_irq;
+               my_free_irq(chip->chip_irq);

                chip->flags &= ~CHIP_IRQ_SETUP;
        }
 }
                chip->flags &= ~CHIP_IRQ_SETUP;
        }
 }