Changeset 6a44ee4 in mainline for uspace/srv/devman

Timestamp:

2011-07-20T15:26:21Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.

Location:

uspace/srv/devman

Files:

• devman.c (modified) (17 diffs)
• devman.h (modified) (9 diffs)
• main.c (modified) (13 diffs)
• match.c (modified) (2 diffs)

uspace/srv/devman/devman.c

@@ -466 +466 @@
         fibril_mutex_lock(&drivers_list->drivers_mutex);
         
-        link_t *link = drivers_list->drivers.next;
-        while (link != &drivers_list->drivers) {
+        list_foreach(drivers_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 score = get_match_score(drv, node);
@@ -474 +473 @@
                         best_drv = drv;
                 }
-                link = link->next;
         }
         
@@ -536 +534 @@
         driver_t *res = NULL;
         driver_t *drv = NULL;
-        link_t *link;
         
         fibril_mutex_lock(&drv_list->drivers_mutex);
         
-        link = drv_list->drivers.next;
-        while (link != &drv_list->drivers) {
+        list_foreach(drv_list->drivers, link) {
                 drv = list_get_instance(link, driver_t, drivers);
                 if (str_cmp(drv->name, drv_name) == 0) {
@@ -547 +543 @@
                         break;
                 }
-
-                link = link->next;
         }
         
@@ -564 +558 @@
         dev_node_t *dev;
         link_t *link;
-        int phone;
 
         log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
@@ -570 +563 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
-
-        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-
-        if (phone < 0) {
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+            DRIVER_DEVMAN, 0, 0);
+        async_exchange_end(exch);
+
+        if (!sess) {
                 fibril_mutex_unlock(&driver->driver_mutex);
                 return;
@@ -582 +578 @@
          * that has not been passed to the driver.
          */
-        link = driver->devices.next;
-        while (link != &driver->devices) {
+        link = driver->devices.head.next;
+        while (link != &driver->devices.head) {
                 dev = list_get_instance(link, dev_node_t, driver_devices);
                 if (dev->passed_to_driver) {
@@ -602 +598 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(phone, driver, dev, tree);
+                add_device(sess, driver, dev, tree);
 
                 /*
@@ -620 +616 @@
                  * Restart the cycle to go through all devices again.
                  */
-                link = driver->devices.next;
-        }
-
-        async_hangup(phone);
+                link = driver->devices.head.next;
+        }
+
+        async_hangup(sess);
 
         /*
@@ -673 +669 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->phone = -1;
+        drv->sess = NULL;
 }
 
@@ -737 +733 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(int phone, driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
+void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
+    dev_tree_t *tree)
 {
         /*
@@ -746 +743 @@
             drv->name, dev->pfun->name);
         
-        sysarg_t rc;
-        ipc_call_t answer;
-        
         /* Send the device to the driver. */
         devman_handle_t parent_handle;
@@ -756 +750 @@
                 parent_handle = 0;
         }
-
-        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, dev->handle,
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(exch, DRIVER_ADD_DEVICE, dev->handle,
             parent_handle, &answer);
         
-        /* Send the device's name to the driver. */
-        rc = async_data_write_start(phone, dev->pfun->name,
+        /* Send the device name to the driver. */
+        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
+        
+        async_exchange_end(exch);
+        
         if (rc != EOK) {
                 /* TODO handle error */
@@ -823 +823 @@
         if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
-                if (phone >= 0) {
-                        add_device(phone, drv, dev, tree);
-                        async_hangup(phone);
+                async_exch_t *exch = async_exchange_begin(drv->sess);
+                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+                    DRIVER_DEVMAN, 0, 0);
+                async_exchange_end(exch);
+                
+                if (sess) {
+                        add_device(sess, drv, dev, tree);
+                        async_hangup(sess);
                 }
         }
@@ -1177 +1181 @@
 
         fun_node_t *fun;
-        link_t *link;
-
-        for (link = dev->functions.next;
-            link != &dev->functions;
-            link = link->next) {
+
+        list_foreach(dev->functions, link) {
                 fun = list_get_instance(link, fun_node_t, dev_functions);
 
@@ -1375 +1376 @@
 {
         dev_class_t *cl;
-        link_t *link = class_list->classes.next;
-        
-        while (link != &class_list->classes) {
+        
+        list_foreach(class_list->classes, link) {
                 cl = list_get_instance(link, dev_class_t, link);
                 if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
                 }
-                link = link->next;
         }
         
@@ -1398 +1397 @@
         assert(dev_name != NULL);
 
-        link_t *link;
-        for (link = dev_class->devices.next;
-            link != &dev_class->devices;
-            link = link->next) {
+        list_foreach(dev_class->devices, link) {
                 dev_class_info_t *dev = list_get_instance(link,
                     dev_class_info_t, link);

uspace/srv/devman/devman.h

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <atomic.h>
+#include <async.h>
 
 #include "util.h"
@@ -87 +88 @@
         int state;
         
-        /** Phone asociated with this driver. */
-        int phone;
+        /** Session asociated with this driver. */
+        async_sess_t *sess;
         /** Name of the device driver. */
         char *name;
@@ -95 +96 @@
         /** List of device ids for device-to-driver matching. */
         match_id_list_t match_ids;
-        /** Pointer to the linked list of devices controlled by this driver. */
-        link_t devices;
-        
-        /**
-         * Fibril mutex for this driver - driver state, list of devices, phone.
+        /** List of devices controlled by this driver. */
+        list_t devices;
+        
+        /**
+         * Fibril mutex for this driver - driver state, list of devices, session.
          */
         fibril_mutex_t driver_mutex;
@@ -107 +108 @@
 typedef struct driver_list {
         /** List of drivers */
-        link_t drivers;
+        list_t drivers;
         /** Fibril mutex for list of drivers. */
         fibril_mutex_t drivers_mutex;
@@ -129 +130 @@
         
         /** List of device functions. */
-        link_t functions;
+        list_t functions;
         /** Driver of this device. */
         driver_t *drv;
@@ -169 +170 @@
         match_id_list_t match_ids;
         
-        /** The list of device classes to which this device function belongs. */
-        link_t classes;
+        /** List of device classes to which this device function belongs. */
+        list_t classes;
         /** Devmap handle if the device function is registered by devmap. */
         devmap_handle_t devmap_handle;
@@ -227 +228 @@
          * this class.
          */
-        link_t devices;
+        list_t devices;
         
         /**
@@ -279 +280 @@
 typedef struct class_list {
         /** List of classes. */
-        link_t classes;
+        list_t classes;
         
         /**
@@ -312 +313 @@
 extern void add_driver(driver_list_t *, driver_t *);
 extern void attach_driver(dev_node_t *, driver_t *);
-extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
+extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
 

uspace/srv/devman/main.c

@@ -39 +39 @@
 #include <assert.h>
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <stdio.h>
@@ -108 +108 @@
         fibril_mutex_lock(&driver->driver_mutex);
         
-        if (driver->phone >= 0) {
+        if (driver->sess) {
                 /* We already have a connection to the driver. */
                 log_msg(LVL_ERROR, "Driver '%s' already started.\n",
@@ -128 +128 @@
                 break;
         case DRIVER_RUNNING:
-                /* Should not happen since we do not have a connected phone */
+                /* Should not happen since we do not have a connected session */
                 assert(false);
         }
@@ -135 +135 @@
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
             driver->name);
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+        driver->sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (!driver->sess) {
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, ENOTSUP);
                 async_answer_0(iid, ENOTSUP);
                 return NULL;
         }
         
-        /* Remember driver's phone. */
-        driver->phone = IPC_GET_ARG5(call);
-        
         fibril_mutex_unlock(&driver->driver_mutex);
         
-        log_msg(LVL_NOTE, 
+        log_msg(LVL_NOTE,
             "The `%s' driver was successfully registered as running.",
             driver->name);
         
-        async_answer_0(callid, EOK);
         async_answer_0(iid, EOK);
         
@@ -434 +428 @@
         fibril_add_ready(fid);
         
-        ipc_callid_t callid;
-        ipc_call_t call;
-        bool cont = true;
-        while (cont) {
-                callid = async_get_call(&call);
+        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 DEVMAN_ADD_FUNCTION:
                         devman_add_function(callid, &call);
@@ -515 +507 @@
 }
 
+/** Find device path by its handle. */
+static void devman_get_device_path_by_handle(ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        devman_handle_t handle = IPC_GET_ARG1(*icall);
+
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        ipc_callid_t data_callid;
+        size_t data_len;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        void *buffer = malloc(data_len);
+        if (buffer == NULL) {
+                async_answer_0(data_callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        size_t sent_length = str_size(fun->pathname);
+        if (sent_length > data_len) {
+                sent_length = data_len;
+        }
+
+        async_data_read_finalize(data_callid, fun->pathname, sent_length);
+        async_answer_0(iid, EOK);
+
+        free(buffer);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -522 +551 @@
         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 DEVMAN_DEVICE_GET_HANDLE:
                         devman_function_get_handle(callid, &call);
@@ -536 +564 @@
                 case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
                         devman_function_get_handle_by_class(callid, &call);
+                        break;
+                case DEVMAN_DEVICE_GET_DEVICE_PATH:
+                        devman_get_device_path_by_handle(callid, &call);
                         break;
                 default:
@@ -606 +637 @@
                 method = DRIVER_CLIENT;
         
-        if (driver->phone < 0) {
-                log_msg(LVL_ERROR, 
-                    "Could not forward to driver `%s' (phone is %d).",
-                    driver->name, (int) driver->phone);
+        if (!driver->sess) {
+                log_msg(LVL_ERROR,
+                    "Could not forward to driver `%s'.", driver->name);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -623 +653 @@
                     dev->pfun->pathname, driver->name);
         }
-
-        async_forward_fast(iid, driver->phone, method, fwd_h, 0, IPC_FF_NONE);
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_forward_fast(iid, exch, method, fwd_h, 0, IPC_FF_NONE);
+        async_exchange_end(exch);
 }
 
@@ -646 +678 @@
         dev = fun->dev;
         
-        if (dev->state != DEVICE_USABLE || dev->drv->phone < 0) {
+        if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) {
                 async_answer_0(iid, EINVAL);
                 return;
         }
         
-        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
+        async_exch_t *exch = async_exchange_begin(dev->drv->sess);
+        async_forward_fast(iid, exch, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        log_msg(LVL_DEBUG, 
+        async_exchange_end(exch);
+        
+        log_msg(LVL_DEBUG,
             "Forwarding devmapper request for `%s' function to driver `%s'.",
             fun->pathname, dev->drv->name);
@@ -659 +694 @@
 
 /** Function for handling connections to device manager. */
-static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void devman_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Select interface. */
@@ -745 +780 @@
 
         printf(NAME ": Accepting connections.\n");
+        task_retval(0);
         async_manager();
 

uspace/srv/devman/match.c

@@ -59 +59 @@
 int get_match_score(driver_t *drv, dev_node_t *dev)
 {
-        link_t *drv_head = &drv->match_ids.ids;
-        link_t *dev_head = &dev->pfun->match_ids.ids;
+        link_t *drv_head = &drv->match_ids.ids.head;
+        link_t *dev_head = &dev->pfun->match_ids.ids.head;
         
-        if (list_empty(drv_head) || list_empty(dev_head))
+        if (list_empty(&drv->match_ids.ids) ||
+            list_empty(&dev->pfun->match_ids.ids)) {
                 return 0;
+        }
         
         /*
@@ -70 +72 @@
         int highest_score = 0;
         
-        link_t *drv_link = drv->match_ids.ids.next;
+        link_t *drv_link = drv->match_ids.ids.head.next;
         while (drv_link != drv_head) {
                 link_t *dev_link = dev_head->next;