Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-02-06 17:12:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[clock_time] Fix all remaining ktime references in codebase

Browse Source 
- Updated dev_soft_rtc.c: RT_USING_KTIME → RT_USING_CLOCK_TIME
- Updated vdso_data.c (risc-v): rt_ktime_boottime_get_ns → rt_clock_time_boottime_ns
- Updated vdso_data.c (aarch64): rt_ktime_boottime_get_ns → rt_clock_time_boottime_ns
- Updated pic.c: rt_ktime_boottime_get_ns → rt_clock_time_boottime_ns
- Updated hwtimer-rockchip_timer.c: All rt_ktime_* → rt_clock_* APIs
- Renamed base_ktime_ts to base_clocktime_ts in soft_rtc
- All ktime API references replaced with clock_time equivalents

Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-05 15:36:46 +00:00
parent 4f3448ca53
commit c7d1918e37
5 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bsp/rockchip/rk3500/driver/hwtimer/hwtimer-rockchip_timer.c
View File

@@ -16,8 +16,8 @@
#include <rtthread.h>
#include <rtdevice.h>
#ifdef RT_USING_KTIME
#include <ktime.h>
#ifdef RT_USING_CLOCK_TIME
#include <drivers/clock_time.h>
#endif
#define HZ 100
@@ -205,10 +205,10 @@ static void rk_timer_isr(int irqno, void *param)
rk_timer_interrupt_clear(time);
rt_ktime_hrtimer_process();
rt_clock_hrtimer_process();
}
void rt_ktime_hrtimer_bind(rt_bitmap_t *affinity)
void rt_clock_hrtimer_bind(rt_bitmap_t *affinity)
{
struct rk_timer *timer = _timer0.timer;
@@ -285,7 +285,7 @@ static rt_err_t rk_timer_probe(struct rt_platform_device *pdev)
RT_BITMAP_DECLARE(affinity, RT_CPUS_NR) = { 0 };
rt_bitmap_set_bit(affinity, RT_CPUS_NR - 1);
rt_ktime_hrtimer_bind(affinity);
rt_clock_hrtimer_bind(affinity);
rt_pic_attach_irq(timer->irq, rk_timer_isr, timer, dev_name, RT_IRQ_F_NONE);
rt_pic_irq_unmask(timer->irq);
@@ -326,16 +326,16 @@ static const struct rk_timer_data rk3399_timer_data =
.ctrl_reg = TIMER_CONTROL_REG3399,
};
#ifdef RT_USING_KTIME
#ifdef RT_USING_CLOCK_TIME
uint64_t rt_ktime_hrtimer_getfrq(void)
uint64_t rt_clock_hrtimer_getfrq(void)
{
return (24 * 1000 * 1000UL);
}
uint64_t rt_ktime_hrtimer_getres(void)
uint64_t rt_clock_hrtimer_getres(void)
{
return ((1000UL * 1000 * 1000) * RT_KTIME_RESMUL) / (24 * 1000 * 1000UL);
return ((1000UL * 1000 * 1000) * RT_CLOCK_TIME_RESMUL) / (24 * 1000 * 1000UL);
}
/**
@@ -346,7 +346,7 @@ uint64_t rt_ktime_hrtimer_getres(void)
* @param cnt the count of timer dealy
* @return rt_err_t 0 forever
*/
rt_err_t rt_ktime_hrtimer_settimeout(unsigned long cnt)
rt_err_t rt_clock_hrtimer_settimeout(unsigned long cnt)
{
struct hrt_timer *timer = &_timer0;
struct rk_timer *time = timer->timer;

6
components/drivers/pic/pic.c
View File

@@ -17,7 +17,7 @@
#include <drivers/pic.h>
#ifdef RT_USING_PIC_STATISTICS
#include <ktime.h>
#include <drivers/clock_time.h>
#endif
struct irq_traps
@@ -553,7 +553,7 @@ rt_err_t rt_pic_handle_isr(struct rt_pic_irq *pirq)
RT_ASSERT(pirq->pic != RT_NULL);
#ifdef RT_USING_PIC_STATISTICS
rt_ktime_boottime_get_ns(&ts);
rt_clock_time_boottime_ns(&ts);
current_irq_begin = ts.tv_sec * (1000UL * 1000 * 1000) + ts.tv_nsec;
#endif
@@ -614,7 +614,7 @@ rt_err_t rt_pic_handle_isr(struct rt_pic_irq *pirq)
}
#ifdef RT_USING_PIC_STATISTICS
rt_ktime_boottime_get_ns(&ts);
rt_clock_time_boottime_ns(&ts);
irq_time_ns = ts.tv_sec * (1000UL * 1000 * 1000) + ts.tv_nsec - current_irq_begin;
pirq->stat.sum_irq_time_ns += irq_time_ns;
if (irq_time_ns < pirq->stat.min_irq_time_ns || pirq->stat.min_irq_time_ns == 0)

28
components/drivers/rtc/dev_soft_rtc.c
View File

