aboutsummaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-08-27 07:25:05 +0200
committerLorenz Meier <lm@inf.ethz.ch>2012-08-27 07:25:05 +0200
commit58b51743f2886120062056a12f9f52ef0e77653a (patch)
tree24f620766043e5b133f8c818e5431041f5545055 /apps/examples
parent2963dc679a63309a7b26da1677208fbdb4aec146 (diff)
parent4636d41390d0e8afa80da3f9a53600a80ed672bf (diff)
downloadpx4-firmware-58b51743f2886120062056a12f9f52ef0e77653a.tar.gz
px4-firmware-58b51743f2886120062056a12f9f52ef0e77653a.tar.bz2
px4-firmware-58b51743f2886120062056a12f9f52ef0e77653a.zip
Merge branch 'master' of github.com:PX4/Firmware into px4dev_new_driver_wip
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/ostest/prioinherit.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/examples/ostest/prioinherit.c b/apps/examples/ostest/prioinherit.c
index 993c9e14a..87849abcf 100644
--- a/apps/examples/ostest/prioinherit.c
+++ b/apps/examples/ostest/prioinherit.c
@@ -58,12 +58,22 @@
#ifndef CONFIG_SEM_PREALLOCHOLDERS
# define CONFIG_SEM_PREALLOCHOLDERS 0
#endif
-#define NLOWPRI_THREADS (CONFIG_SEM_PREALLOCHOLDERS+1)
+
+#if CONFIG_SEM_PREALLOCHOLDERS > 3
+# define NLOWPRI_THREADS 3
+#else
+# define NLOWPRI_THREADS (CONFIG_SEM_PREALLOCHOLDERS+1)
+#endif
#ifndef CONFIG_SEM_NNESTPRIO
# define CONFIG_SEM_NNESTPRIO 0
#endif
-#define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1)
+
+#if CONFIG_SEM_NNESTPRIO > 3
+# define NHIGHPRI_THREADS 3
+#else
+# define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1)
+#endif
/****************************************************************************
* Private Data