Changes in uspace/srv/devman/main.c [422722e:7beb220] in mainline

File:

• uspace/srv/devman/main.c (modified) (10 diffs)

uspace/srv/devman/main.c

@@ -65 +65 @@
 static dev_tree_t device_tree;
 
-static int init_running_drv(void *drv);
-
 /** Register running driver. */
-static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call)
-{
+static driver_t *devman_driver_register(void)
+{
+        ipc_call_t icall;
+        ipc_callid_t iid;
         driver_t *driver = NULL;
+
+        log_msg(LVL_DEBUG, "devman_driver_register");
+        
+        iid = async_get_call(&icall);
+        if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) {
+                async_answer_0(iid, EREFUSED);
+                return NULL;
+        }
+        
         char *drv_name = NULL;
-
-        log_msg(LVL_DEBUG, "devman_driver_register");
         
         /* Get driver name. */
         int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
-                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
                 return NULL;
         }
@@ -91 +98 @@
                 free(drv_name);
                 drv_name = NULL;
-                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
                 return NULL;
         }
@@ -105 +112 @@
                     driver->name);
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, EEXISTS);
+                async_answer_0(iid, EEXISTS);
                 return NULL;
         }
@@ -127 +134 @@
         log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
             driver->name);
-        driver->sess = async_callback_receive(EXCHANGE_PARALLEL);
+        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;
         }
-        /* FIXME: Work around problem with callback sessions */
-        async_sess_args_set(driver->sess, DRIVER_DEVMAN, 0, 0);
+        
+        fibril_mutex_unlock(&driver->driver_mutex);
         
         log_msg(LVL_NOTE,
@@ -140 +147 @@
             driver->name);
         
-        /*
-         * Initialize the driver as running (e.g. pass assigned devices to it)
-         * in a separate fibril; the separate fibril is used to enable the
-         * driver to use devman service during the driver's initialization.
-         */
-        fid_t fid = fibril_create(init_running_drv, driver);
-        if (fid == 0) {
-                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
-                    "for driver `%s'.", driver->name);
-                fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, ENOMEM);
-                return NULL;
-        }
-        
-        fibril_add_ready(fid);
-        fibril_mutex_unlock(&driver->driver_mutex);
-        
-        async_answer_0(callid, EOK);
+        async_answer_0(iid, EOK);
+        
         return driver;
 }
@@ -438 +429 @@
 static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
-        client_t *client;
-        driver_t *driver;
-        
         /* Accept the connection. */
         async_answer_0(iid, EOK);
         
-        client = async_get_client_data();
-        if (client == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate client data.");
-                return;
-        }
+        driver_t *driver = devman_driver_register();
+        if (driver == NULL)
+                return;
+        
+        /*
+         * Initialize the driver as running (e.g. pass assigned devices to it)
+         * in a separate fibril; the separate fibril is used to enable the
+         * driver to use devman service during the driver's initialization.
+         */
+        fid_t fid = fibril_create(init_running_drv, driver);
+        if (fid == 0) {
+                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
+                    "for driver `%s'.", driver->name);
+                return;
+        }
+        fibril_add_ready(fid);
         
         while (true) {
@@ -457 +456 @@
                         break;
                 
-                if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) {
-                        fibril_mutex_lock(&client->mutex);
-                        driver = client->driver;
-                        fibril_mutex_unlock(&client->mutex);
-                        if (driver == NULL) {
-                                /* First call must be to DEVMAN_DRIVER_REGISTER */
-                                async_answer_0(callid, ENOTSUP);
-                                continue;
-                        }
-                }
-                
                 switch (IPC_GET_IMETHOD(call)) {
-                case DEVMAN_DRIVER_REGISTER:
-                        fibril_mutex_lock(&client->mutex);
-                        if (client->driver != NULL) {
-                                fibril_mutex_unlock(&client->mutex);
-                                async_answer_0(callid, EINVAL);
-                                continue;
-                        }
-                        client->driver = devman_driver_register(callid, &call);
-                        fibril_mutex_unlock(&client->mutex);
-                        break;
                 case DEVMAN_ADD_FUNCTION:
                         devman_add_function(callid, &call);
@@ -836 +814 @@
 static void devman_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        /* Select port. */
+        /* Select interface. */
         switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
         case DEVMAN_DRIVER:
@@ -862 +840 @@
 }
 
-static void *devman_client_data_create(void)
-{
-        client_t *client;
-        
-        client = calloc(1, sizeof(client_t));
-        if (client == NULL)
-                return NULL;
-        
-        fibril_mutex_initialize(&client->mutex);
-        return client;
-}
-
-static void devman_client_data_destroy(void *data)
-{
-        free(data);
-}
-
 /** Initialize device manager internal structures. */
 static bool devman_init(void)
@@ -925 +886 @@
         }
         
-        /* Set handlers for incoming connections. */
-        async_set_client_data_constructor(devman_client_data_create);
-        async_set_client_data_destructor(devman_client_data_destroy);
+        /* Set a handler of incomming connections. */
         async_set_client_connection(devman_connection);