Changes in uspace/lib/drv/generic/driver.c [2a770a35:45059d6b] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (20 diffs)

uspace/lib/drv/generic/driver.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ctype.h>
 #include <errno.h>
@@ -138 +139 @@
 find_interrupt_context_by_id(interrupt_context_list_t *list, int id)
 {
+        interrupt_context_t *ctx;
+        
         fibril_mutex_lock(&list->mutex);
         
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
+        list_foreach(list->contexts, link) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->id == id) {
@@ -149 +149 @@
                         return ctx;
                 }
-                link = link->next;
         }
         
@@ -159 +158 @@
 find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
+        interrupt_context_t *ctx;
+        
         fibril_mutex_lock(&list->mutex);
         
-        link_t *link = list->contexts.next;
-        interrupt_context_t *ctx;
-        
-        while (link != &list->contexts) {
+        list_foreach(list->contexts, link) {
                 ctx = list_get_instance(link, interrupt_context_t, link);
                 if (ctx->irq == irq && ctx->dev == dev) {
@@ -170 +168 @@
                         return ctx;
                 }
-                link = link->next;
         }
         
@@ -230 +227 @@
 }
 
-static ddf_fun_t *driver_get_function(link_t *functions, devman_handle_t handle)
+static ddf_fun_t *driver_get_function(list_t *functions, devman_handle_t handle)
 {
         ddf_fun_t *fun = NULL;
         
         fibril_mutex_lock(&functions_mutex);
-        link_t *link = functions->next;
-        
-        while (link != functions) {
+        
+        list_foreach(*functions, link) {
                 fun = list_get_instance(link, ddf_fun_t, link);
                 if (fun->handle == handle) {
@@ -243 +239 @@
                         return fun;
                 }
-                
-                link = link->next;
         }
         
@@ -273 +267 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (res == EOK) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
-                    driver->name, dev_handle);
-        } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
-                    driver->name, dev_handle);
+        if (res != EOK)
                 delete_device(dev);
-        }
         
         async_answer_0(iid, res);
@@ -290 +278 @@
         async_answer_0(iid, EOK);
         
-        bool cont = true;
-        while (cont) {
+        while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        cont = false;
-                        continue;
                 case DRIVER_ADD_DEVICE:
                         driver_add_device(callid, &call);
@@ -308 +295 @@
 }
 
-/**
- * Generic client connection handler both for applications and drivers.
- *
- * @param drv           True for driver client, false for other clients
- *                      (applications, services etc.).
+/** Generic client connection handler both for applications and drivers.
+ *
+ * @param drv True for driver client, false for other clients
+ *            (applications, services, etc.).
+ *
  */
 static void driver_connection_gen(ipc_callid_t iid, ipc_call_t *icall, bool drv)
@@ -322 +309 @@
         devman_handle_t handle = IPC_GET_ARG2(*icall);
         ddf_fun_t *fun = driver_get_function(&functions, handle);
-
+        
         if (fun == NULL) {
                 printf("%s: driver_connection_gen error - no function with handle"
@@ -330 +317 @@
         }
         
+        if (fun->conn_handler != NULL) {
+                /* Driver has a custom connection handler. */
+                (*fun->conn_handler)(iid, icall, (void *)fun);
+                return;
+        }
         
         /*
@@ -345 +337 @@
                 return;
         
-        while (1) {
+        while (true) {
                 ipc_callid_t callid;
                 ipc_call_t call;
                 callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
-                int iface_idx;
-                
-                switch  (method) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!method) {
                         /* Close device function */
                         if (fun->ops != NULL && fun->ops->close != NULL)
@@ -359 +349 @@
                         async_answer_0(callid, EOK);
                         return;
-                default:
-                        /* convert ipc interface id to interface index */
-                        
-                        iface_idx = DEV_IFACE_IDX(method);
-                        
-                        if (!is_valid_iface_idx(iface_idx)) {
-                                remote_handler_t *default_handler =
-                                    function_get_default_handler(fun);
-                                if (default_handler != NULL) {
-                                        (*default_handler)(fun, callid, &call);
-                                        break;
-                                }
-                                
-                                /*
-                                 * Function has no such interface and
-                                 * default handler is not provided.
-                                 */
-                                printf("%s: driver_connection_gen error - "
-                                    "invalid interface id %d.",
-                                    driver->name, iface_idx);
-                                async_answer_0(callid, ENOTSUP);
-                                break;
-                        }
-                        
-                        /* calling one of the function's interfaces */
-                        
-                        /* Get the interface ops structure. */
-                        void *ops = function_get_ops(fun, iface_idx);
-                        if (ops == NULL) {
-                                printf("%s: driver_connection_gen error - ",
-                                    driver->name);
-                                printf("Function with handle %" PRIun " has no interface "
-                                    "with id %d.\n", handle, iface_idx);
-                                async_answer_0(callid, ENOTSUP);
-                                break;
+                }
+                
+                /* Convert ipc interface id to interface index */
+                
+                int iface_idx = DEV_IFACE_IDX(method);
+                
+                if (!is_valid_iface_idx(iface_idx)) {
+                        remote_handler_t *default_handler =
+                            function_get_default_handler(fun);
+                        if (default_handler != NULL) {
+                                (*default_handler)(fun, callid, &call);
+                                continue;
                         }
                         
                         /*
-                         * Get the corresponding interface for remote request
-                         * handling ("remote interface").
+                         * Function has no such interface and
+                         * default handler is not provided.
                          */
-                        remote_iface_t *rem_iface = get_remote_iface(iface_idx);
-                        assert(rem_iface != NULL);
-                        
-                        /* get the method of the remote interface */
-                        sysarg_t iface_method_idx = IPC_GET_ARG1(call);
-                        remote_iface_func_ptr_t iface_method_ptr =
-                            get_remote_method(rem_iface, iface_method_idx);
-                        if (iface_method_ptr == NULL) {
-                                // the interface has not such method
-                                printf("%s: driver_connection_gen error - "
-                                    "invalid interface method.", driver->name);
-                                async_answer_0(callid, ENOTSUP);
-                                break;
-                        }
-                        
-                        /*
-                         * Call the remote interface's method, which will
-                         * receive parameters from the remote client and it will
-                         * pass it to the corresponding local interface method
-                         * associated with the function by its driver.
-                         */
-                        (*iface_method_ptr)(fun, ops, callid, &call);
-                        break;
+                        printf("%s: driver_connection_gen error - "
+                            "invalid interface id %d.",
+                            driver->name, iface_idx);
+                        async_answer_0(callid, ENOTSUP);
+                        continue;
                 }
+                
+                /* Calling one of the function's interfaces */
+                
+                /* Get the interface ops structure. */
+                void *ops = function_get_ops(fun, iface_idx);
+                if (ops == NULL) {
+                        printf("%s: driver_connection_gen error - ", driver->name);
+                        printf("Function with handle %" PRIun " has no interface "
+                            "with id %d.\n", handle, iface_idx);
+                        async_answer_0(callid, ENOTSUP);
+                        continue;
+                }
+                
+                /*
+                 * Get the corresponding interface for remote request
+                 * handling ("remote interface").
+                 */
+                remote_iface_t *rem_iface = get_remote_iface(iface_idx);
+                assert(rem_iface != NULL);
+                
+                /* get the method of the remote interface */
+                sysarg_t iface_method_idx = IPC_GET_ARG1(call);
+                remote_iface_func_ptr_t iface_method_ptr =
+                    get_remote_method(rem_iface, iface_method_idx);
+                if (iface_method_ptr == NULL) {
+                        /* The interface has not such method */
+                        printf("%s: driver_connection_gen error - "
+                            "invalid interface method.", driver->name);
+                        async_answer_0(callid, ENOTSUP);
+                        continue;
+                }
+                
+                /*
+                 * Call the remote interface's method, which will
+                 * receive parameters from the remote client and it will
+                 * pass it to the corresponding local interface method
+                 * associated with the function by its driver.
+                 */
+                (*iface_method_ptr)(fun, ops, callid, &call);
         }
 }
