Index: uspace/drv/time/cmos-rtc/cmos-rtc.c =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -46,8 +46,8 @@ #include #include +#include #include #include #include -#include #include @@ -94,6 +94,4 @@ static unsigned bcd2bin(unsigned bcd); static unsigned bin2bcd(unsigned binary); -static void rtc_default_handler(ddf_fun_t *fun, - ipc_callid_t callid, ipc_call_t *call); static int rtc_dev_remove(ddf_dev_t *dev); static void rtc_register_write(rtc_t *rtc, int reg, int data); @@ -120,4 +118,10 @@ }; +/** Battery powered device interface */ +static battery_dev_ops_t rtc_battery_dev_ops = { + .battery_status_get = NULL, + .battery_charge_level_get = NULL, +}; + /** Obtain soft state structure from device node */ static rtc_t * @@ -144,5 +148,6 @@ rtc_dev_ops.interfaces[CLOCK_DEV_IFACE] = &rtc_clock_dev_ops; - rtc_dev_ops.default_handler = &rtc_default_handler; + rtc_dev_ops.interfaces[BATTERY_DEV_IFACE] = &rtc_battery_dev_ops; + rtc_dev_ops.default_handler = NULL; } @@ -597,26 +602,4 @@ } -/** Default handler for client requests not handled - * by the standard interface - */ -static void -rtc_default_handler(ddf_fun_t *fun, ipc_callid_t callid, ipc_call_t *call) -{ - sysarg_t method = IPC_GET_IMETHOD(*call); - rtc_t *rtc = fun_rtc(fun); - bool batt_ok; - - switch (method) { - case CLOCK_GET_BATTERY_STATUS: - /* Get the RTC battery status */ - batt_ok = rtc_register_read(rtc, RTC_STATUS_D) & - RTC_D_BATTERY_OK; - async_answer_1(callid, EOK, batt_ok); - break; - default: - async_answer_0(callid, ENOTSUP); - } -} - /** Open the device * Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/lib/c/Makefile (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -72,4 +72,5 @@ generic/device/char_dev.c \ generic/device/clock_dev.c \ + generic/device/battery_dev.c \ generic/device/graph_dev.c \ generic/device/nic.c \ Index: uspace/lib/c/generic/device/battery_dev.c =================================================================== --- uspace/lib/c/generic/device/battery_dev.c (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) +++ uspace/lib/c/generic/device/battery_dev.c (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -0,0 +1,93 @@ +/* + * 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 battery status from the device + * + * @param sess Session of the device + * @param status Current status of the battery + * + * @return EOK on success or a negative error code + */ +int +battery_status_get(async_sess_t *sess, battery_status_t *batt_status) +{ + sysarg_t status; + + async_exch_t *exch = async_exchange_begin(sess); + + int const rc = async_req_1_1(exch, DEV_IFACE_ID(BATTERY_DEV_IFACE), + BATTERY_STATUS_GET, &status); + + async_exchange_end(exch); + + if (rc == EOK) + *batt_status = (battery_status_t) status; + + return rc; +} + +/** Read the current battery charge level from the device + * + * @param sess Session of the device + * @param level Battery charge level (0 - 100) + * + * @return EOK on success or a negative error code + */ +int +battery_charge_level_get(async_sess_t *sess, int *level) +{ + sysarg_t charge_level; + + async_exch_t *exch = async_exchange_begin(sess); + + int const rc = async_req_1_1(exch, DEV_IFACE_ID(BATTERY_DEV_IFACE), + BATTERY_CHARGE_LEVEL_GET, &charge_level); + + async_exchange_end(exch); + + if (rc == EOK) + *level = (int) charge_level; + + return rc; +} + +/** @} + */ + Index: uspace/lib/c/include/device/battery_dev.h =================================================================== --- uspace/lib/c/include/device/battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) +++ uspace/lib/c/include/device/battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -0,0 +1,55 @@ +/* + * 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_BATTERY_DEV_H_ +#define LIBC_DEVICE_BATTERY_DEV_H_ + +#include + +typedef enum { + BATTERY_OK, + BATTERY_EXHAUSTED, + BATTERY_NOT_PRESENT, +} battery_status_t; + +typedef enum { + BATTERY_STATUS_GET = 0, + BATTERY_CHARGE_LEVEL_GET, +} battery_dev_method_t; + +extern int battery_status_get(async_sess_t *, battery_status_t *); +extern int battery_charge_level_get(async_sess_t *, int *); + +#endif + Index: pace/lib/c/include/ipc/clock_ctl.h =================================================================== --- uspace/lib/c/include/ipc/clock_ctl.h (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ (revision ) @@ -1,39 +1,0 @@ -/* - * 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 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/lib/c/include/ipc/dev_iface.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -56,4 +56,6 @@ /** Interface provided by Real Time Clock devices */ CLOCK_DEV_IFACE, + /** Interface provided by battery powered devices */ + BATTERY_DEV_IFACE, /** Interface provided by AHCI devices. */ AHCI_DEV_IFACE, Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/lib/drv/Makefile (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -47,4 +47,5 @@ generic/remote_usbhid.c \ generic/remote_clock_dev.c \ + generic/remote_battery_dev.c \ generic/remote_ahci.c Index: uspace/lib/drv/generic/remote_clock_dev.c =================================================================== --- uspace/lib/drv/generic/remote_clock_dev.c (revision 0d911ee88ccc7cd4c00535c1e496c7b387ca25ae) +++ uspace/lib/drv/generic/remote_clock_dev.c (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -104,5 +104,5 @@ } -/** Process the write request from the remote client +/** Process the time_set() request from the remote client * * @param fun The function to which the data are written Index: uspace/lib/drv/include/ops/battery_dev.h =================================================================== --- uspace/lib/drv/include/ops/battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) +++ uspace/lib/drv/include/ops/battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -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_BATTERY_DEV_H_ +#define LIBDRV_OPS_BATTERY_DEV_H_ + +#include "../ddf/driver.h" +#include "device/battery_dev.h" + +typedef struct { + int (*battery_status_get)(ddf_fun_t *, battery_status_t *); + int (*battery_charge_level_get)(ddf_fun_t *, int *); +} battery_dev_ops_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_battery_dev.h =================================================================== --- uspace/lib/drv/include/remote_battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) +++ uspace/lib/drv/include/remote_battery_dev.h (revision 917797f1cec4a09619bf92bcb7aaec9ac4de9839) @@ -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_BATTERY_DEV_H_ +#define LIBDRV_REMOTE_BATTERY_DEV_H_ + +extern remote_iface_t remote_battery_dev_iface; + +#endif + +/** + * @} + */ +