diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-10 16:18:47 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-10 16:18:47 -0600 |
| commit | f69e5feff2e1d8d7e73f662c73ed02122bce4eee (patch) | |
| tree | 407b3451ce2eb11bcadd2a70c4187d10398bf002 /nuttx/arch/arm/src/sam34/sam_lowputc.c | |
| parent | 72f47272ac7ff5b035b1a9ece54fa1305f03250c (diff) | |
| download | px4-nuttx-f69e5feff2e1d8d7e73f662c73ed02122bce4eee.tar.gz px4-nuttx-f69e5feff2e1d8d7e73f662c73ed02122bce4eee.tar.bz2 px4-nuttx-f69e5feff2e1d8d7e73f662c73ed02122bce4eee.zip | |
SAM4S: Add memory map and interrupt logic
Diffstat (limited to 'nuttx/arch/arm/src/sam34/sam_lowputc.c')
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_lowputc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam_lowputc.c b/nuttx/arch/arm/src/sam34/sam_lowputc.c index 53fe8fae7..8add13587 100644 --- a/nuttx/arch/arm/src/sam34/sam_lowputc.c +++ b/nuttx/arch/arm/src/sam34/sam_lowputc.c @@ -87,7 +87,7 @@ /* Is there a serial console? It could be on the UART, or USARTn */ -#if defined(CONFIG_UART_SERIAL_CONSOLE) && defined(CONFIG_SAM34_UART) +#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_SAM34_UART0) # undef CONFIG_USART0_SERIAL_CONSOLE # undef CONFIG_USART1_SERIAL_CONSOLE # undef CONFIG_USART2_SERIAL_CONSOLE @@ -145,12 +145,12 @@ /* Select USART parameters for the selected console */ -#if defined(CONFIG_UART_SERIAL_CONSOLE) -# define SAM_CONSOLE_BASE SAM_UART_BASE -# define SAM_CONSOLE_BAUD CONFIG_UART_BAUD -# define SAM_CONSOLE_BITS CONFIG_UART_BITS -# define SAM_CONSOLE_PARITY CONFIG_UART_PARITY -# define SAM_CONSOLE_2STOP CONFIG_UART_2STOP +#if defined(CONFIG_UART0_SERIAL_CONSOLE) +# define SAM_CONSOLE_BASE SAM_UART0_BASE +# define SAM_CONSOLE_BAUD CONFIG_UART0_BAUD +# define SAM_CONSOLE_BITS CONFIG_UART0_BITS +# define SAM_CONSOLE_PARITY CONFIG_UART0_PARITY +# define SAM_CONSOLE_2STOP CONFIG_UART0_2STOP #elif defined(CONFIG_USART0_SERIAL_CONSOLE) # define SAM_CONSOLE_BASE SAM_USART0_BASE # define SAM_CONSOLE_BAUD CONFIG_USART0_BAUD @@ -269,7 +269,7 @@ void sam_lowsetup(void) { /* Enable clocking for all selected UART/USARTs */ -#ifdef CONFIG_SAM34_UART +#ifdef CONFIG_SAM34_UART0 sam_uart_enableclk(); #endif #ifdef CONFIG_SAM34_USART0 @@ -287,7 +287,7 @@ void sam_lowsetup(void) /* Configure UART pins for all selected UART/USARTs */ -#ifdef CONFIG_SAM34_UART +#ifdef CONFIG_SAM34_UART0 (void)sam_configgpio(GPIO_UART_RXD); (void)sam_configgpio(GPIO_UART_TXD); #endif |