Changeset be942bc in mainline for uspace/drv

Timestamp:

2010-12-21T11:43:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b0a76d5

Parents:

78ffb70

Message:

Do not use EPARTY inappropriately.

Location:

uspace/drv

Files:

• ns8250/ns8250.c (modified) (3 diffs)
• pciintel/pci.c (modified) (2 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;
         }

uspace/drv/pciintel/pci.c

@@ -452 +452 @@
 static int pci_add_device(device_t *dev)
 {
+        int rc;
+
         printf(NAME ": pci_add_device\n");
         
@@ -466 +468 @@
                     "parent's driver.\n");
                 delete_pci_bus_data(bus_data);
-                return EPARTY;  /* FIXME: use another EC */
+                return dev->parent_phone;
         }
         
         hw_resource_list_t hw_resources;
         
-        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
+        rc = get_hw_resources(dev->parent_phone, &hw_resources);
+        if (rc != EOK) {
                 printf(NAME ": pci_add_device failed to get hw resources for "
                     "the device.\n");
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                return EPARTY;  /* FIXME: use another EC */
+                return rc;
         }