diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.c b/APP_Framework/Framework/transform_layer/xizi/transform.c index f2d53d155..5d6d3c591 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.c +++ b/APP_Framework/Framework/transform_layer/xizi/transform.c @@ -104,7 +104,7 @@ int PrivTaskDelay(int32_t ms) #ifndef SEPARATE_COMPILE uint32_t PrivGetTickTime() { - return CalculteTimeMsFromTick(CurrentTicksGain()); + return CalculateTimeMsFromTick(CurrentTicksGain()); } #endif /*********************fs**************************/ diff --git a/Ubiquitous/XiZi_IIoT/fs/shared/src/poll.c b/Ubiquitous/XiZi_IIoT/fs/shared/src/poll.c index efd25bb27..178a3e1b5 100644 --- a/Ubiquitous/XiZi_IIoT/fs/shared/src/poll.c +++ b/Ubiquitous/XiZi_IIoT/fs/shared/src/poll.c @@ -86,7 +86,7 @@ static int PollWaitTimeout(struct poll_table *pt, int msec) thread = pt->polling_thread; - timeout = CalculteTickFromTimeMs(msec); + timeout = CalculateTickFromTimeMs(msec); level = CriticalAreaLock(); diff --git a/Ubiquitous/XiZi_IIoT/kernel/include/xs_ktick.h b/Ubiquitous/XiZi_IIoT/kernel/include/xs_ktick.h index faaf195d9..c56751c1f 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/include/xs_ktick.h +++ b/Ubiquitous/XiZi_IIoT/kernel/include/xs_ktick.h @@ -26,7 +26,7 @@ x_ticks_t CurrentTicksGain(void); void TickAndTaskTimesliceUpdate(void); -x_ticks_t CalculteTickFromTimeMs(uint32 ms); -uint32 CalculteTimeMsFromTick(x_ticks_t ticks); +x_ticks_t CalculateTickFromTimeMs(uint32 ms); +uint32 CalculateTimeMsFromTick(x_ticks_t ticks); #endif diff --git a/Ubiquitous/XiZi_IIoT/kernel/memory/gatherblock.c b/Ubiquitous/XiZi_IIoT/kernel/memory/gatherblock.c index a4a0d482c..6ac255725 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/memory/gatherblock.c +++ b/Ubiquitous/XiZi_IIoT/kernel/memory/gatherblock.c @@ -304,7 +304,7 @@ void *AllocBlockMemGather(GatherMemType gm_handler, int32 msec) /* get descriptor of task */ task = GetKTaskDescriptor(); - wait_time = CalculteTickFromTimeMs(msec); + wait_time = CalculateTickFromTimeMs(msec); critical_value = CriticalAreaLock(); /* no free gatherblock*/ diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/event.c b/Ubiquitous/XiZi_IIoT/kernel/thread/event.c index 871486f7f..4217b9676 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/event.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/event.c @@ -153,7 +153,7 @@ static int32 _EventProcess(struct Event *event, uint32 events, uint32 options, i task = GetKTaskDescriptor(); task->exstatus = EOK; - timeout = CalculteTickFromTimeMs(msec); + timeout = CalculateTickFromTimeMs(msec); lock = CriticalAreaLock(); diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/ktask.c b/Ubiquitous/XiZi_IIoT/kernel/thread/ktask.c index a06236b91..e72ea0d16 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/ktask.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/ktask.c @@ -220,7 +220,7 @@ x_err_t _MdelayKTask(KTaskDescriptorType task, uint32 ms) return -EINVALED; } - ticks = CalculteTickFromTimeMs(ms); + ticks = CalculateTickFromTimeMs(ms); return _DelayKTask(task, ticks); } diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c b/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c index 8d2be3c79..ee58bc0d7 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c @@ -99,7 +99,7 @@ static x_err_t _MsgQueueSend(struct MsgQueue *mq, if(WAITING_FOREVER == msec) timeout = WAITING_FOREVER; else - timeout = CalculteTickFromTimeMs(msec); + timeout = CalculateTickFromTimeMs(msec); lock = CriticalAreaLock(); if (mq->num_msgs >= mq->max_msgs && timeout == 0) { @@ -207,7 +207,7 @@ static x_err_t _MsgQueueRecv(struct MsgQueue *mq, tick_delta = 0; task = GetKTaskDescriptor(); - timeout = CalculteTickFromTimeMs(msec); + timeout = CalculateTickFromTimeMs(msec); lock = CriticalAreaLock(); if (mq->index == 0 && timeout == 0) { diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/mutex.c b/Ubiquitous/XiZi_IIoT/kernel/thread/mutex.c index 88c1177a9..ff4aaded2 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/mutex.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/mutex.c @@ -83,7 +83,7 @@ static int32 _MutexObtain(struct Mutex *mutex, int32 msec) NULL_PARAM_CHECK(mutex); task = GetKTaskDescriptor(); - wait_time = CalculteTickFromTimeMs(msec); + wait_time = CalculateTickFromTimeMs(msec); lock = CriticalAreaLock(); SYS_KDEBUG_LOG(KDBG_IPC, diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/semaphore.c b/Ubiquitous/XiZi_IIoT/kernel/thread/semaphore.c index ac6f6eeb3..54ff78629 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/semaphore.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/semaphore.c @@ -97,7 +97,7 @@ static int32 _SemaphoreObtain(struct Semaphore *sem, int32 msec) if(WAITING_FOREVER == msec) wait_time = WAITING_FOREVER; else - wait_time = CalculteTickFromTimeMs(msec); + wait_time = CalculateTickFromTimeMs(msec); lock = CriticalAreaLock(); SYS_KDEBUG_LOG(KDBG_IPC, ("obtain semaphore: id %d, value %d, by task %s\n", diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/tick.c b/Ubiquitous/XiZi_IIoT/kernel/thread/tick.c index 49f75f38c..30156d39e 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/tick.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/tick.c @@ -96,7 +96,7 @@ void TickAndTaskTimesliceUpdate(void) */ #define MIN_TICKS 1 -x_ticks_t CalculteTickFromTimeMs(uint32 ms) +x_ticks_t CalculateTickFromTimeMs(uint32 ms) { uint32 tmp = 0; x_ticks_t ticks = 0; @@ -121,7 +121,7 @@ x_ticks_t CalculteTickFromTimeMs(uint32 ms) * @param ticks ticks need to be converted * @return ms */ -uint32 CalculteTimeMsFromTick(x_ticks_t ticks) +uint32 CalculateTimeMsFromTick(x_ticks_t ticks) { uint32 ms = 0; diff --git a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/shell.h b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/shell.h index 75084d63c..6e55fd27e 100644 --- a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/shell.h +++ b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/shell.h @@ -25,7 +25,7 @@ * you cannot use double-clicking the tab to complete the command help, * and you cannot use the shell timeout lock */ -#define SHELL_GET_TICK() CalculteTimeMsFromTick(CurrentTicksGain()) +#define SHELL_GET_TICK() CalculateTimeMsFromTick(CurrentTicksGain()) /**