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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (3 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
  /** @addtogroup libc
  * @{
@@ -32 +32 @@
 /** @file
  */
- 
+
 #include <device/hw_res.h>
 #include <errno.h>
@@ -38 +38 @@
 #include <malloc.h>
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
+int hw_res_get_resource_list(int dev_phone, hw_resource_list_t *hw_resources)
 {
-        ipcarg_t count = 0;
-        int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE), GET_RESOURCE_LIST, &count);
+        sysarg_t count = 0;
+
+        int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_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 (rc != EOK) {
+                free(hw_resources->resources);
+                hw_resources->resources = NULL;
+                return rc;
         }
         
-        rc = async_data_read_start(dev_phone, hw_resources->resources, size);
-        if (EOK != rc) {
-                free(hw_resources->resources);
-                hw_resources->resources = NULL;
-                return false;
-        }
-                 
-        return true;     
+        return EOK;
 }
 
-bool enable_interrupt(int dev_phone)
+bool hw_res_enable_interrupt(int dev_phone)
 {
-        int rc = async_req_1_0(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE), ENABLE_INTERRUPT);
+        int rc = async_req_1_0(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_ENABLE_INTERRUPT);
+
         return rc == EOK;
 }
- 
- 
- 
- /** @}
+
+/** @}
  */