Changeset 1b20da0 in mainline for uspace/drv/block

Timestamp:

2018-02-28T17:52:03Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

3061bc1

Parents:

df6ded8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:26:03)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:52:03)

Message:

style: Remove trailing whitespace on non-empty lines, in certain file types.

Command used: tools/srepl '\([^[:space:]]\)\s\+$' '\1' -- *.c *.h *.py *.sh *.s *.S *.ag

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (1 diff)
• ata_bd/ata_bd.c (modified) (2 diffs)
• ddisk/ddisk.c (modified) (7 diffs)

uspace/drv/block/ahci/ahci.c

@@ -1255 +1255 @@
  *
  */
-static errno_t ahci_dev_add(ddf_dev_t *dev)     
+static errno_t ahci_dev_add(ddf_dev_t *dev)
 {
         ahci_dev_t *ahci = ahci_ahci_create(dev);

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 {
@@ -441 +441 @@
                      (uint64_t) idata.total_lba48_0 |
                     ((uint64_t) idata.total_lba48_1 << 16) |
-                    ((uint64_t) idata.total_lba48_2 << 32) | 
+                    ((uint64_t) idata.total_lba48_2 << 32) |
                     ((uint64_t) idata.total_lba48_3 << 48);
         }

uspace/drv/block/ddisk/ddisk.c

@@ -156 +156 @@
                 .cmd = CMD_PREDICATE,
                 .srcarg = 2,
-                .value = 2 
+                .value = 2
         },
         {
@@ -162 +162 @@
                 .cmd = CMD_PIO_WRITE_32,
                 .value = DDISK_CMD_IRQ_DEASSERT,
-                .addr = NULL 
+                .addr = NULL
         },
         {
@@ -244 +244 @@
 
         if (size < cnt * DDISK_BLOCK_SIZE)
-                return EINVAL;          
+                return EINVAL;
 
         for (i = 0; i < cnt; i++) {
@@ -270 +270 @@
 errno_t ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
-        *rsize = DDISK_BLOCK_SIZE; 
+        *rsize = DDISK_BLOCK_SIZE;
         return EOK;
 }
@@ -279 +279 @@
 
         *rnb = ddisk->blocks;
-        return EOK;     
+        return EOK;
 }
 
@@ -304 +304 @@
         addr_range_t *regs = &hw_res.mem_ranges.ranges[0];
         ddisk_res->base = RNGABS(*regs);
-        ddisk_res->irq = hw_res.irqs.irqs[0]; 
+        ddisk_res->irq = hw_res.irqs.irqs[0];
 
         if (RNGSZ(*regs) < sizeof(ddisk_regs_t)) {
@@ -550 +550 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Unable to disable PIO.");
-                return rc;      
+                return rc;
         }