Changeset b5ba8f6 in mainline for uspace/lib/c/include/device/hw_res_parsed.h

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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/include/device/hw_res_parsed.h (modified) (3 diffs)

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

@@ -37 +37 @@
 
 #include <device/hw_res.h>
+#include <device/pio_window.h>
 #include <str.h>
 
@@ -45 +46 @@
 #define HW_RES_KEEP_DUPLICIT   0x2
 
+
+#define RNGABS(rng)     (rng).address.absolute
+#define RNGREL(rng)     (rng).address.relative
+#define RNGSZ(rng)      (rng).size
+
+#define RNGABSPTR(rng)  ((void *) ((uintptr_t) RNGABS((rng))))
+
+typedef struct address64 {
+        /** Aboslute address. */ 
+        uint64_t absolute;
+        /** PIO window base relative address. */
+        uint64_t relative; 
+} address64_t;
+
 /** Address range structure */
 typedef struct addr_range {
         /** Start address */
-        uint64_t address;
-        
-        /** Endianness */
-        endianness_t endianness;
+        address64_t address;
         
         /** Area size */
         size_t size;
+
+        /** Endianness */
+        endianness_t endianness;
 } addr_range_t;
 
@@ -139 +154 @@
 }
 
-extern int hw_res_list_parse(const hw_resource_list_t *,
+extern int hw_res_list_parse(const pio_window_t *, const hw_resource_list_t *,
     hw_res_list_parsed_t *, int);
 extern int hw_res_get_list_parsed(async_sess_t *, hw_res_list_parsed_t *, int);