Changeset b5ba8f6 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2013-09-13T13:11:53Z (12 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/drv/block/ahci/ahci.c (modified) (4 diffs)

uspace/drv/block/ahci/ahci.c

@@ -1157 +1157 @@
         ahci->memregs = NULL;
         
-        physmem_map((uintptr_t) (hw_res_parsed.mem_ranges.ranges[0].address),
+        physmem_map(RNGABS(hw_res_parsed.mem_ranges.ranges[0]),
             AHCI_MEMREGS_PAGES_COUNT, AS_AREA_READ | AS_AREA_WRITE,
             (void **) &ahci->memregs);
@@ -1164 +1164 @@
         
         /* Register interrupt handler */
-        ahci_ranges[0].base = (size_t) hw_res_parsed.mem_ranges.ranges[0].address;
+        ahci_ranges[0].base = RNGABS(hw_res_parsed.mem_ranges.ranges[0]);
         ahci_ranges[0].size = sizeof(ahci_memregs_t);
         
@@ -1171 +1171 @@
                 
                 ahci_cmds[base].addr =
-                    ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) +
+                    ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) +
                     AHCI_PORTS_REGISTERS_OFFSET + port * AHCI_PORT_REGISTERS_SIZE +
                     AHCI_PORT_IS_REGISTER_OFFSET;
@@ -1177 +1177 @@
                 
                 ahci_cmds[base + 3].addr =
-                    ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) +
+                    ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) +
                     AHCI_GHC_IS_REGISTER_OFFSET;
                 ahci_cmds[base + 4].addr = ahci_cmds[base + 3].addr;