Changeset 917797f in mainline

Timestamp:

2012-09-15T14:58:48Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

69a13a4

Parents:

0d911ee

Message:

Add support to the battery interface, not tested yet

Location:

uspace

Files:

• drv/time/cmos-rtc/cmos-rtc.c (modified) (5 diffs)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/device/battery_dev.c (added)
• lib/c/include/device/battery_dev.h (added)
• lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• lib/drv/Makefile (modified) (1 diff)
• lib/drv/generic/remote_clock_dev.c (modified) (1 diff)
• lib/drv/include/ops/battery_dev.h (added)
• lib/drv/include/remote_battery_dev.h (moved) (moved from uspace/lib/c/include/ipc/clock_ctl.h ) (1 diff)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -46 +46 @@
 #include <ddf/log.h>
 #include <ops/clock_dev.h>
+#include <ops/battery_dev.h>
 #include <fibril_synch.h>
 #include <device/hw_res.h>
 #include <macros.h>
-#include <ipc/clock_ctl.h>
 #include <time.h>
 
@@ -94 +94 @@
 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 +118 @@
 };
 
+/** 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 +148 @@
 
         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 +602 @@
 }
 
-/** 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
  *

uspace/lib/c/Makefile

@@ -72 +72 @@
         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/c/include/ipc/dev_iface.h

@@ -56 +56 @@
         /** 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,

uspace/lib/drv/Makefile

@@ -47 +47 @@
         generic/remote_usbhid.c \
         generic/remote_clock_dev.c \
+        generic/remote_battery_dev.c \
         generic/remote_ahci.c
 

uspace/lib/drv/generic/remote_clock_dev.c

@@ -104 +104 @@
 }
 
-/** 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

uspace/lib/drv/include/remote_battery_dev.h

@@ -27 +27 @@
  */
 
-#ifndef LIBC_IPC_CLOCK_CTL_H_
-#define LIBC_IPC_CLOCK_CTL_H_
+/** @addtogroup libdrv
+ * @{
+ */
+/** @file
+ */
 
-#include <ipc/dev_iface.h>
+#ifndef LIBDRV_REMOTE_BATTERY_DEV_H_
+#define LIBDRV_REMOTE_BATTERY_DEV_H_
 
-typedef enum {
-        CLOCK_GET_BATTERY_STATUS = DEV_FIRST_CUSTOM_METHOD,
-} clock_ctl_t;
+extern remote_iface_t remote_battery_dev_iface;
 
 #endif
 
+/**
+ * @}
+ */
+