Index: uspace/lib/c/include/device/clock_dev.h =================================================================== --- uspace/lib/c/include/device/clock_dev.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) +++ uspace/lib/c/include/device/clock_dev.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2012 Maurizio Lombardi + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_CLOCK_DEV_H_ +#define LIBC_DEVICE_CLOCK_DEV_H_ + +#include +#include + +typedef enum { + CLOCK_DEV_TIME_GET = 0, + CLOCK_DEV_TIME_SET, +} clock_dev_method_t; + +extern int clock_dev_time_get(async_sess_t *, struct tm *); +extern int clock_dev_time_set(async_sess_t *, struct tm *); + +#endif + Index: uspace/lib/c/include/ipc/clock_ctl.h =================================================================== --- uspace/lib/c/include/ipc/clock_ctl.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) +++ uspace/lib/c/include/ipc/clock_ctl.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2012 Maurizio Lombardi + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LIBC_IPC_CLOCK_CTL_H_ +#define LIBC_IPC_CLOCK_CTL_H_ + +#include + +typedef enum { + CLOCK_GET_BATTERY_STATUS = DEV_FIRST_CUSTOM_METHOD, +} clock_ctl_t; + +#endif + Index: uspace/lib/c/include/ipc/dev_iface.h =================================================================== --- uspace/lib/c/include/ipc/dev_iface.h (revision 111d2d6731b1fbc5a2181c92094ca7b8dbaf9d2f) +++ uspace/lib/c/include/ipc/dev_iface.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) @@ -54,4 +54,6 @@ /** Interface provided by USB HID devices. */ USBHID_DEV_IFACE, + /** Interface provided by Real Time Clock devices */ + CLOCK_DEV_IFACE, /** Interface provided by AHCI devices. */ AHCI_DEV_IFACE, Index: uspace/lib/c/include/sys/time.h =================================================================== --- uspace/lib/c/include/sys/time.h (revision 111d2d6731b1fbc5a2181c92094ca7b8dbaf9d2f) +++ uspace/lib/c/include/sys/time.h (revision c9abf5022f748dee0e0fb69b545dd41e362319c3) @@ -1,4 +1,6 @@ /* * Copyright (c) 2006 Ondrej Palkovsky + * Copyright (c) 2011 Petr Koupy + * Copyright (c) 2011 Jiri Zarevucky * All rights reserved. * @@ -39,4 +41,5 @@ #define DST_NONE 0 +#define ASCTIME_BUF_LEN 26 typedef long time_t; @@ -45,4 +48,16 @@ typedef uint32_t useconds_t; typedef uint32_t mseconds_t; + +struct tm { + int tm_sec; /* Seconds [0,60]. */ + int tm_min; /* Minutes [0,59]. */ + int tm_hour; /* Hour [0,23]. */ + int tm_mday; /* Day of month [1,31]. */ + int tm_mon; /* Month of year [0,11]. */ + int tm_year; /* Years since 1900. */ + int tm_wday; /* Day of week [0,6] (Sunday = 0). */ + int tm_yday; /* Day of year [0,365]. */ + int tm_isdst; /* Daylight Savings flag. */ +}; struct timeval { @@ -61,6 +76,17 @@ extern int tv_gteq(struct timeval *tv1, struct timeval *tv2); extern int gettimeofday(struct timeval *tv, struct timezone *tz); +extern int getuptime(struct timeval *tv); extern void udelay(useconds_t); + +extern time_t mktime(struct tm *tm); +extern int utctime2tm(const time_t time, struct tm *result); +extern int utctime2str(const time_t time, char *buf); +extern void tm2str(const struct tm *timeptr, char *buf); +extern int localtime2tm(const time_t time, struct tm *result); +extern int localtime2str(const time_t time, char *buf); +extern double difftime(time_t time1, time_t time0); +extern size_t strftime(char *restrict s, size_t maxsize, + const char *restrict format, const struct tm *restrict tm); #endif