diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-15 16:20:25 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-15 16:20:25 +0000 |
| commit | 3a3fe9efb1e3f0fe6a756b8e4d2fa48d5564137b (patch) | |
| tree | 13d2c82c982b760b250741f7167faf0d509ecbc4 /nuttx/arch/arm/src/stm32/stm32_tim.h | |
| parent | f1893cbaf513c7f0fbca77240fc59707ad039734 (diff) | |
| download | px4-nuttx-3a3fe9efb1e3f0fe6a756b8e4d2fa48d5564137b.tar.gz px4-nuttx-3a3fe9efb1e3f0fe6a756b8e4d2fa48d5564137b.tar.bz2 px4-nuttx-3a3fe9efb1e3f0fe6a756b8e4d2fa48d5564137b.zip | |
Add code changes from Uros
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3507 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_tim.h')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_tim.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_tim.h b/nuttx/arch/arm/src/stm32/stm32_tim.h index a35d0134b..1aa18328e 100644 --- a/nuttx/arch/arm/src/stm32/stm32_tim.h +++ b/nuttx/arch/arm/src/stm32/stm32_tim.h @@ -46,6 +46,19 @@ #include "chip.h" #include "chip/stm32_tim.h" +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif /************************************************************************************ * Public Types @@ -155,9 +168,16 @@ struct stm32_tim_ops_s { ************************************************************************************/ /** Power-up timer and get its structure */ -FAR struct stm32_tim_dev_s * stm32_tim_init(int timer); +EXTERN FAR struct stm32_tim_dev_s * stm32_tim_init(int timer); /** Power-down timer, mark it as unused */ -int stm32_tim_deinit(FAR struct stm32_tim_dev_s * dev); +EXTERN int stm32_tim_deinit(FAR struct stm32_tim_dev_s * dev); + + +#undef EXTERN +#if defined(__cplusplus) +} +#endif +#endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_SRC_STM32_STM32_TIM_H */ |