diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-03 18:50:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-03 18:50:53 +0000 |
commit | 6be41fe54a04032f4516c5eb8a84bf5407cc55ee (patch) | |
tree | a941a51bab76f305d4226c9380be58eeb60f07e8 /nuttx/sched | |
parent | 50d3ff39d4557cda87194c7b11ac76429bd1bf2a (diff) | |
download | px4-nuttx-6be41fe54a04032f4516c5eb8a84bf5407cc55ee.tar.gz px4-nuttx-6be41fe54a04032f4516c5eb8a84bf5407cc55ee.tar.bz2 px4-nuttx-6be41fe54a04032f4516c5eb8a84bf5407cc55ee.zip |
Fix typos that cause compilations errors with CONFIG_RTC
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4015 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched')
-rw-r--r-- | nuttx/sched/clock_gettime.c | 4 | ||||
-rw-r--r-- | nuttx/sched/clock_settime.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/sched/clock_gettime.c b/nuttx/sched/clock_gettime.c index 9a84d320f..341b4bed9 100644 --- a/nuttx/sched/clock_gettime.c +++ b/nuttx/sched/clock_gettime.c @@ -111,7 +111,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) */ #ifdef CONFIG_RTC - if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME) + if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME) #else if (clock_id == CLOCK_REALTIME) #endif @@ -119,7 +119,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) /* Do we have a high-resolution RTC that can provie us with the time? */ #ifdef CONFIG_RTC_HIRES - if (g_rtc_enabled && clockid != CLOCK_ACTIVETIME) + if (g_rtc_enabled && clock_id != CLOCK_ACTIVETIME) { /* Yes.. Get the hi-resolution time from the RTC */ diff --git a/nuttx/sched/clock_settime.c b/nuttx/sched/clock_settime.c index fdb6a6c57..aa48b4592 100644 --- a/nuttx/sched/clock_settime.c +++ b/nuttx/sched/clock_settime.c @@ -101,7 +101,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp) */ #ifdef CONFIG_RTC - if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME) + if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME) #else if (clock_id == CLOCK_REALTIME) #endif @@ -127,7 +127,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp) /* Setup the RTC (lo- or high-res) */ #ifdef CONFIG_RTC - if (g_rtc_enabled && clockid != CLOCK_ACTIVETIME) + if (g_rtc_enabled && clock_id != CLOCK_ACTIVETIME) { up_rtc_settime(tp); } |