libs
/
SOEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed osal_timer_diff bug (#106)

This commit is contained in:
Zihan Chen 2017-05-25 04:09:10 -04:00 committed by nakarlsson
parent fb975cbc70
commit e78bb66327
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osal/linux/osal.c
View File

@ -49,11 +49,13 @@ ec_timet osal_current_time(void)
void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff) void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
{ {
diff->sec = end->sec - start->sec; if (end->usec < start->usec) {
diff->usec = end->usec - start->usec; diff->sec = end->sec - start->sec - 1;
if (diff->usec < 0) { diff->usec = end->usec + 1000000 - start->usec;
--diff->sec; }
diff->usec += 1000000; else {
diff->sec = end->sec - start->sec;
diff->usec = end->usec - start->usec;
} }
} }

14
osal/vxworks/osal.c
View File

@ -92,12 +92,14 @@ ec_timet osal_current_time(void)
void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff) void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
{ {
diff->sec = end->sec - start->sec; if (end->usec < start->usec) {
diff->usec = end->usec - start->usec; diff->sec = end->sec - start->sec - 1;
if (diff->usec < 0) { diff->usec = end->usec + 1000000 - start->usec;
--diff->sec; }
diff->usec += 1000000; else {
} diff->sec = end->sec - start->sec;
diff->usec = end->usec - start->usec;
}
} }
void osal_timer_start(osal_timert * self, uint32 timeout_usec) void osal_timer_start(osal_timert * self, uint32 timeout_usec)

12
osal/win32/osal.c
View File

@ -42,11 +42,13 @@ ec_timet osal_current_time (void)
void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff) void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
{ {
diff->sec = end->sec - start->sec; if (end->usec < start->usec) {
diff->usec = end->usec - start->usec; diff->sec = end->sec - start->sec - 1;
if (diff->usec < 0) { diff->usec = end->usec + 1000000 - start->usec;
--diff->sec; }
diff->usec += 1000000; else {
diff->sec = end->sec - start->sec;
diff->usec = end->usec - start->usec;
} }
} }