Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision d11a1811118ec8e5eb8ca4beae291275a4ce36b6) +++ uspace/lib/c/Makefile (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -69,4 +69,5 @@ generic/device/hw_res_parsed.c \ generic/device/char_dev.c \ + generic/device/clock_dev.c \ generic/device/nic.c \ generic/device/pci.c \ Index: uspace/lib/c/generic/device/clock_dev.c =================================================================== --- uspace/lib/c/generic/device/clock_dev.c (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/c/generic/device/clock_dev.c (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -0,0 +1,79 @@ +/* + * 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 + */ + +#include +#include +#include +#include +#include + +/** Read the current time from the device + * + * @param sess Session of the device + * @param t The current time that will be read from the device + * + * @return EOK on success or a negative error code + */ +int +clock_dev_time_get(async_sess_t *sess, struct tm *t) +{ + ipc_call_t answer; + aid_t req; + int ret; + + async_exch_t *exch = async_exchange_begin(sess); + + req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE), + CLOCK_DEV_TIME_GET, &answer); + ret = async_data_read_start(exch, t, sizeof(*t)); + + async_exchange_end(exch); + + sysarg_t rc; + if (ret != EOK) { + async_wait_for(req, &rc); + if (rc == EOK) + return ret; + } + + async_wait_for(req, &rc); + if ((int) rc != EOK) + return ret; + + return (int) IPC_GET_ARG1(answer); +} + +/** @} + */ + Index: uspace/lib/c/include/device/clock_dev.h =================================================================== --- uspace/lib/c/include/device/clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/c/include/device/clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -0,0 +1,49 @@ +/* + * 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 *); + +#endif + Index: uspace/lib/c/include/ipc/clock_ctl.h =================================================================== --- uspace/lib/c/include/ipc/clock_ctl.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/c/include/ipc/clock_ctl.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -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 d11a1811118ec8e5eb8ca4beae291275a4ce36b6) +++ uspace/lib/c/include/ipc/dev_iface.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -52,4 +52,7 @@ USBHID_DEV_IFACE, + /** Interface provided by Real Time Clock devices */ + CLOCK_DEV_IFACE, + DEV_IFACE_MAX } dev_inferface_idx_t; Index: uspace/lib/c/include/sys/time.h =================================================================== --- uspace/lib/c/include/sys/time.h (revision d11a1811118ec8e5eb8ca4beae291275a4ce36b6) +++ uspace/lib/c/include/sys/time.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -46,4 +46,13 @@ typedef uint32_t mseconds_t; +struct tm { + int tm_sec; /* 0 - 59 */ + int tm_min; /* 0 - 59 */ + int tm_hour; /* 0 - 23 */ + int tm_mday; /* 1 - 31 */ + int tm_mon; /* 0 - 11 */ + int tm_year; /* years since 1900 */ +}; + struct timeval { time_t tv_sec; /* seconds */ Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision d11a1811118ec8e5eb8ca4beae291275a4ce36b6) +++ uspace/lib/drv/Makefile (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -44,5 +44,6 @@ generic/remote_pci.c \ generic/remote_usbhc.c \ - generic/remote_usbhid.c + generic/remote_usbhid.c \ + generic/remote_clock_dev.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision d11a1811118ec8e5eb8ca4beae291275a4ce36b6) +++ uspace/lib/drv/generic/dev_iface.c (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -41,4 +41,5 @@ #include "remote_hw_res.h" #include "remote_char_dev.h" +#include "remote_clock_dev.h" #include "remote_nic.h" #include "remote_usb.h" @@ -55,5 +56,6 @@ &remote_usb_iface, &remote_usbhc_iface, - &remote_usbhid_iface + &remote_usbhid_iface, + &remote_clock_dev_iface, } }; Index: uspace/lib/drv/generic/remote_clock_dev.c =================================================================== --- uspace/lib/drv/generic/remote_clock_dev.c (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/drv/generic/remote_clock_dev.c (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -0,0 +1,147 @@ +/* + * 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 libdrv + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include +#include + +static void remote_clock_time_get(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); +static void remote_clock_time_set(ddf_fun_t *, void *, ipc_callid_t, + ipc_call_t *); + +/** Remote clock interface operations */ +static remote_iface_func_ptr_t remote_clock_dev_iface_ops[] = { + &remote_clock_time_get, + &remote_clock_time_set, +}; + +/** Remote clock interface structure + * + * Interface for processing requests from remote clients + * addressed by the clock interface. + */ +remote_iface_t remote_clock_dev_iface = { + .method_count = sizeof(remote_clock_dev_iface_ops) / + sizeof(remote_iface_func_ptr_t), + .methods = remote_clock_dev_iface_ops, +}; + +/** Process the time_get() request from the remote client + * + * @param fun The function from which the time is read + * @param ops The local ops structure + */ +static void +remote_clock_time_get(ddf_fun_t *fun, void *ops, ipc_callid_t callid, + ipc_call_t *call) +{ + clock_dev_ops_t *clock_dev_ops = (clock_dev_ops_t *) ops; + ipc_callid_t cid; + struct tm t; + int rc; + size_t len; + + if (!async_data_read_receive(&cid, &len)) { + /* TODO: Handle protocol error */ + async_answer_0(callid, EINVAL); + return; + } + + if (!clock_dev_ops->time_get) { + /* The driver does not provide the time_get() functionality */ + async_data_read_finalize(cid, NULL, 0); + async_answer_0(callid, ENOTSUP); + return; + } + + rc = (*clock_dev_ops->time_get)(fun, &t); + + if (rc != EOK) { + /* Some error occurred */ + async_data_read_finalize(cid, NULL, 0); + async_answer_0(callid, rc); + } + + /* The operation was successful */ + async_data_read_finalize(cid, &t, sizeof(struct tm)); + async_answer_1(callid, EOK, rc); +} + +/** Process the write request from the remote client + * + * @param fun The function to which the data are written + * @param ops The local ops structure + */ +static void remote_clock_time_set(ddf_fun_t *fun, void *ops, + ipc_callid_t callid, ipc_call_t *call) +{ + clock_dev_ops_t *clock_dev_ops = (clock_dev_ops_t *) ops; + int rc; + struct tm t; + ipc_callid_t cid; + size_t len; + + if (!async_data_write_receive(&cid, &len)) { + /* TODO: Handle protocol error */ + async_answer_0(callid, EINVAL); + return; + } + + if (!clock_dev_ops->time_set) { + /* The driver does not support the time_set() functionality */ + async_data_write_finalize(cid, NULL, 0); + async_answer_0(callid, ENOTSUP); + return; + } + + async_data_write_finalize(cid, &t, sizeof(struct tm)); + + rc = (*clock_dev_ops->time_set)(fun, &t); + if (rc < 0) { + /* Some error occurred */ + async_answer_0(callid, rc); + return; + } + + async_answer_1(callid, EOK, rc); +} + +/** + * @} + */ + Index: uspace/lib/drv/include/ops/clock_dev.h =================================================================== --- uspace/lib/drv/include/ops/clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/drv/include/ops/clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -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 libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_OPS_CLOCK_DEV_H_ +#define LIBDRV_OPS_CLOCK_DEV_H_ + +#include +#include "../ddf/driver.h" + +typedef struct { + int (*time_get)(ddf_fun_t *, struct tm *); + int (*time_set)(ddf_fun_t *, struct tm *); +} clock_dev_ops_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_clock_dev.h =================================================================== --- uspace/lib/drv/include/remote_clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) +++ uspace/lib/drv/include/remote_clock_dev.h (revision 80d3f846b70c4427d3fee6bae79e385976a7ff1c) @@ -0,0 +1,45 @@ +/* + * 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 libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_CLOCK_DEV_H_ +#define LIBDRV_REMOTE_CLOCK_DEV_H_ + +extern remote_iface_t remote_clock_dev_iface; + +#endif + +/** + * @} + */ +