Changeset f724e82 in mainline

Timestamp:

2011-01-09T12:52:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ce79069b

Parents:

b2263e6a

Message:

Clean up hw_res interface client API.

Location:

uspace

Files:

• drv/ns8250/ns8250.c (modified) (2 diffs)
• drv/pciintel/pci.c (modified) (4 diffs)
• lib/c/generic/device/hw_res.c (modified) (2 diffs)
• lib/c/include/device/hw_res.h (modified) (3 diffs)

uspace/drv/ns8250/ns8250.c

@@ -347 +347 @@
         
         /* Get hw resources. */
-        ret = get_hw_resources(dev->parent_phone, &hw_resources);
+        ret = hw_res_get_resource_list(dev->parent_phone, &hw_resources);
         if (ret != EOK) {
                 printf(NAME ": failed to get hw resources for the device "
@@ -394 +394 @@
         }
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         return ret;
         
 failed:
         ns8250_dev_cleanup(dev);
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         return ret;
 }

uspace/drv/pciintel/pci.c

@@ -473 +473 @@
         hw_resource_list_t hw_resources;
         
-        rc = get_hw_resources(dev->parent_phone, &hw_resources);
+        rc = hw_res_get_resource_list(dev->parent_phone, &hw_resources);
         if (rc != EOK) {
                 printf(NAME ": pci_add_device failed to get hw resources for "
@@ -497 +497 @@
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                clean_hw_resource_list(&hw_resources);
+                hw_res_clean_resource_list(&hw_resources);
                 return EADDRNOTAVAIL;
         }
@@ -508 +508 @@
         pci_bus_scan(dev, 0);
         
-        clean_hw_resource_list(&hw_resources);
+        hw_res_clean_resource_list(&hw_resources);
         
         return EOK;
@@ -537 +537 @@
 {
         if (dev_data != NULL) {
-                clean_hw_resource_list(&dev_data->hw_resources);
+                hw_res_clean_resource_list(&dev_data->hw_resources);
                 free(dev_data);
         }

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

@@ -38 +38 @@
 #include <malloc.h>
 
-int 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)
 {
         sysarg_t count = 0;
 
         int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE),
-            GET_RESOURCE_LIST, &count);
+            HW_RES_GET_RESOURCE_LIST, &count);
 
         hw_resources->count = count;
@@ -64 +64 @@
 }
 
-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);
+            HW_RES_ENABLE_INTERRUPT);
 
         return rc == EOK;

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

@@ -41 +41 @@
 /** HW resource provider interface */
 typedef enum {
-        GET_RESOURCE_LIST = 0,
-        ENABLE_INTERRUPT
+        HW_RES_GET_RESOURCE_LIST = 0,
+        HW_RES_ENABLE_INTERRUPT
 } hw_res_funcs_t;
 
@@ -84 +84 @@
 } hw_resource_list_t;
 
-static inline void clean_hw_resource_list(hw_resource_list_t *hw_res)
+static inline void hw_res_clean_resource_list(hw_resource_list_t *hw_res)
 {
         if (hw_res->resources != NULL) {
@@ -95 +95 @@
 }
 
-extern int get_hw_resources(int, hw_resource_list_t *);
-extern bool enable_interrupt(int);
+extern int hw_res_get_resource_list(int, hw_resource_list_t *);
+extern bool hw_res_enable_interrupt(int);
 
 #endif