Changeset 5856b627 in mainline for uspace/lib/c/generic/device/hw_res_parsed.c

Timestamp:

2013-08-20T12:36:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

26e2de3

Parents:

0ee999d (diff), 4da8fdb (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:

Mainline changes.

File:

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

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

@@ -38 +38 @@
 #include <errno.h>
 
-static void hw_res_parse_add_irq(hw_res_list_parsed_t *out, hw_resource_t *res,
-    int flags)
+static void hw_res_parse_add_dma_channel(hw_res_list_parsed_t *out,
+    const hw_resource_t *res, int flags)
+{
+        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) {
+                        if (out->dma_channels.channels[i] == channel)
+                                return;
+                }
+        }
+        
+        out->dma_channels.channels[count] = channel;
+        ++out->dma_channels.count;
+}
+
+static void hw_res_parse_add_irq(hw_res_list_parsed_t *out,
+    const hw_resource_t *res, int flags)
 {
         assert(res && (res->type == INTERRUPT));
@@ -59 +81 @@
 
 static void hw_res_parse_add_io_range(hw_res_list_parsed_t *out,
-    hw_resource_t *res, int flags)
+    const hw_resource_t *res, int flags)
 {
         assert(res && (res->type == IO_RANGE));
@@ -90 +112 @@
 
 static void hw_res_parse_add_mem_range(hw_res_list_parsed_t *out,
-    hw_resource_t *res, int flags)
+    const hw_resource_t *res, int flags)
 {
         assert(res && (res->type == MEM_RANGE));
@@ -132 +154 @@
  *
  */
-int hw_res_list_parse(hw_resource_list_t *hw_resources,
+int hw_res_list_parse(const hw_resource_list_t *hw_resources,
     hw_res_list_parsed_t *out, int flags)
 {
@@ -141 +163 @@
         hw_res_list_parsed_clean(out);
         
-        out->irqs.irqs = malloc(res_count * sizeof(int));
-        out->io_ranges.ranges = malloc(res_count * sizeof(io_range_t));
-        out->mem_ranges.ranges = malloc(res_count * sizeof(mem_range_t));
+        out->irqs.irqs = calloc(res_count, sizeof(int));
+        out->dma_channels.channels = calloc(res_count, sizeof(int));
+        out->io_ranges.ranges = calloc(res_count, sizeof(io_range_t));
+        out->mem_ranges.ranges = calloc(res_count, sizeof(mem_range_t));
+        if (!out->irqs.irqs || !out->dma_channels.channels ||
+            !out->io_ranges.ranges || !out->mem_ranges.ranges) {
+                hw_res_list_parsed_clean(out);
+                return ENOMEM;
+        }
         
         for (size_t i = 0; i < res_count; ++i) {
-                hw_resource_t *resource = &(hw_resources->resources[i]);
-                
+                const hw_resource_t *resource = &(hw_resources->resources[i]);
+
                 switch (resource->type) {
                 case INTERRUPT:
@@ -158 +186 @@
                         hw_res_parse_add_mem_range(out, resource, flags);
                         break;
+                case DMA_CHANNEL_8:
+                case DMA_CHANNEL_16:
+                        hw_res_parse_add_dma_channel(out, resource, flags);
+                        break;
                 default:
+                        hw_res_list_parsed_clean(out);
                         return EINVAL;
                 }
         }
-        
+
         return EOK;
 };