diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-01 09:21:13 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-01 09:21:13 -0600 |
| commit | 1a5060c28be4edffb32eabc2ad422254fcd72bb2 (patch) | |
| tree | 9bf1a6e1ae07bb2e94af5a32604ff1b8463b0ac3 /nuttx/arch/arm/src/stm32 | |
| parent | d9bd2fca774a5c3499f7b3a258aa1506fdea526f (diff) | |
| download | px4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.tar.gz px4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.tar.bz2 px4-nuttx-1a5060c28be4edffb32eabc2ad422254fcd72bb2.zip | |
Misc changes for clean built od mikroe-stm32f4 configurations
Diffstat (limited to 'nuttx/arch/arm/src/stm32')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_rcc.h | 24 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_rng.c | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_rcc.h b/nuttx/arch/arm/src/stm32/stm32_rcc.h index 6f7340539..01103fcac 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rcc.h +++ b/nuttx/arch/arm/src/stm32/stm32_rcc.h @@ -64,7 +64,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -208,7 +209,20 @@ static inline void stm32_mco2config(uint32_t source, uint32_t div) * ************************************************************************************/ -EXTERN void stm32_clockconfig(void); +void stm32_clockconfig(void); + +/************************************************************************************ + * Name: stm32_board_clockconfig + * + * Description: + * Any STM32 board may replace the "standard" board clock configuration logic with + * its own, custom clock cofiguration logic. + * + ************************************************************************************/ + +#ifdef CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG +void stm32_board_clockconfig(void); +#endif /************************************************************************************ * Name: stm32_clockenable @@ -236,7 +250,7 @@ EXTERN void stm32_clockconfig(void); ************************************************************************************/ #ifdef CONFIG_PM -EXTERN void stm32_clockenable(void); +void stm32_clockenable(void); #endif /************************************************************************************ @@ -254,7 +268,7 @@ EXTERN void stm32_clockenable(void); * ************************************************************************************/ -EXTERN void stm32_rcc_enablelse(void); +void stm32_rcc_enablelse(void); /**************************************************************************** * Name: stm32_rcc_enablelsi @@ -264,7 +278,7 @@ EXTERN void stm32_rcc_enablelse(void); * ****************************************************************************/ -EXTERN void stm32_rcc_enablelsi(void); +void stm32_rcc_enablelsi(void); #undef EXTERN #if defined(__cplusplus) diff --git a/nuttx/arch/arm/src/stm32/stm32_rng.c b/nuttx/arch/arm/src/stm32/stm32_rng.c index 38e8108fe..5a43bb512 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rng.c +++ b/nuttx/arch/arm/src/stm32/stm32_rng.c @@ -38,8 +38,9 @@ ****************************************************************************/ #include <stdint.h> -#include <stdio.h> #include <stdbool.h> +#include <stdio.h> +#include <string.h> #include <debug.h> #include <errno.h> diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index 4594c187e..4b5a9622a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -1612,8 +1612,10 @@ static int up_interrupt_common(struct up_dev_s *priv) static int up_ioctl(struct file *filep, int cmd, unsigned long arg) { +#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) struct inode *inode = filep->f_inode; struct uart_dev_s *dev = inode->i_private; +#endif #ifdef CONFIG_SERIAL_TERMIOS struct up_dev_s *priv = (struct up_dev_s*)dev->priv; #endif |