mirror/bl_iot_sdk
1
0
Fork 0
mirror of https://github.com/pine64/bl_iot_sdk.git synced 2024-07-05 12:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from jevere/master

Browse Source 
bl_sys_time.c: adds null pointer checks and extra spaces cleanup
This commit is contained in:
Yafei 2020-10-30 13:39:27 +08:00 committed by GitHub
commit 6196686144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
if (!epoch) {
return -1;
}
if (0 == epoch_time) {
return -1;
}
@ -66,7 +70,7 @@ void bl_sys_time_sync_init(void)
init_tick_rtos = xTaskGetTickCount();
init_tick_rtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF;
taskEXIT_CRITICAL();
sync_init = 1;
}
@ -76,19 +80,23 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump)
uint32_t currTickRtc;
uint32_t deltaTickRtos;
uint32_t deltaTickRtc;
if (!xTicksToJump) {
return -1;
}
if(!sync_init){
return -1;
}
taskENTER_CRITICAL();
currTickRtos = xTaskGetTickCount();
currTickRtc = bl_rtc_get_timestamp_ms() & 0xFFFFFFFF;
taskEXIT_CRITICAL();
deltaTickRtos = currTickRtos - init_tick_rtos;
deltaTickRtc = currTickRtc - init_tick_rtc;
if(deltaTickRtc > deltaTickRtos){
*xTicksToJump = deltaTickRtc - deltaTickRtos;
return 1;
@ -100,10 +108,10 @@ int bl_sys_time_sync_state(uint32_t *xTicksToJump)
uint32_t bl_sys_time_sync(void)
{
uint32_t xTicksToJump = 0;
if(bl_sys_time_sync_state(&xTicksToJump) > 0){
vTaskStepTickSafe(xTicksToJump);
}
return xTicksToJump;
}