diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-05 13:20:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-05 13:20:26 +0000 |
| commit | 8519cad9b7e4d81618d367bea59fb82ded5a07dc (patch) | |
| tree | f4b9da79dea469aa7eabef34aafc62106bf091e9 | |
| parent | d3a3e1db2f4dfa927b1304c8ea810ad131675e83 (diff) | |
| download | px4-nuttx-8519cad9b7e4d81618d367bea59fb82ded5a07dc.tar.gz px4-nuttx-8519cad9b7e4d81618d367bea59fb82ded5a07dc.tar.bz2 px4-nuttx-8519cad9b7e4d81618d367bea59fb82ded5a07dc.zip | |
Updated Open1788 calibration; More compilation fixes from Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5707 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/configs/open1788/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/open1788/ostest/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/include/syslog.h | 1 | ||||
| -rw-r--r-- | nuttx/sched/task_restart.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/configs/open1788/nsh/defconfig b/nuttx/configs/open1788/nsh/defconfig index 70e98e55d..c04baba60 100644 --- a/nuttx/configs/open1788/nsh/defconfig +++ b/nuttx/configs/open1788/nsh/defconfig @@ -223,7 +223,7 @@ CONFIG_ARCH_STACKDUMP=y # # Board Settings # -CONFIG_BOARD_LOOPSPERMSEC=8079 +CONFIG_BOARD_LOOPSPERMSEC=11852 # CONFIG_ARCH_CALIBRATION is not set CONFIG_DRAM_START=0x10000000 CONFIG_DRAM_SIZE=65536 diff --git a/nuttx/configs/open1788/ostest/defconfig b/nuttx/configs/open1788/ostest/defconfig index 4bfad0963..1d85df4af 100644 --- a/nuttx/configs/open1788/ostest/defconfig +++ b/nuttx/configs/open1788/ostest/defconfig @@ -223,7 +223,7 @@ CONFIG_ARCH_STACKDUMP=y # # Board Settings # -CONFIG_BOARD_LOOPSPERMSEC=8079 +CONFIG_BOARD_LOOPSPERMSEC=11852 # CONFIG_ARCH_CALIBRATION is not set CONFIG_DRAM_START=0x10000000 CONFIG_DRAM_SIZE=65536 diff --git a/nuttx/include/syslog.h b/nuttx/include/syslog.h index cfb2db97b..d033e06c2 100644 --- a/nuttx/include/syslog.h +++ b/nuttx/include/syslog.h @@ -44,6 +44,7 @@ #include <stdint.h> #include <stdarg.h> +#include <stdbool.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/sched/task_restart.c b/nuttx/sched/task_restart.c index 5f3d80156..27bc4fc47 100644 --- a/nuttx/sched/task_restart.c +++ b/nuttx/sched/task_restart.c @@ -177,7 +177,7 @@ int task_restart(pid_t pid) #ifdef CONFIG_PRIORITY_INHERITANCE tcb->cmn.base_priority = tcb->init_priority; # if CONFIG_SEM_NNESTPRIO > 0 - tcb->npend_reprio = 0; + tcb->cmn.npend_reprio = 0; # endif #endif |