Changeset 41811af in mainline for uspace/lib/c/include/device/hw_res.h

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/lib/c/include/device/hw_res.h (modified) (6 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /** @addtogroup libc
  * @{
@@ -32 +32 @@
 /** @file
  */
- 
+
 #ifndef LIBC_DEVICE_HW_RES_H_
 #define LIBC_DEVICE_HW_RES_H_
 
 #include <ipc/dev_iface.h>
+#include <async.h>
 #include <bool.h>
 
@@ -48 +49 @@
 typedef enum {
         INTERRUPT,
-        IO_RANGE, 
+        IO_RANGE,
         MEM_RANGE
 } hw_res_type_t;
@@ -66 +67 @@
                         size_t size;
                 } mem_range;
-
+                
                 struct {
                         uint64_t address;
@@ -72 +73 @@
                         size_t size;
                 } io_range;
-
+                
                 struct {
                         int irq;
@@ -88 +89 @@
         if (hw_res->resources != NULL) {
                 free(hw_res->resources);
-
                 hw_res->resources = NULL;
         }
-
+        
         hw_res->count = 0;
 }
 
-extern int hw_res_get_resource_list(int, hw_resource_list_t *);
-extern bool hw_res_enable_interrupt(int);
+extern int hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *);
+extern bool hw_res_enable_interrupt(async_sess_t *);
 
 #endif