Changeset 8565a42 in mainline for uspace/lib/c/generic/device/hw_res_parsed.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/lib/c/generic/device/hw_res_parsed.c (modified) (16 diffs)

uspace/lib/c/generic/device/hw_res_parsed.c

@@ -43 +43 @@
         assert(res);
         assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
-        
+
         const unsigned channel = (res->type == DMA_CHANNEL_8) ?
             res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
         const size_t count = out->dma_channels.count;
         const int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT;
-        
+
         if (!keep_duplicit) {
                 for (size_t i = 0; i < count; ++i) {
@@ -55 +55 @@
                 }
         }
-        
+
         out->dma_channels.channels[count] = channel;
         ++out->dma_channels.count;
@@ -64 +64 @@
 {
         assert(res && (res->type == INTERRUPT));
-        
+
         int irq = res->res.interrupt.irq;
         size_t count = out->irqs.count;
         int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT;
-        
+
         if (!keep_duplicit) {
                 for (size_t i = 0; i < count; i++) {
@@ -75 +75 @@
                 }
         }
-        
+
         out->irqs.irqs[count] = irq;
         out->irqs.count++;
@@ -105 +105 @@
 
         assert(res && (res->type == IO_RANGE));
-        
+
         absolute = absolutize(res->res.io_range.address,
             res->res.io_range.relative, win->io.base);
@@ -112 +112 @@
         size = res->res.io_range.size;
         endianness = res->res.io_range.endianness;
-        
+
         if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA)))
                 return;
-        
+
         int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT;
         size_t count = out->io_ranges.count;
-        
+
         if (!keep_duplicit) {
                 for (size_t i = 0; i < count; i++) {
@@ -126 +126 @@
                         s_address = RNGABS(out->io_ranges.ranges[i]);
                         s_size = RNGSZ(out->io_ranges.ranges[i]);
-                        
+
                         if ((absolute == s_address) && (size == s_size))
                                 return;
                 }
         }
-        
+
         RNGABS(out->io_ranges.ranges[count]) = absolute;
         RNGREL(out->io_ranges.ranges[count]) = relative;
@@ -146 +146 @@
         uint64_t relative;
         size_t size;
-        
+
         assert(res && (res->type == MEM_RANGE));
-        
+
         absolute = absolutize(res->res.mem_range.address,
             res->res.mem_range.relative, win->mem.base);
@@ -155 +155 @@
         size = res->res.mem_range.size;
         endianness = res->res.mem_range.endianness;
-        
+
         if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA)))
                 return;
-        
+
         int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT;
         size_t count = out->mem_ranges.count;
-        
+
         if (!keep_duplicit) {
                 for (size_t i = 0; i < count; ++i) {
@@ -169 +169 @@
                         s_address = RNGABS(out->mem_ranges.ranges[i]);;
                         s_size = RNGSZ(out->mem_ranges.ranges[i]);
-                        
+
                         if ((absolute == s_address) && (size == s_size))
                                 return;
                 }
         }
-        
+
         RNGABS(out->mem_ranges.ranges[count]) = absolute;
         RNGREL(out->mem_ranges.ranges[count]) = relative;
@@ -199 +199 @@
         if (!res || !out)
                 return EINVAL;
-        
+
         size_t res_count = res->count;
         hw_res_list_parsed_clean(out);
-        
+
         out->irqs.irqs = calloc(res_count, sizeof(int));
         out->dma_channels.channels = calloc(res_count, sizeof(int));
@@ -212 +212 @@
                 return ENOMEM;
         }
-        
+
         for (size_t i = 0; i < res_count; ++i) {
                 const hw_resource_t *resource = &res->resources[i];
-                
+
                 switch (resource->type) {
                 case INTERRUPT:
@@ -235 +235 @@
                 }
         }
-        
+
         return EOK;
 };
@@ -261 +261 @@
         if (!hw_res_parsed)
                 return EBADMEM;
-        
+
         hw_resource_list_t hw_resources;
         hw_res_list_parsed_clean(hw_res_parsed);
@@ -269 +269 @@
         if (rc != EOK)
                 return rc;
-        
+
         rc = hw_res_get_resource_list(sess, &hw_resources);
         if (rc != EOK)
@@ -277 +277 @@
             flags);
         hw_res_clean_resource_list(&hw_resources);
-        
+
         return rc;
 };