Changeset 7de1988c in mainline for uspace/drv/block/ata_bd/main.c

Timestamp:

2013-09-12T20:53:09Z (11 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.

File:

• uspace/drv/block/ata_bd/main.c (modified) (1 diff)

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;