diff options
| author | Bernard Xiong <[email protected]> | 2021-12-04 22:57:37 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-04 22:57:37 +0800 |
| commit | 6feea35e953fa427ac728eab0c4573e20b73f89f (patch) | |
| tree | 3ddbde1fa9ba77490eea88bb0fd3d8d0fa19dc61 | |
| parent | 19eb3942d43124c819a998a4acf53c9b87cde316 (diff) | |
| parent | c2fec1bf451cae018ae6535bb9a68d19ca8e6abb (diff) | |
Merge pull request #5313 from aozima/aozima_cputime
cputime数据类型修改为64位
| -rw-r--r-- | components/drivers/cputime/cputime.c | 2 | ||||
| -rw-r--r-- | components/drivers/cputime/cputime_cortexm.c | 2 | ||||
| -rw-r--r-- | components/drivers/include/drivers/cputime.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/drivers/cputime/cputime.c b/components/drivers/cputime/cputime.c index 750733f366..490f5725c1 100644 --- a/components/drivers/cputime/cputime.c +++ b/components/drivers/cputime/cputime.c @@ -34,7 +34,7 @@ float clock_cpu_getres(void) * * @return the cpu tick */ -uint32_t clock_cpu_gettime(void) +uint64_t clock_cpu_gettime(void) { if (_cputime_ops) return _cputime_ops->cputime_gettime(); diff --git a/components/drivers/cputime/cputime_cortexm.c b/components/drivers/cputime/cputime_cortexm.c index 071acfe9bb..48ccfdb126 100644 --- a/components/drivers/cputime/cputime_cortexm.c +++ b/components/drivers/cputime/cputime_cortexm.c @@ -24,7 +24,7 @@ static float cortexm_cputime_getres(void) return ret; } -static uint32_t cortexm_cputime_gettime(void) +static uint64_t cortexm_cputime_gettime(void) { return DWT->CYCCNT; } diff --git a/components/drivers/include/drivers/cputime.h b/components/drivers/include/drivers/cputime.h index 26a1e40f8e..ec98f3152e 100644 --- a/components/drivers/include/drivers/cputime.h +++ b/components/drivers/include/drivers/cputime.h @@ -16,11 +16,11 @@ struct rt_clock_cputime_ops { float (*cputime_getres) (void); - uint32_t (*cputime_gettime)(void); + uint64_t (*cputime_gettime)(void); }; float clock_cpu_getres(void); -uint32_t clock_cpu_gettime(void); +uint64_t clock_cpu_gettime(void); uint32_t clock_cpu_microsecond(uint32_t cpu_tick); uint32_t clock_cpu_millisecond(uint32_t cpu_tick); |