Changeset c2a6983 in mainline for uspace/drv/block/ata_bd

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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

Location:

uspace/drv/block/ata_bd

Files:

• ata_bd.c (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/drv/block/ata_bd/ata_bd.c

@@ -1132 +1132 @@
         cnt = 100;
         while ((status & ~n_reset) != 0 || (status & set) != set) {
-                async_usleep(1);
                 --cnt;
                 if (cnt <= 0) break;

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;