diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 12:24:15 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-26 12:24:15 +0100 |
| commit | bdc8b66149f27551b3df4315df18a936498f5aba (patch) | |
| tree | 69dfcf8d69f5f5d3909522e74bb7f522384e81b3 | |
| parent | ca32594c0a528ea1613a554c9dea58b03ca5228d (diff) | |
| parent | 35ded06e3b6891f7bd43566f0891603a600d5f02 (diff) | |
| download | px4-nuttx-bdc8b66149f27551b3df4315df18a936498f5aba.tar.gz px4-nuttx-bdc8b66149f27551b3df4315df18a936498f5aba.tar.bz2 px4-nuttx-bdc8b66149f27551b3df4315df18a936498f5aba.zip | |
Merge branch 'nuttx_bringup' of github.com:PX4/NuttX into nuttx_bringup_merged
| -rw-r--r-- | apps/system/cdcacm/cdcacm_main.c | 7 | ||||
| -rw-r--r-- | nuttx/arch/arm/include/limits.h | 3 | ||||
| -rw-r--r-- | nuttx/mm/mm_gran/mm_granrelease.c | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/apps/system/cdcacm/cdcacm_main.c b/apps/system/cdcacm/cdcacm_main.c index a9f8b504c..74abee696 100644 --- a/apps/system/cdcacm/cdcacm_main.c +++ b/apps/system/cdcacm/cdcacm_main.c @@ -122,14 +122,10 @@ int sercon_main(int argc, char *argv[]) * * Description: * This is a program entry point that will disconnect the CDC/ACM serial -#ifdef CONFIG_BUILD_KERNEL * device. -int main(int argc, FAR char **argv) * -#else ****************************************************************************/ - -#endif +#ifndef CONFIG_BUILD_KERNEL int serdis_main(int argc, char *argv[]) { /* First check if the USB mass storage device is already connected */ @@ -153,3 +149,4 @@ int serdis_main(int argc, char *argv[]) printf("serdis: Disconnected\n"); return EXIT_SUCCESS; } +#endif diff --git a/nuttx/arch/arm/include/limits.h b/nuttx/arch/arm/include/limits.h index 9502698fc..640db7e7b 100644 --- a/nuttx/arch/arm/include/limits.h +++ b/nuttx/arch/arm/include/limits.h @@ -67,9 +67,6 @@ #define INT_MAX 2147483647 #define UINT_MAX 4294967295U -#define INT_FAST32_MIN INT_MIN -#define INT_FAST32_MAX INT_MAX - /* These change on 32-bit and 64-bit platforms */ #define LONG_MIN (-LONG_MAX - 1) diff --git a/nuttx/mm/mm_gran/mm_granrelease.c b/nuttx/mm/mm_gran/mm_granrelease.c index a7b8c25a0..dfe575f5c 100644 --- a/nuttx/mm/mm_gran/mm_granrelease.c +++ b/nuttx/mm/mm_gran/mm_granrelease.c @@ -84,7 +84,9 @@ FAR struct gran_s *g_graninfo; static inline void gran_release_common(FAR struct gran_s *priv) { DEBUGASSERT(priv); + #ifndef CONFIG_GRAN_INTR sem_destroy(&priv->exclsem); + #endif kmm_free(priv); } |