Changeset 7de1988c in mainline for uspace/drv/block

Timestamp:

2013-09-12T20:53:09Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddd0499d

Parents:

8049b79

Message:

Adapt drivers using parsed HW resources to use the new interface.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (4 diffs)
• ata_bd/main.c (modified) (1 diff)

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;

uspace/drv/block/ata_bd/main.c

@@ -84 +84 @@
         }
 
-        ata_res->cmd = hw_res.io_ranges.ranges[0].address;
-        ata_res->ctl = hw_res.io_ranges.ranges[1].address;
-
-        if (hw_res.io_ranges.ranges[0].size < sizeof(ata_ctl_t)) {
+        addr_range_t *cmd_rng = &hw_res.io_ranges.ranges[0];
+        addr_range_t *ctl_rng = &hw_res.io_ranges.ranges[1];
+        ata_res->cmd = RNGABS(*cmd_rng);
+        ata_res->ctl = RNGABS(*ctl_rng);
+
+        if (RNGSZ(*ctl_rng) < sizeof(ata_ctl_t)) {
                 rc = EINVAL;
                 goto error;
         }
 
-        if (hw_res.io_ranges.ranges[1].size < sizeof(ata_cmd_t)) {
+        if (RNGSZ(*cmd_rng) < sizeof(ata_cmd_t)) {
                 rc = EINVAL;
                 goto error;