embedded: reintroduce missing emulated bus initialization for UL_USB1 board.

[lincan.git] / embedded / app / usbcan / main.c

diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c
index 603168d1b9baff54cc00b67862c922dd2fb27d75..14fbe288e98c5eb5bf7b1b3c841e744a49dcb951 100644 (file)
--- a/embedded/app/usbcan/main.c
+++ b/embedded/app/usbcan/main.c
@@ -218,10 +218,6 @@ int main(void)
        // * CAN device initialization - device side (adapted from LinCAN setup.c)
        // ***********************************************************************
 
-//     useless with lpc17xx (defined in can_lpcbusemu.c)
-//     can_init();
-
-
        DEBUGMSG("Initiating CAN device initialization\n");
        baudrate[0]=1000;
 
@@ -250,10 +246,12 @@ int main(void)
 
        
 
+#ifdef CONFIG_OC_LINCAN_CARD_ul_usb1
        ul_usb1_register(candev->hwspecops);
-//     can_lmc1_register(candev->hwspecops);
-
-       
+#endif
+#ifdef CONFIG_OC_LINCAN_CARD_can_lmc1
+       can_lmc1_register(candev->hwspecops);
+#endif
 
        bd=baudrate[0];
        if (candev->hwspecops->init_hw_data(candev)){
@@ -286,13 +284,17 @@ int main(void)
        }
 
 
-       if (candev->hwspecops->request_io(candev))
+       if (candev->hwspecops->request_io(candev)) {
+               CANMSG("Error to request IO\n");
                sys_err();
+       }
        candev->flags|=CANDEV_IO_RESERVED;
 
 
-       if (candev->hwspecops->reset(candev))
+       if (candev->hwspecops->reset(candev)) {
+               CANMSG("Error to reset chip\n");
                sys_err();
+       }
 
 
        for(chipnr=0; chipnr<candev->nr_all_chips; chipnr++) {
@@ -414,9 +416,11 @@ int main(void)
                usb_check_events(&usb_device);
                usb_control_response(&usb_device);
 
-// useless with lpc17xx:
-//             if (!(IO0PIN&P0_SJA1000_INT_PIN)) //INT PIN is inverted
-//                     chip->chipspecops->irq_handler(0,chip);
+#ifdef CONFIG_OC_LINCAN_CARD_ul_usb1
+               /* polled IRQ mode for ul_usb1 board*/
+               if (!(IO0PIN&P0_SJA1000_INT_PIN)) /* INT PIN is inverted */
+                       chip->chipspecops->irq_handler(0,chip);
+#endif
 
                if (usb_device.ep_events & MASK_EP1RX) {  //EP1RX - data waiting to receive