Changeset 41811af in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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/drv/ns8250/ns8250.c (modified) (2 diffs)

uspace/drv/ns8250/ns8250.c

@@ -263 +263 @@
 static void ns8250_dev_cleanup(ns8250_t *ns)
 {
-        if (ns->dev->parent_phone > 0) {
-                async_hangup(ns->dev->parent_phone);
-                ns->dev->parent_phone = 0;
+        if (ns->dev->parent_sess) {
+                async_hangup(ns->dev->parent_sess);
+                ns->dev->parent_sess = NULL;
         }
 }
@@ -337 +337 @@
         
         /* Connect to the parent's driver. */
-        ns->dev->parent_phone = devman_parent_device_connect(ns->dev->handle,
-            IPC_FLAG_BLOCKING);
-        if (ns->dev->parent_phone < 0) {
+        ns->dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ns->dev->handle, IPC_FLAG_BLOCKING);
+        if (!ns->dev->parent_sess) {
                 ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "
                     "device %s.", ns->dev->name);
-                ret = ns->dev->parent_phone;
+                ret = ENOENT;
                 goto failed;
         }
         
         /* Get hw resources. */
-        ret = hw_res_get_resource_list(ns->dev->parent_phone, &hw_resources);
+        ret = hw_res_get_resource_list(ns->dev->parent_sess, &hw_resources);
         if (ret != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to get HW resources for device "