|
13 | 13 | #include <rtthread.h> |
14 | 14 | #include <rtdevice.h> |
15 | 15 |
|
16 | | -#ifdef RT_USING_KTIME |
17 | | -#include <ktime.h> |
| 16 | +#ifdef RT_USING_CLOCK_TIME |
| 17 | +#include <drivers/clock_time.h> |
18 | 18 | #endif |
19 | 19 |
|
20 | 20 | #ifdef RT_USING_SOFT_RTC |
@@ -46,8 +46,8 @@ static struct rt_device soft_rtc_dev; |
46 | 46 | static RT_DEFINE_SPINLOCK(_spinlock); |
47 | 47 | /* RTC time baseline for calculation */ |
48 | 48 | static struct timespec base_ts = { 0 }; |
49 | | -#ifdef RT_USING_KTIME |
50 | | -static struct timespec base_ktime_ts = { 0 }; |
| 49 | +#ifdef RT_USING_CLOCK_TIME |
| 50 | +static struct timespec base_clocktime_ts = { 0 }; |
51 | 51 | #else |
52 | 52 | static rt_tick_t base_tick; |
53 | 53 | #endif |
@@ -111,8 +111,8 @@ static void set_rtc_time(struct timespec *ts) |
111 | 111 | rt_base_t level = rt_spin_lock_irqsave(&_spinlock); |
112 | 112 | base_ts.tv_sec = ts->tv_sec; |
113 | 113 | base_ts.tv_nsec = ts->tv_nsec; |
114 | | -#ifdef RT_USING_KTIME |
115 | | - rt_ktime_boottime_get_ns(&base_ktime_ts); |
| 114 | +#ifdef RT_USING_CLOCK_TIME |
| 115 | + rt_clock_time_boottime_ns(&base_clocktime_ts); |
116 | 116 | #else |
117 | 117 | base_tick = rt_tick_get(); |
118 | 118 | #endif |
@@ -140,12 +140,12 @@ static void get_rtc_time(struct timespec *ts) |
140 | 140 | return; |
141 | 141 |
|
142 | 142 | level = rt_spin_lock_irqsave(&_spinlock); |
143 | | -#ifdef RT_USING_KTIME |
| 143 | +#ifdef RT_USING_CLOCK_TIME |
144 | 144 | struct timespec current_ts; |
145 | | - rt_ktime_boottime_get_ns(¤t_ts); |
| 145 | + rt_clock_time_boottime_ns(¤t_ts); |
146 | 146 |
|
147 | | - ts->tv_sec = base_ts.tv_sec + (current_ts.tv_sec - base_ktime_ts.tv_sec); |
148 | | - ts->tv_nsec = base_ts.tv_nsec + (current_ts.tv_nsec - base_ktime_ts.tv_nsec); |
| 147 | + ts->tv_sec = base_ts.tv_sec + (current_ts.tv_sec - base_clocktime_ts.tv_sec); |
| 148 | + ts->tv_nsec = base_ts.tv_nsec + (current_ts.tv_nsec - base_clocktime_ts.tv_nsec); |
149 | 149 | #else |
150 | 150 | rt_tick_t tick = rt_tick_get_delta(base_tick); |
151 | 151 | ts->tv_sec = base_ts.tv_sec + tick / RT_TICK_PER_SECOND; |
@@ -256,8 +256,8 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args) |
256 | 256 | ts = (struct timespec *)args; |
257 | 257 | level = rt_spin_lock_irqsave(&_spinlock); |
258 | 258 | ts->tv_sec = 0; |
259 | | -#ifdef RT_USING_KTIME |
260 | | - ts->tv_nsec = (rt_ktime_cputimer_getres() / RT_KTIME_RESMUL); |
| 259 | +#ifdef RT_USING_CLOCK_TIME |
| 260 | + ts->tv_nsec = (rt_clock_time_getres() / RT_CLOCK_TIME_RESMUL); |
261 | 261 | #else |
262 | 262 | ts->tv_nsec = (1000UL * 1000 * 1000) / RT_TICK_PER_SECOND; |
263 | 263 | #endif |
@@ -314,8 +314,8 @@ static int rt_soft_rtc_init(void) |
314 | 314 | RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT); |
315 | 315 | #endif |
316 | 316 |
|
317 | | -#ifdef RT_USING_KTIME |
318 | | - rt_ktime_boottime_get_ns(&base_ktime_ts); |
| 317 | +#ifdef RT_USING_CLOCK_TIME |
| 318 | + rt_clock_time_boottime_ns(&base_clocktime_ts); |
319 | 319 | #else |
320 | 320 | base_tick = rt_tick_get(); |
321 | 321 | #endif |
|
0 commit comments