mirror/bl_iot_sdk
1
0
Fork 0
mirror of https://github.com/pine64/bl_iot_sdk.git synced 2024-10-04 14:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

bl_sys_time.c: adds null pointer checks and extra spaces cleanup

Browse Source 
Signed-off-by: Jesus Velazquez <jesus.velazquez@gmail.com>
This commit is contained in:
Jesus Velazquez 2020-10-28 11:52:37 -07:00
parent 143f051b9c
commit 838ff4f832
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/sys/bltime/bl_sys_time.c
View File

@ -49,6 +49,10 @@ int bl_sys_time_get(uint64_t *epoch)
{ {
int ms_diff; int ms_diff;
if (!epoch) {
return -1;
}
if (0 == epoch_time) { if (0 == epoch_time) {
return -1; return -1;
} }
@ -66,7 +70,7 @@ void bl_sys_time_sync_init(void)
init_tick_rtos = xTaskGetTickCount(); init_tick_rtos = xTaskGetTickCount();
init_tick_rtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF; init_tick_rtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF;
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
sync_init = 1; sync_init = 1;
} }
@ -76,19 +80,23 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump)
uint32_t currTickRtc; uint32_t currTickRtc;
uint32_t deltaTickRtos; uint32_t deltaTickRtos;
uint32_t deltaTickRtc; uint32_t deltaTickRtc;
if (!xTicksToJump) {
return -1;
}
if(!sync_init){ if(!sync_init){
return -1; return -1;
} }
taskENTER_CRITICAL(); taskENTER_CRITICAL();
currTickRtos = xTaskGetTickCount(); currTickRtos = xTaskGetTickCount();
currTickRtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF; currTickRtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF;
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
deltaTickRtos = currTickRtos - init_tick_rtos; deltaTickRtos = currTickRtos - init_tick_rtos;
deltaTickRtc = currTickRtc - init_tick_rtc; deltaTickRtc = currTickRtc - init_tick_rtc;
if(deltaTickRtc > deltaTickRtos){ if(deltaTickRtc > deltaTickRtos){
*xTicksToJump = deltaTickRtc - deltaTickRtos; *xTicksToJump = deltaTickRtc - deltaTickRtos;
return 1; return 1;
@ -100,10 +108,10 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump)
uint32_t bl_sys_time_sync(void) uint32_t bl_sys_time_sync(void)
{ {
uint32_t xTicksToJump = 0; uint32_t xTicksToJump = 0;
if(bl_sys_time_sync_state(&xTicksToJump) > 0){ if(bl_sys_time_sync_state(&xTicksToJump) > 0){
vTaskStepTickSafe(xTicksToJump); vTaskStepTickSafe(xTicksToJump);
} }
return xTicksToJump; return xTicksToJump;
} }