X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/f8d7cde0d035f087f39c8076061bd8ef608e14f4..b2be2bbd665328f4ec3dc14d7d84fdbac4c58e11:/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 eceffb4..468e172 100644
--- 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
 
-int uartcon_write(int file, char * ptr, int len)
+int uartcon_write(int file, const char * ptr, int len)
 {
   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
-	  #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 */