diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-20 14:12:52 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-20 14:12:52 +0000 |
| commit | 2c6eb1d98e93b702ab5fe8dbfd69b9ed95d79843 (patch) | |
| tree | 082db98ee6eb57d6da6ba9c3bf8ad630efbfbe4f /nuttx/include | |
| parent | fb0960f36c48d3dc2e21d3f5193788f23b6bfa48 (diff) | |
| download | px4-nuttx-2c6eb1d98e93b702ab5fe8dbfd69b9ed95d79843.tar.gz px4-nuttx-2c6eb1d98e93b702ab5fe8dbfd69b9ed95d79843.tar.bz2 px4-nuttx-2c6eb1d98e93b702ab5fe8dbfd69b9ed95d79843.zip | |
Rename uptime to UTC
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3528 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/clock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/include/nuttx/clock.h b/nuttx/include/nuttx/clock.h index 62bc29910..cde1dd2db 100644 --- a/nuttx/include/nuttx/clock.h +++ b/nuttx/include/nuttx/clock.h @@ -127,14 +127,14 @@ #if __HAVE_KERNEL_GLOBALS extern volatile uint32_t g_system_timer; -extern volatile uint32_t g_uptime; +extern volatile uint32_t g_system_utc; #endif #if !defined(CONFIG_RTC) && __HAVE_KERNEL_GLOBALS #define clock_systimer() g_system_timer -#if defined(CONFIG_UPTIME) -#define clock_uptime() g_uptime +#if defined(CONFIG_SYSTEM_UTC) +#define clock_getutc() g_system_utc #endif #endif @@ -174,7 +174,7 @@ EXTERN uint32_t clock_systimer(void); #endif /**************************************************************************** - * Function: clock_uptime + * Function: clock_getutc * * Description: * Return the current value of the system timer counter, which is only @@ -190,8 +190,8 @@ EXTERN uint32_t clock_systimer(void); * ****************************************************************************/ -#if defined(CONFIG_UPTIME) && !__HAVE_KERNEL_GLOBALS -EXTERN time_t clock_uptime(void); +#if defined(CONFIG_SYSTEM_UTC) && !__HAVE_KERNEL_GLOBALS +EXTERN time_t clock_getutc(void); #endif #undef EXTERN |