Changeset be942bc in mainline

Timestamp:

2010-12-21T11:43:44Z (13 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

Files:

• drv/ns8250/ns8250.c (modified) (3 diffs)
• drv/pciintel/pci.c (modified) (2 diffs)
• lib/c/generic/device/hw_res.c (modified) (1 diff)
• lib/c/include/device/hw_res.h (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (modified) (1 diff)

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;
         }       
         

uspace/lib/c/generic/device/hw_res.c

@@ -38 +38 @@
 #include <malloc.h>
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
+int get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
 {
         sysarg_t count = 0;
         int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE), GET_RESOURCE_LIST, &count);
         hw_resources->count = count;
-        if (EOK != rc) {
-                return false;
-        }
+        if (rc != EOK)
+                return rc;
         
         size_t size = count * sizeof(hw_resource_t);
         hw_resources->resources = (hw_resource_t *)malloc(size);
-        if (NULL == hw_resources->resources) {
-                return false;
-        }
+        if (!hw_resources->resources)
+                return ENOMEM;
         
         rc = async_data_read_start(dev_phone, hw_resources->resources, size);
-        if (EOK != rc) {
+        if (rc != EOK) {
                 free(hw_resources->resources);
                 hw_resources->resources = NULL;
-                return false;
+                return rc;
         }
                  
-        return true;     
+        return EOK;
 }
 

uspace/lib/c/include/device/hw_res.h

@@ -95 +95 @@
 
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources);
-
-bool enable_interrupt(int dev_phone);
+extern int get_hw_resources(int, hw_resource_list_t *);
+extern bool enable_interrupt(int);
 
 

uspace/srv/net/tl/tcp/tcp.c

@@ -2085 +2085 @@
         if (!fibril) {
                 free(operation_timeout);
-                return EPARTY;  /* FIXME: use another EC */
-        }
+                return ENOMEM;
+        }
+
 //      fibril_mutex_lock(&socket_data->operation.mutex);
         /* Start the timeout fibril */