From 84cdbc3fef89b0d49dc9efb9d5591e7469cab0e1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Jul 2011 17:14:27 +0000 Subject: [PATCH] Change for clean compilation of Sure PIC32MX configuration git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3742 42af7a65-404d-4744-a932-0658087f49c3 --- arch/mips/src/pic32mx/pic32mx-config.h | 2 +- arch/mips/src/pic32mx/pic32mx-lowconsole.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/mips/src/pic32mx/pic32mx-config.h b/arch/mips/src/pic32mx/pic32mx-config.h index 870775cfd9e..fcf4f3e5a61 100755 --- a/arch/mips/src/pic32mx/pic32mx-config.h +++ b/arch/mips/src/pic32mx/pic32mx-config.h @@ -511,7 +511,7 @@ /* Are any UARTs enabled? */ #undef HAVE_UART_DEVICE -#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART1) +#if defined(CONFIG_PIC32MX_UART1) || defined(CONFIG_PIC32MX_UART2) # define HAVE_UART_DEVICE 1 #endif diff --git a/arch/mips/src/pic32mx/pic32mx-lowconsole.c b/arch/mips/src/pic32mx/pic32mx-lowconsole.c index b3286715d2a..5498e22358d 100644 --- a/arch/mips/src/pic32mx/pic32mx-lowconsole.c +++ b/arch/mips/src/pic32mx/pic32mx-lowconsole.c @@ -63,12 +63,12 @@ # define PIC32MX_CONSOLE_BITS CONFIG_UART1_BITS # define PIC32MX_CONSOLE_PARITY CONFIG_UART1_PARITY # define PIC32MX_CONSOLE_2STOP CONFIG_UART1_2STOP -#elif defined(CONFIG_UART_SERIAL_CONSOLE) -# define PIC32MX_CONSOLE_BASE PIC32MX_UART_K1BASE -# define PIC32MX_CONSOLE_BAUD CONFIG_UART_BAUD -# define PIC32MX_CONSOLE_BITS CONFIG_UART_BITS -# define PIC32MX_CONSOLE_PARITY CONFIG_UART_PARITY -# define PIC32MX_CONSOLE_2STOP CONFIG_UART_2STOP +#elif defined(CONFIG_UART2_SERIAL_CONSOLE) +# define PIC32MX_CONSOLE_BASE PIC32MX_UART2_K1BASE +# define PIC32MX_CONSOLE_BAUD CONFIG_UART2_BAUD +# define PIC32MX_CONSOLE_BITS CONFIG_UART2_BITS +# define PIC32MX_CONSOLE_PARITY CONFIG_UART2_PARITY +# define PIC32MX_CONSOLE_2STOP CONFIG_UART2_2STOP #else # error "No CONFIG_UARTn_SERIAL_CONSOLE Setting" #endif