Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 05:16:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

STM32F3Discovery passes all OS tests; Delay loop has been calibrated

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5629 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-02-09 00:26:52 +00:00
parent 7ed910d7cd
commit 19c205e9da
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/stm32f3discovery/nsh/defconfig
+2 -2
View File
@@ -87,7 +87,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
# CONFIG_ARCH_FPU is not set # CONFIG_ARCH_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=6522
# CONFIG_ARCH_CALIBRATION is not set # CONFIG_ARCH_CALIBRATION is not set
# #
@@ -173,13 +173,13 @@ CONFIG_STM32_SYSCFG=y
# CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM2 is not set
# CONFIG_STM32_TIM3 is not set # CONFIG_STM32_TIM3 is not set
# CONFIG_STM32_TIM4 is not set # CONFIG_STM32_TIM4 is not set
# CONFIG_STM32_TIM5 is not set
# CONFIG_STM32_TIM6 is not set # CONFIG_STM32_TIM6 is not set
# CONFIG_STM32_TIM7 is not set # CONFIG_STM32_TIM7 is not set
# CONFIG_STM32_TIM8 is not set # CONFIG_STM32_TIM8 is not set
# CONFIG_STM32_TIM15 is not set # CONFIG_STM32_TIM15 is not set
# CONFIG_STM32_TIM16 is not set # CONFIG_STM32_TIM16 is not set
# CONFIG_STM32_TIM17 is not set # CONFIG_STM32_TIM17 is not set
# CONFIG_STM32_TSC is not set
# CONFIG_STM32_USART1 is not set # CONFIG_STM32_USART1 is not set
CONFIG_STM32_USART2=y CONFIG_STM32_USART2=y
CONFIG_STM32_USB=y CONFIG_STM32_USB=y
configs/stm32f3discovery/ostest/defconfig
+6 -3
View File
@@ -87,7 +87,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
# CONFIG_ARCH_FPU is not set # CONFIG_ARCH_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=6522
# CONFIG_ARCH_CALIBRATION is not set # CONFIG_ARCH_CALIBRATION is not set
# #
@@ -173,13 +173,13 @@ CONFIG_STM32_SYSCFG=y
# CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM2 is not set
# CONFIG_STM32_TIM3 is not set # CONFIG_STM32_TIM3 is not set
# CONFIG_STM32_TIM4 is not set # CONFIG_STM32_TIM4 is not set
# CONFIG_STM32_TIM5 is not set
# CONFIG_STM32_TIM6 is not set # CONFIG_STM32_TIM6 is not set
# CONFIG_STM32_TIM7 is not set # CONFIG_STM32_TIM7 is not set
# CONFIG_STM32_TIM8 is not set # CONFIG_STM32_TIM8 is not set
# CONFIG_STM32_TIM15 is not set # CONFIG_STM32_TIM15 is not set
# CONFIG_STM32_TIM16 is not set # CONFIG_STM32_TIM16 is not set
# CONFIG_STM32_TIM17 is not set # CONFIG_STM32_TIM17 is not set
# CONFIG_STM32_TSC is not set
# CONFIG_STM32_USART1 is not set # CONFIG_STM32_USART1 is not set
CONFIG_STM32_USART2=y CONFIG_STM32_USART2=y
# CONFIG_STM32_USB is not set # CONFIG_STM32_USB is not set
@@ -268,7 +268,9 @@ CONFIG_MSEC_PER_TICK=10
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
# CONFIG_SCHED_INSTRUMENTATION is not set # CONFIG_SCHED_INSTRUMENTATION is not set
CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_NAME_SIZE=0
# CONFIG_SCHED_HAVE_PARENT is not set CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_PREALLOC_CHILDSTATUS=0
# CONFIG_JULIAN_TIME is not set # CONFIG_JULIAN_TIME is not set
CONFIG_START_YEAR=2009 CONFIG_START_YEAR=2009
CONFIG_START_MONTH=9 CONFIG_START_MONTH=9
@@ -299,6 +301,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_SIG_SIGUSR1=1 CONFIG_SIG_SIGUSR1=1
CONFIG_SIG_SIGUSR2=2 CONFIG_SIG_SIGUSR2=2
CONFIG_SIG_SIGALARM=3 CONFIG_SIG_SIGALARM=3
CONFIG_SIG_SIGCHLD=4
CONFIG_SIG_SIGCONDTIMEDOUT=16 CONFIG_SIG_SIGCONDTIMEDOUT=16
# #
configs/stm32f3discovery/usbnsh/defconfig
+2 -2
View File
@@ -87,7 +87,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
# CONFIG_ARCH_FPU is not set # CONFIG_ARCH_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BOARD_LOOPSPERMSEC=6522
# CONFIG_ARCH_CALIBRATION is not set # CONFIG_ARCH_CALIBRATION is not set
# #
@@ -173,13 +173,13 @@ CONFIG_STM32_SYSCFG=y
# CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM2 is not set
# CONFIG_STM32_TIM3 is not set # CONFIG_STM32_TIM3 is not set
# CONFIG_STM32_TIM4 is not set # CONFIG_STM32_TIM4 is not set
# CONFIG_STM32_TIM5 is not set
# CONFIG_STM32_TIM6 is not set # CONFIG_STM32_TIM6 is not set
# CONFIG_STM32_TIM7 is not set # CONFIG_STM32_TIM7 is not set
# CONFIG_STM32_TIM8 is not set # CONFIG_STM32_TIM8 is not set
# CONFIG_STM32_TIM15 is not set # CONFIG_STM32_TIM15 is not set
# CONFIG_STM32_TIM16 is not set # CONFIG_STM32_TIM16 is not set
# CONFIG_STM32_TIM17 is not set # CONFIG_STM32_TIM17 is not set
# CONFIG_STM32_TSC is not set
# CONFIG_STM32_USART1 is not set # CONFIG_STM32_USART1 is not set
CONFIG_STM32_USART2=y CONFIG_STM32_USART2=y
CONFIG_STM32_USB=y CONFIG_STM32_USB=y
sched/sched_waitpid.c
+10 -4
View File
@@ -350,7 +350,9 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
} }
} }
} }
#else
#else /* CONFIG_SCHED_CHILD_STATUS */
if (rtcb->nchildren == 0) if (rtcb->nchildren == 0)
{ {
/* There are no children */ /* There are no children */
@@ -373,7 +375,8 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
goto errout_with_errno; goto errout_with_errno;
} }
} }
#endif
#endif /* CONFIG_SCHED_CHILD_STATUS */
/* Loop until the child that we are waiting for dies */ /* Loop until the child that we are waiting for dies */
@@ -455,7 +458,9 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
goto errout_with_errno; goto errout_with_errno;
} }
} }
#else
#else /* CONFIG_SCHED_CHILD_STATUS */
/* Check if the task has already died. Signals are not queued in /* Check if the task has already died. Signals are not queued in
* NuttX. So a possibility is that the child has died and we * NuttX. So a possibility is that the child has died and we
* missed the death of child signal (we got some other signal * missed the death of child signal (we got some other signal
@@ -473,7 +478,8 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
err = ECHILD; err = ECHILD;
goto errout_with_errno; goto errout_with_errno;
} }
#endif
#endif /* CONFIG_SCHED_CHILD_STATUS */
/* Wait for any death-of-child signal */ /* Wait for any death-of-child signal */