sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Misc changes for clean built od mikroe-stm32f4 configurations

Browse Source
This commit is contained in:
Gregory Nutt 2013-05-01 09:21:13 -06:00
parent efbe6f2b07
commit 180189050b
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/src/stm32/stm32_rcc.h
View File

@ -64,7 +64,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #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 * Name: stm32_clockenable
@ -236,7 +250,7 @@ EXTERN void stm32_clockconfig(void);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_PM #ifdef CONFIG_PM
EXTERN void stm32_clockenable(void); void stm32_clockenable(void);
#endif #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 * 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 #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)

3
arch/arm/src/stm32/stm32_rng.c
View File

@ -38,8 +38,9 @@
****************************************************************************/ ****************************************************************************/
#include <stdint.h> #include <stdint.h>
#include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>

2
arch/arm/src/stm32/stm32_serial.c
View File

@ -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) 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 inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private; struct uart_dev_s *dev = inode->i_private;
#endif
#ifdef CONFIG_SERIAL_TERMIOS #ifdef CONFIG_SERIAL_TERMIOS
struct up_dev_s *priv = (struct up_dev_s*)dev->priv; struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
#endif #endif