Changeset 5f7d96e in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2010-12-27T18:18:03Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

43c3937

Parents:

e080332 (diff), e84d65a (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 from development

File:

• uspace/drv/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/ns8250/ns8250.c

@@ -342 +342 @@
                 printf(NAME ": failed to connect to the parent driver of the "
                     "device %s.\n", dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
+                ret = dev->parent_phone;
                 goto failed;
         }
         
         /* Get hw resources. */
-        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
+        ret = get_hw_resources(dev->parent_phone, &hw_resources);
+        if (ret != EOK) {
                 printf(NAME ": failed to get hw resources for the device "
                     "%s.\n", dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
                 goto failed;
         }
@@ -374 +374 @@
                                 printf(NAME ": i/o range assigned to the device "
                                     "%s is too small.\n", dev->name);
-                                ret = EPARTY;   /* FIXME: use another EC */
+                                ret = ELIMIT;
                                 goto failed;
                         }
@@ -390 +390 @@
                 printf(NAME ": missing hw resource(s) for the device %s.\n",
                     dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
+                ret = ENOENT;
                 goto failed;
         }