diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-30 18:01:46 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-30 18:01:46 -0600 |
| commit | dff7907143cfee8516740fb25343e584b445cd51 (patch) | |
| tree | 514f63272737c523f3668822fdc7cc2c0cdff973 /nuttx | |
| parent | 21850b97f9713421ae1b45ed68595824ec5eb402 (diff) | |
| download | px4-nuttx-dff7907143cfee8516740fb25343e584b445cd51.tar.gz px4-nuttx-dff7907143cfee8516740fb25343e584b445cd51.tar.bz2 px4-nuttx-dff7907143cfee8516740fb25343e584b445cd51.zip | |
EFM32: Changes picked up from Pierre's repository
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/efm32/efm32_serial.c | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/efm32/efm32_spi.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/efm32/efm32_serial.c b/nuttx/arch/arm/src/efm32/efm32_serial.c index c8f4ce025..06e16af93 100644 --- a/nuttx/arch/arm/src/efm32/efm32_serial.c +++ b/nuttx/arch/arm/src/efm32/efm32_serial.c @@ -240,7 +240,9 @@ static inline void efm32_serialout(struct efm32_usart_s *priv, int offset, static inline void efm32_setuartint(struct efm32_usart_s *priv); static void efm32_restoreuartint(struct efm32_usart_s *priv, uint32_t ien); +#ifdef HAVE_UART_CONSOLE static void efm32_disableuartint(struct efm32_usart_s *priv, uint32_t *ien); +#endif static int efm32_setup(struct uart_dev_s *dev); static void efm32_shutdown(struct uart_dev_s *dev); static int efm32_attach(struct uart_dev_s *dev); @@ -574,6 +576,7 @@ static void efm32_restoreuartint(struct efm32_usart_s *priv, uint32_t ien) * Name: efm32_disableuartint ****************************************************************************/ +#ifdef HAVE_UART_CONSOLE static void efm32_disableuartint(struct efm32_usart_s *priv, uint32_t *ien) { irqstate_t flags; @@ -587,6 +590,7 @@ static void efm32_disableuartint(struct efm32_usart_s *priv, uint32_t *ien) efm32_restoreuartint(priv, 0); irqrestore(flags); } +#endif /**************************************************************************** * Name: efm32_setup @@ -1125,6 +1129,7 @@ static bool efm32_txempty(struct uart_dev_s *dev) * ****************************************************************************/ +#ifdef USE_EARLYSERIALINIT void up_earlyserialinit(void) { /* Disable interrupts from all UARTS. The console is enabled in @@ -1152,6 +1157,7 @@ void up_earlyserialinit(void) efm32_setup(&CONSOLE_DEV); #endif } +#endif /**************************************************************************** * Name: up_serialinit diff --git a/nuttx/arch/arm/src/efm32/efm32_spi.c b/nuttx/arch/arm/src/efm32/efm32_spi.c index 9a5fc1f59..6a427281b 100644 --- a/nuttx/arch/arm/src/efm32/efm32_spi.c +++ b/nuttx/arch/arm/src/efm32/efm32_spi.c @@ -60,6 +60,7 @@ #include "up_arch.h" #include "chip.h" +#include "chip/efm32_usart.h" #include "efm32_config.h" #include "efm32_dma.h" #include "efm32_lowputc.h" |