git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: corrected time conversion on alarm/sleep syscall
[lunaix-os.git]
/
lunaix-os
/
includes
/
lunaix
/
clock.h
diff --git
a/lunaix-os/includes/lunaix/clock.h
b/lunaix-os/includes/lunaix/clock.h
index 44dfa04b7da5c8e0bcdd3f5b844877d10ca0dfa3..6a3d26eacf91a0c8b54bed2ef6949e032b069652 100644
(file)
--- a/
lunaix-os/includes/lunaix/clock.h
+++ b/
lunaix-os/includes/lunaix/clock.h
@@
-1,20
+1,7
@@
#ifndef __LUNAIX_CLOCK_H
#define __LUNAIX_CLOCK_H
#ifndef __LUNAIX_CLOCK_H
#define __LUNAIX_CLOCK_H
-#include <stdint.h>
-
-typedef uint32_t time_t;
-
-typedef struct
-{
- uint32_t year; // use int32 as we need to store the 4-digit year
- uint8_t month;
- uint8_t day;
- uint8_t weekday;
- uint8_t hour;
- uint8_t minute;
- uint8_t second;
-} datetime_t;
+#include <lunaix/time.h>
void
clock_init();
void
clock_init();
@@
-22,9
+9,6
@@
clock_init();
void
clock_walltime(datetime_t* datetime);
void
clock_walltime(datetime_t* datetime);
-int
-clock_datatime_eq(datetime_t* a, datetime_t* b);
-
/**
* @brief 返回当前系统时间,即自从开机到当前时刻的毫秒时。
*
/**
* @brief 返回当前系统时间,即自从开机到当前时刻的毫秒时。
*
@@
-36,12
+20,4
@@
clock_systime();
time_t
clock_unixtime();
time_t
clock_unixtime();
-static inline time_t
-clock_tounixtime(datetime_t* dt)
-{
- return (dt->year - 1970) * 31556926u + (dt->month - 1) * 2629743u +
- (dt->day - 1) * 86400u + (dt->hour - 1) * 3600u +
- (dt->minute - 1) * 60u + dt->second;
-}
-
#endif /* __LUNAIX_CLOCK_H */
#endif /* __LUNAIX_CLOCK_H */