embedded ul_usb1: adapt this board support to the lpc17xx changes.

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

diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c
index 6a7b8be8fcd5732d0d18736950d6d4f33ac13016..603168d1b9baff54cc00b67862c922dd2fb27d75 100644 (file)
--- a/embedded/app/usbcan/main.c
+++ b/embedded/app/usbcan/main.c
@@ -68,6 +68,7 @@
 #include "./usb/usb_vend.h"
 
 extern int can_lmc1_register(struct hwspecops_t *hwspecops);
 #include "./usb/usb_vend.h"
 
 extern int can_lmc1_register(struct hwspecops_t *hwspecops);

+extern int ul_usb1_register(struct hwspecops_t *hwspecops);

 
 #define MASK_EP1RX  0x01
 #define MASK_EP1TX  0x02
 
 #define MASK_EP1RX  0x01
 #define MASK_EP1TX  0x02


@@ -155,19 +156,6 @@ int sys_err(){
   }
 }
 
   }
 }
 

-/***********************************************************************
- * Microsecond delay routine
- ***********************************************************************/
-/*
-void udelay(long time)
-{
-  volatile long ticks=(time * CCLK) / 2000000;
-  do{
-    ticks--;
-  } while(ticks>0);
-}
-*/
-

 /***********************************************************************
  * Routine for visible LED blinking (on USB transmission)
  ***********************************************************************/
 /***********************************************************************
  * Routine for visible LED blinking (on USB transmission)
  ***********************************************************************/


@@ -262,10 +250,8 @@ int main(void)
 
        
 
 
        
 

-       // DEBUG
-       //ul_usb1_register(candev->hwspecops);  //(defined in ul_usb1.c)
-       // register for another board:
-       can_lmc1_register(candev->hwspecops);
+       ul_usb1_register(candev->hwspecops);
+//     can_lmc1_register(candev->hwspecops);