@@ -13,8 +13,8 @@
#include <rtthread.h>
#include <rtdevice.h>
#ifdef RT_USING_KTIME
#include <ktime.h>
#ifdef RT_USING_CLOCK_TIME
#include <drivers/clock_time.h>
#endif
#ifdef RT_USING_SOFT_RTC
@@ -46,8 +46,8 @@ static struct rt_device soft_rtc_dev;
static RT_DEFINE_SPINLOCK(_spinlock);
/* RTC time baseline for calculation */
static struct timespec base_ts = { 0 };
#ifdef RT_USING_KTIME
static struct timespec base_ktime_ts = { 0 };
#ifdef RT_USING_CLOCK_TIME
static struct timespec base_clocktime_ts = { 0 };
#else
static rt_tick_t base_tick;
#endif
@@ -111,8 +111,8 @@ static void set_rtc_time(struct timespec *ts)
rt_base_t level = rt_spin_lock_irqsave(&_spinlock);
base_ts.tv_sec = ts->tv_sec;
base_ts.tv_nsec = ts->tv_nsec;
#ifdef RT_USING_KTIME
rt_ktime_boottime_get_ns(&base_ktime_ts);
#ifdef RT_USING_CLOCK_TIME
rt_clock_time_boottime_ns(&base_clocktime_ts);
#else
base_tick = rt_tick_get();
#endif
@@ -140,12 +140,12 @@ static void get_rtc_time(struct timespec *ts)
return;
level = rt_spin_lock_irqsave(&_spinlock);
#ifdef RT_USING_KTIME
#ifdef RT_USING_CLOCK_TIME
struct timespec current_ts;
rt_ktime_boottime_get_ns(&current_ts);
rt_clock_time_boottime_ns(&current_ts);
ts->tv_sec = base_ts.tv_sec + (current_ts.tv_sec - base_ktime_ts.tv_sec);
ts->tv_nsec = base_ts.tv_nsec + (current_ts.tv_nsec - base_ktime_ts.tv_nsec);
ts->tv_sec = base_ts.tv_sec + (current_ts.tv_sec - base_clocktime_ts.tv_sec);
ts->tv_nsec = base_ts.tv_nsec + (current_ts.tv_nsec - base_clocktime_ts.tv_nsec);
#else
rt_tick_t tick = rt_tick_get_delta(base_tick);
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)
ts = (struct timespec *)args;
level = rt_spin_lock_irqsave(&_spinlock);
ts->tv_sec = 0;
#ifdef RT_USING_KTIME
ts->tv_nsec = (rt_ktime_cputimer_getres() / RT_KTIME_RESMUL);
#ifdef RT_USING_CLOCK_TIME
ts->tv_nsec = (rt_clock_time_getres() / RT_CLOCK_TIME_RESMUL);
#else
ts->tv_nsec = (1000UL * 1000 * 1000) / RT_TICK_PER_SECOND;
#endif
@@ -314,8 +314,8 @@ static int rt_soft_rtc_init(void)
RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT);
#endif
#ifdef RT_USING_KTIME
rt_ktime_boottime_get_ns(&base_ktime_ts);
#ifdef RT_USING_CLOCK_TIME
rt_clock_time_boottime_ns(&base_clocktime_ts);
#else
base_tick = rt_tick_get();
#endif

6
components/lwp/arch/aarch64/common/vdso_data.c
View File

@@ -10,7 +10,7 @@
#include <rtthread.h>
#include <gtimer.h>
#include <ktime.h>
#include <drivers/clock_time.h>
#include <time.h>
#include <vdso_datapage.h>
#include <vdso_data.h>
@@ -23,11 +23,11 @@ void rt_vdso_update_glob_time(void)
rt_vdso_write_begin(vdata);
vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_REALTIME];
rt_ktime_boottime_get_ns(vdso_ts);
rt_clock_time_boottime_ns(vdso_ts);
vdso_ts->tv_sec = initdata + vdso_ts->tv_sec;
vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC];
rt_ktime_boottime_get_ns(vdso_ts);
rt_clock_time_boottime_ns(vdso_ts);
vdata->cycle_last = rt_hw_get_cntpct_val();
rt_vdso_write_end(vdata);

6
components/lwp/arch/risc-v/common/vdso_data.c
View File

@@ -9,7 +9,7 @@
*/
#include <rtthread.h>
#include <ktime.h>
#include <drivers/clock_time.h>
#include <time.h>
#include <vdso_datapage.h>
#include <vdso_data.h>
@@ -23,11 +23,11 @@ void rt_vdso_update_glob_time(void)
rt_vdso_write_begin(vdata);
vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_REALTIME];
rt_ktime_boottime_get_ns(vdso_ts);
rt_clock_time_boottime_ns(vdso_ts);
vdso_ts->tv_sec = initdata + vdso_ts->tv_sec;
vdso_ts = &vdata[CS_HRES_COARSE].basetime[CLOCK_MONOTONIC];
rt_ktime_boottime_get_ns(vdso_ts);
rt_clock_time_boottime_ns(vdso_ts);
vdata->cycle_last = rdtime();
rt_vdso_write_end(vdata);