Changeset 8b863a62 in mainline for uspace/lib/drv/generic/remote_battery_dev.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/drv/generic/remote_battery_dev.c (modified) (3 diffs)

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,
@@ -45 +96 @@
 
 /** Remote battery interface operations */
-static remote_iface_func_ptr_t remote_battery_dev_iface_ops[] = {
-        &remote_battery_status_get,
-        &remote_battery_charge_level_get,
+static const remote_iface_func_ptr_t remote_battery_dev_iface_ops[] = {
+        [BATTERY_STATUS_GET] = remote_battery_status_get,
+        [BATTERY_CHARGE_LEVEL_GET] = remote_battery_charge_level_get,
 };
 
@@ -56 +107 @@
  *
  */
-remote_iface_t remote_battery_dev_iface = {
-        .method_count = sizeof(remote_battery_dev_iface_ops) /
-            sizeof(remote_iface_func_ptr_t),
+const remote_iface_t remote_battery_dev_iface = {
+        .method_count = ARRAY_SIZE(remote_battery_dev_iface_ops),
         .methods = remote_battery_dev_iface_ops,
 };