sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

last change alters semantics of __HAVE_KERNEL_GLOBALS

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-30 14:44:48 -06:00
parent 2029236ed0
commit fc7bd31e07
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nuttx/clock.h
View File

@ -69,8 +69,6 @@
#if defined(CONFIG_SCHED_TICKLESS) #if defined(CONFIG_SCHED_TICKLESS)
/* Case 1: There is no global timer data */ /* Case 1: There is no global timer data */
# define __HAVE_KERNEL_GLOBALS 0
#elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) #elif defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)
/* Case 3: Kernel mode of protected kernel build */ /* Case 3: Kernel mode of protected kernel build */
@ -84,8 +82,6 @@
#elif defined(CONFIG_LIB_SYSCALL) #elif defined(CONFIG_LIB_SYSCALL)
/* Case 4: Building with SYSCALLs enabled, but not part of a kernel build */ /* Case 4: Building with SYSCALLs enabled, but not part of a kernel build */
# define __HAVE_KERNEL_GLOBALS 0
#else #else
/* Case 2: Un-protected, non-kernel build */ /* Case 2: Un-protected, non-kernel build */
@ -192,7 +188,7 @@ struct cpuload_s
* access to kernel global data * access to kernel global data
*/ */
#if __HAVE_KERNEL_GLOBALS #ifdef __HAVE_KERNEL_GLOBALS
# ifdef CONFIG_SYSTEM_TIME64 # ifdef CONFIG_SYSTEM_TIME64
extern volatile uint64_t g_system_timer; extern volatile uint64_t g_system_timer;
@ -270,7 +266,7 @@ void clock_synchronize(void);
* *
****************************************************************************/ ****************************************************************************/
#if !__HAVE_KERNEL_GLOBALS #ifndef __HAVE_KERNEL_GLOBALS
# ifdef CONFIG_SYSTEM_TIME64 # ifdef CONFIG_SYSTEM_TIME64
# define clock_systimer() (uint32_t)(clock_systimer64() & 0x00000000ffffffff) # define clock_systimer() (uint32_t)(clock_systimer64() & 0x00000000ffffffff)
# else # else
@ -297,7 +293,7 @@ uint32_t clock_systimer(void);
* *
****************************************************************************/ ****************************************************************************/
#if !__HAVE_KERNEL_GLOBALS && defined(CONFIG_SYSTEM_TIME64) #if !defined(__HAVE_KERNEL_GLOBALS) && defined(CONFIG_SYSTEM_TIME64)
uint64_t clock_systimer64(void); uint64_t clock_systimer64(void);
#endif #endif

2
sched/clock/clock.h
View File

@ -66,7 +66,7 @@
/******************************************************************************** /********************************************************************************
* Global Variables * Global Variables
********************************************************************************/ ********************************************************************************/
#if !defined(CONFIG_SCHED_TICKLESS) && __HAVE_KERNEL_GLOBALS == 0 #if !defined(CONFIG_SCHED_TICKLESS) && !defined(__HAVE_KERNEL_GLOBALS)
/* The system clock exists (CONFIG_SCHED_TICKLESS), but it not prototyped /* The system clock exists (CONFIG_SCHED_TICKLESS), but it not prototyped
* globally in include/nuttx/clock.h. * globally in include/nuttx/clock.h.
*/ */