riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some coding style fixes for timex.c

Browse Source
This commit is contained in:
Oliver Hahm 2013-06-20 14:59:42 +02:00
parent 3d85573f9d
commit c6ace1bdbb
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sys/timex/timex.c
View File

@ -1,30 +1,34 @@
#include <stdio.h> #include <stdio.h>
#include <inttypes.h>
#include "timex.h" #include "timex.h"
timex_t timex_add(const timex_t a, const timex_t b) { timex_t timex_add(const timex_t a, const timex_t b)
{
timex_t result; timex_t result;
result.seconds = a.seconds + b.seconds; result.seconds = a.seconds + b.seconds;
result.microseconds = a.microseconds + b.microseconds; result.microseconds = a.microseconds + b.microseconds;
if (result.microseconds < a.microseconds) { if(result.microseconds < a.microseconds) {
result.seconds++; result.seconds++;
} }
/* if (result.microseconds > 1000000) { /* if (result.microseconds > 1000000) {
result.microseconds -= 1000000; result.microseconds -= 1000000;
result.seconds++; result.seconds++;
} }
*/ */
return result; return result;
} }
void timex_normalize(timex_t *time) { void timex_normalize(timex_t *time)
{
time->seconds += (time->microseconds / 1000000); time->seconds += (time->microseconds / 1000000);
time->microseconds %= 1000000; time->microseconds %= 1000000;
} }
timex_t timex_set(uint32_t seconds, uint32_t microseconds) { timex_t timex_set(uint32_t seconds, uint32_t microseconds)
{
timex_t result; timex_t result;
result.seconds = seconds; result.seconds = seconds;
result.microseconds = microseconds; result.microseconds = microseconds;
@ -32,7 +36,8 @@ timex_t timex_set(uint32_t seconds, uint32_t microseconds) {
return result; return result;
} }
timex_t timex_sub(const timex_t a, const timex_t b) { timex_t timex_sub(const timex_t a, const timex_t b)
{
timex_t result; timex_t result;
result.seconds = a.seconds - b.seconds; result.seconds = a.seconds - b.seconds;
result.microseconds = a.microseconds - b.microseconds; result.microseconds = a.microseconds - b.microseconds;
@ -40,15 +45,26 @@ timex_t timex_sub(const timex_t a, const timex_t b) {
return result; return result;
} }
int timex_cmp(const timex_t a, const timex_t b) { int timex_cmp(const timex_t a, const timex_t b)
if (a.seconds < b.seconds) return -1; {
if (a.seconds == b.seconds) { if(a.seconds < b.seconds) {
if (a.microseconds < b.microseconds) return -1; return -1;
if (a.microseconds == b.microseconds) return 0;
} }
if(a.seconds == b.seconds) {
if(a.microseconds < b.microseconds) {
return -1;
}
if(a.microseconds == b.microseconds) {
return 0;
}
}
return 1; return 1;
} }
void timex_print(const timex_t t) { void timex_print(const timex_t t)
printf("Seconds: %u - Microseconds: %u\n", t.seconds, t.microseconds); {
printf("Seconds: %"PRIu32" - Microseconds: %"PRIu32"\n", t.seconds, t.microseconds);
} }