Changeset bb8f69d in mainline

Timestamp:

2012-04-12T15:54:57Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95060d5b

Parents:

85f2064

Message:

rtc: add support to the dev_remove driver operation

File:

• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (6 diffs)

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

@@ -55 +55 @@
 
 #define RTC_FROM_FNODE(fnode)  ((rtc_t *) ((fnode)->dev->driver_data))
+#define RTC_FROM_DEV(devnode)  ((rtc_t *) ((devnode)->driver_data))
 
 typedef struct rtc {
@@ -69 +70 @@
         /** true if a client is connected to the device */
         bool client_connected;
+        /** true if device is removed */
+        bool removed;
 } rtc_t;
 
@@ -85 +88 @@
 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);
 
 
@@ -92 +96 @@
 static driver_ops_t rtc_ops = {
         .dev_add = rtc_dev_add,
-        .dev_remove = NULL, /* XXX */
+        .dev_remove = rtc_dev_remove,
 };
 
@@ -394 +398 @@
 }
 
+/** The dev_remove callback for the rtc driver
+ *
+ * @param dev   The RTC device
+ *
+ * @return      EOK on success or a negative error code
+ */
+static int
+rtc_dev_remove(ddf_dev_t *dev)
+{
+        rtc_t *rtc = RTC_FROM_DEV(dev);
+        int rc;
+
+        fibril_mutex_lock(&rtc->mutex);
+        if (rtc->client_connected) {
+                fibril_mutex_unlock(&rtc->mutex);
+                return EBUSY;
+        }
+
+        rtc->removed = true;
+        fibril_mutex_unlock(&rtc->mutex);
+
+        rc = ddf_fun_unbind(rtc->fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to unbind function");
+                return rc;
+        }
+
+        ddf_fun_destroy(rtc->fun);
+        rtc_dev_cleanup(rtc);
+
+        return rc;
+}
+
 /** Default handler for client requests not handled
  *  by the standard interface
@@ -430 +467 @@
 
         if (rtc->client_connected)
-                rc = EBUSY;
+                rc = ELIMIT;
+        else if (rtc->removed)
+                rc = ENXIO;
         else {
                 rc = EOK;