@@ -438 +426 @@
 
 /** Function for handling connections to device driver. */
-static void driver_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
+static void driver_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        sysarg_t conn_type;
+
+        if (iid == 0) {
+                /* Callback connection from devman */
+                /* XXX Use separate handler for this type of connection */
+                conn_type = DRIVER_DEVMAN;
+        } else {
+                conn_type = IPC_GET_ARG1(*icall);
+        }
+
         /* Select interface */
-        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        switch (conn_type) {
         case DRIVER_DEVMAN:
                 /* Handle request from device manager */
@@ -594 +592 @@
 int ddf_fun_bind(ddf_fun_t *fun)
 {
+        assert(fun->bound == false);
         assert(fun->name != NULL);
         
@@ -610 +609 @@
 }
 
+/** Unbind a function node.
+ *
+ * Unbind the specified function from the system. This effectively makes
+ * the function invisible to the system.
+ *
+ * @param fun           Function to bind
+ * @return              EOK on success or negative error code
+ */
+int ddf_fun_unbind(ddf_fun_t *fun)
+{
+        int res;
+        
+        assert(fun->bound == true);
+        
+        add_to_functions_list(fun);
+        res = devman_remove_function(fun->handle);
+        if (res != EOK)
+                return res;
+
+        remove_from_functions_list(fun);
+        
+        fun->bound = false;
+        return EOK;
+}
+
 /** Add single match ID to inner function.
  *
@@ -632 +656 @@
                 return ENOMEM;
         
-        match_id->id = match_id_str;
+        match_id->id = str_dup(match_id_str);
         match_id->score = 90;
         
@@ -647 +671 @@
 }
 
-/** Add exposed function to class.
+/** Add exposed function to category.
  *
  * Must only be called when the function is bound.
  */
-int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name)
+int ddf_fun_add_to_category(ddf_fun_t *fun, const char *cat_name)
 {
         assert(fun->bound == true);
         assert(fun->ftype == fun_exposed);
         
-        return devman_add_device_to_class(fun->handle, class_name);
+        return devman_add_device_to_category(fun->handle, cat_name);
 }
 
 int ddf_driver_main(driver_t *drv)
 {
+        int rc;
+
         /*
          * Remember the driver structure - driver_ops will be called by generic
@@ -674 +700 @@
         
         /*
-         * Register driver by device manager with generic handler for incoming
-         * connections.
+         * Register driver with device manager using generic handler for
+         * incoming connections.
          */
-        devman_driver_register(driver->name, driver_connection);
-        
+        rc = devman_driver_register(driver->name, driver_connection);
+        if (rc != EOK) {
+                printf("Error: Failed to register driver with device manager "
+                    "(%s).\n", (rc == EEXISTS) ? "driver already started" :
+                    str_error(rc));
+                
+                return 1;
+        }
+        
+        /* Return success from the task since server has started. */
+        rc = task_retval(0);
+        if (rc != EOK)
+                return 1;
+
         async_manager();