Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) +++ uspace/lib/c/Makefile (revision 26c03dbdf129d84bd2eab547247da016fe47f30d) @@ -71,5 +71,4 @@ 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 7f620e8406775dfd73a55d55e17b5fe29550ed8b) +++ (revision ) @@ -1,93 +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. - */ - - /** @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 7f620e8406775dfd73a55d55e17b5fe29550ed8b) +++ (revision ) @@ -1,55 +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. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_DEVICE_BATTERY_DEV_H_ -#define LIBC_DEVICE_BATTERY_DEV_H_ - -#include - -typedef enum { - BATTERY_OK, - BATTERY_LOW, - 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: uspace/lib/drv/generic/remote_battery_dev.c =================================================================== --- uspace/lib/drv/generic/remote_battery_dev.c (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) +++ uspace/lib/drv/generic/remote_battery_dev.c (revision 26c03dbdf129d84bd2eab547247da016fe47f30d) @@ -36,7 +36,57 @@ #include #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; +} static void remote_battery_status_get(ddf_fun_t *, void *, ipc_callid_t, Index: uspace/lib/drv/include/battery_iface.h =================================================================== --- uspace/lib/drv/include/battery_iface.h (revision 26c03dbdf129d84bd2eab547247da016fe47f30d) +++ uspace/lib/drv/include/battery_iface.h (revision 26c03dbdf129d84bd2eab547247da016fe47f30d) @@ -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 LIBDRV_BATTERY_IFACE_H_ +#define LIBDRV_BATTERY_IFACE_H_ + +#include + +typedef enum { + BATTERY_OK, + BATTERY_LOW, + 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: uspace/lib/drv/include/ops/battery_dev.h =================================================================== --- uspace/lib/drv/include/ops/battery_dev.h (revision 7f620e8406775dfd73a55d55e17b5fe29550ed8b) +++ uspace/lib/drv/include/ops/battery_dev.h (revision 26c03dbdf129d84bd2eab547247da016fe47f30d) @@ -37,5 +37,5 @@ #include "../ddf/driver.h" -#include "device/battery_dev.h" +#include "battery_iface.h" typedef struct {