embedded: reintroduce missing emulated bus initialization for UL_USB1 board.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c
index 873f4c6d8d2365cf1b18e452dfc6dec40ee534ba..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)
        // ***********************************************************************
 
        // * 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;
 
        DEBUGMSG("Initiating CAN device initialization\n");
        baudrate[0]=1000;
 


@@ -288,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();
                sys_err();

+       }

        candev->flags|=CANDEV_IO_RESERVED;
 
 
        candev->flags|=CANDEV_IO_RESERVED;
 
 

-       if (candev->hwspecops->reset(candev))
+       if (candev->hwspecops->reset(candev)) {
+               CANMSG("Error to reset chip\n");

                sys_err();
                sys_err();

+       }

 
 
        for(chipnr=0; chipnr<candev->nr_all_chips; chipnr++) {
 
 
        for(chipnr=0; chipnr<candev->nr_all_chips; chipnr++) {

diff --git a/embedded/app/usbcan/ul_usb1.c b/embedded/app/usbcan/ul_usb1.c
index 8314d28562296c685af7519339917620df229796..36e1c621103f22b57a8656791439a20546baa32a 100644 (file)
--- a/embedded/app/usbcan/ul_usb1.c
+++ b/embedded/app/usbcan/ul_usb1.c
@@ -120,7 +120,7 @@ int ul_usb1_release_io(struct candevice_t *candev)
  */
 int ul_usb1_reset(struct candevice_t *candev)
 {
  */
 int ul_usb1_reset(struct candevice_t *candev)
 {

-       return 0;
+       return can_init();

 }
 
 #define RESET_ADDR 0x0
 }
 
 #define RESET_ADDR 0x0