Changeset 26c03dbd in mainline

Timestamp:

2013-12-31T19:44:11Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7858acbf

Parents:

7f620e8

Message:

libc,libdrv: Move battery iface to libdrv.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/device/battery_dev.c (deleted)
• drv/generic/remote_battery_dev.c (modified) (1 diff)
• drv/include/battery_iface.h (moved) (moved from uspace/lib/c/include/device/battery_dev.h ) (1 diff)
• drv/include/ops/battery_dev.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/char_dev.c \
         generic/device/clock_dev.c \
-        generic/device/battery_dev.c \
         generic/device/graph_dev.c \
         generic/device/nic.c \

uspace/lib/drv/generic/remote_battery_dev.c

@@ -36 +36 @@
 #include <errno.h>
 #include <ops/battery_dev.h>
-#include <device/battery_dev.h>
+#include <battery_iface.h>
 #include <ddf/driver.h>
 #include <macros.h>
+
+/** 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,

uspace/lib/drv/include/battery_iface.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_DEVICE_BATTERY_DEV_H_
-#define LIBC_DEVICE_BATTERY_DEV_H_
+#ifndef LIBDRV_BATTERY_IFACE_H_
+#define LIBDRV_BATTERY_IFACE_H_
 
 #include <async.h>

uspace/lib/drv/include/ops/battery_dev.h

@@ -37 +37 @@
 
 #include "../ddf/driver.h"
-#include "device/battery_dev.h"
+#include "battery_iface.h"
 
 typedef struct {