Changeset 1433ecda in mainline for uspace/drv/block/ata_bd

Timestamp:

2018-04-04T15:42:37Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

File:

• uspace/drv/block/ata_bd/ata_bd.c (modified) (6 diffs)

uspace/drv/block/ata_bd/ata_bd.c

@@ -428 +428 @@
 
                 d->blocks =
-                     (uint32_t) idata.total_lba28_0 |
+                    (uint32_t) idata.total_lba28_0 |
                     ((uint32_t) idata.total_lba28_1 << 16);
         } else {
@@ -439 +439 @@
 
                 d->blocks =
-                     (uint64_t) idata.total_lba48_0 |
+                    (uint64_t) idata.total_lba48_0 |
                     ((uint64_t) idata.total_lba48_1 << 16) |
                     ((uint64_t) idata.total_lba48_2 << 32) |
@@ -461 +461 @@
         for (i = 0; i < len; ++i) {
                 c = model[i];
-                if (c >= 0x80) c = '?';
+                if (c >= 0x80)
+                        c = '?';
 
                 chr_encode(c, d->model, &pos, 40);
@@ -795 +796 @@
         pio_write_8(&ctrl->cmd->drive_head, drv_head);
 
-        if (wait_status(ctrl, 0, ~(SR_BSY|SR_DRQ), NULL, TIMEOUT_BSY) != EOK) {
+        if (wait_status(ctrl, 0, ~(SR_BSY | SR_DRQ), NULL, TIMEOUT_BSY) != EOK) {
                 fibril_mutex_unlock(&ctrl->lock);
                 return EIO;
@@ -1263 +1264 @@
         while ((status & ~n_reset) != 0 || (status & set) != set) {
                 --cnt;
-                if (cnt <= 0) break;
+                if (cnt <= 0)
+                        break;
 
                 status = pio_read_8(&ctrl->cmd->status);
@@ -1272 +1274 @@
                 async_usleep(10000);
                 --cnt;
-                if (cnt <= 0) break;
+                if (cnt <= 0)
+                        break;
 
                 status = pio_read_8(&ctrl->cmd->status);