Changeset 1433ecda in mainline for uspace/drv/block

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.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (2 diffs)
• ata_bd/ata_bd.c (modified) (6 diffs)
• usbmast/bo_trans.c (modified) (2 diffs)
• usbmast/main.c (modified) (1 diff)
• usbmast/scsi_ms.c (modified) (3 diffs)

uspace/drv/block/ahci/ahci.c

@@ -978 +978 @@
         sata->cmd_header->cmdtableu = HI(phys);
         sata->cmd_header->cmdtable = LO(phys);
-        sata->cmd_table = (uint32_t*) virt_table;
+        sata->cmd_table = (uint32_t *) virt_table;
 
         return sata;
@@ -1076 +1076 @@
         fibril_mutex_unlock(&sata_devices_count_lock);
 
-        rc= ddf_fun_set_name(sata->fun, sata_dev_name);
+        rc = ddf_fun_set_name(sata->fun, sata_dev_name);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed setting function name.");

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);

uspace/drv/block/usbmast/bo_trans.c

@@ -116 +116 @@
                 usb_pipe_clear_halt(
                     usb_device_get_default_pipe(mfun->mdev->usb_dev), dpipe);
-        } else if (rc != EOK) {
+        } else if (rc != EOK) {
                 usb_log_error("Failed to transfer data: %s", str_error(rc));
                 return EIO;
@@ -141 +141 @@
         if (csw.dCSWTag != tag) {
                 usb_log_error("Received CSW with incorrect tag. (expected: %"
-                    PRIX32" received: %"PRIx32, tag, csw.dCSWTag);
+                    PRIX32 " received: %" PRIx32, tag, csw.dCSWTag);
                 return EIO;
         }

uspace/drv/block/usbmast/main.c

@@ -179 +179 @@
         usb_log_debug("Get LUN count...");
         mdev->lun_count = usb_masstor_get_lun_count(mdev);
-        mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
+        mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t *));
         if (mdev->luns == NULL) {
                 usb_log_error("Failed allocating luns table.");

uspace/drv/block/usbmast/scsi_ms.c

@@ -196 +196 @@
         if (cmd.rcvd_size < SCSI_STD_INQUIRY_DATA_MIN_SIZE) {
                 usb_log_error("SCSI Inquiry response too short (%zu).",
-                     cmd.rcvd_size);
+                    cmd.rcvd_size);
                 return EIO;
         }
@@ -306 +306 @@
         if (cmd.rcvd_size < sizeof(data)) {
                 usb_log_error("SCSI Read Capacity response too short (%zu).",
-                     cmd.rcvd_size);
+                    cmd.rcvd_size);
                 return EIO;
         }
@@ -349 +349 @@
         rc = usbmast_run_cmd(mfun, &cmd);
 
-        if (rc != EOK) {
+        if (rc != EOK) {
                 usb_log_error("Read (10) transport failed, device %s: %s.",
                     usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));