Changeset b2d06fa in mainline for uspace/lib/c/generic/device/hw_res.c

Timestamp:

2010-12-25T17:14:36Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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 changes.

File:

• uspace/lib/c/generic/device/hw_res.c (modified) (1 diff)

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