fix Calculte error

This commit is contained in:
Liu_Weichao 2023-01-10 17:49:20 +08:00
parent c621db2ca7
commit 8001b07341
11 changed files with 14 additions and 14 deletions

View File

@ -104,7 +104,7 @@ int PrivTaskDelay(int32_t ms)
#ifndef SEPARATE_COMPILE
uint32_t PrivGetTickTime()
{
return CalculteTimeMsFromTick(CurrentTicksGain());
return CalculateTimeMsFromTick(CurrentTicksGain());
}
#endif
/*********************fs**************************/

View File

@ -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();

View File

@ -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

View File

@ -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*/

View File

@ -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();

View File

@ -220,7 +220,7 @@ x_err_t _MdelayKTask(KTaskDescriptorType task, uint32 ms)
return -EINVALED;
}
ticks = CalculteTickFromTimeMs(ms);
ticks = CalculateTickFromTimeMs(ms);
return _DelayKTask(task, ticks);
}

View File

@ -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) {

View File

@ -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,

View File

@ -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",

View File

@ -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;

View File

@ -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())
/**