Changeset 95c675b in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

uspace/lib/drv/generic/driver.c

@@ -599 +599 @@
 }
 
-/** Create session with the parent function.
- *
- * The session will be automatically closed when @a dev is destroyed.
- *
- * @param dev Device
- *
- * @return New session or NULL if session could not be created
- *
- */
-async_sess_t *ddf_dev_parent_sess_create(ddf_dev_t *dev)
-{
-        assert(dev->parent_sess == NULL);
-        dev->parent_sess = devman_parent_device_connect(dev->handle,
-            IPC_FLAG_BLOCKING);
-
-        return dev->parent_sess;
-}
-
 /** Return existing session with the parent function.
  *
  * @param dev   Device
- * @return      Existing session or NULL if there is no session
+ * @return      Session with parent function or NULL upon failure
  */
 async_sess_t *ddf_dev_parent_sess_get(ddf_dev_t *dev)
 {
+        if (dev->parent_sess == NULL) {
+                dev->parent_sess = devman_parent_device_connect(dev->handle,
+                    IPC_FLAG_BLOCKING);
+        }
+
         return dev->parent_sess;
 }
@@ -943 +930 @@
         int rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
             NULL, &port);
-        if (rc != EOK)
+        if (rc != EOK) {
+                printf("Error: Failed to create driver port.\n");
                 return rc;
+        }
         
         rc = async_create_port(INTERFACE_DDF_DEVMAN, driver_connection_devman,
             NULL, &port);
-        if (rc != EOK)
+        if (rc != EOK) {
+                printf("Error: Failed to create devman port.\n");
                 return rc;
+        }
         
         async_set_fallback_port_handler(driver_connection_client, NULL);
@@ -964 +955 @@
         /* Return success from the task since server has started. */
         rc = task_retval(0);
-        if (rc != EOK)
+        if (rc != EOK) {
+                printf("Error: Failed returning task value.\n");
                 return rc;
+        }
         
         async_manager();