Embedded code-base updated to actual version from uLan repository.

[lincan.git] / embedded / board / arm / ul_usb1 / libs / bspbase / bsp0hwinit.c

diff --git a/embedded/board/arm/ul_usb1/libs/bspbase/bsp0hwinit.c b/embedded/board/arm/ul_usb1/libs/bspbase/bsp0hwinit.c
index eceffb4b99ed8858c2c88fee22a46e48969c6385..468e1720372f0b531294c4a3cb6e7e787094f77a 100644 (file)
--- a/embedded/board/arm/ul_usb1/libs/bspbase/bsp0hwinit.c
+++ b/embedded/board/arm/ul_usb1/libs/bspbase/bsp0hwinit.c
@@ -88,7 +88,7 @@ void timerInit(void)
 
 #ifdef CONFIG_STDIO_COM_PORT
 
 
 #ifdef CONFIG_STDIO_COM_PORT
 

-int uartcon_write(int file, char * ptr, int len)
+int uartcon_write(int file, const char * ptr, int len)

 {
   int cnt;
   unsigned char ch;
 {
   int cnt;
   unsigned char ch;


@@ -269,7 +269,9 @@ int uLanInit()
             UL_DRV_SYSLESS_BAUD,           /* baud */
             UL_DRV_SYSLESS_MY_ADR_DEFAULT, /* my adr */
        #ifdef CONFIG_OC_UL_DRV_U450_VARPINS
             UL_DRV_SYSLESS_BAUD,           /* baud */
             UL_DRV_SYSLESS_MY_ADR_DEFAULT, /* my adr */
        #ifdef CONFIG_OC_UL_DRV_U450_VARPINS

-         #ifdef CONFIG_OC_UL_DRV_U450_VARPINS_MSRSWAP
+         #if defined(CONFIG_OC_UL_DRV_U450_VARPINS_DIRNEG) && defined(CONFIG_OC_UL_DRV_U450_VARPINS_MSRSWAP)
+            "16450-dirneg-msrswap",        /* chip name */
+         #elif defined(CONFIG_OC_UL_DRV_U450_VARPINS_MSRSWAP)

             "16450-msrswap",               /* chip name */
          #elif defined(CONFIG_OC_UL_DRV_U450_VARPINS_DIRNEG)
             "16450-dirneg",                /* chip name */
             "16450-msrswap",               /* chip name */
          #elif defined(CONFIG_OC_UL_DRV_U450_VARPINS_DIRNEG)
             "16450-dirneg",                /* chip name */