Changeset 3a0a4d8 in mainline for uspace/lib/c/generic/device

Timestamp:

2013-09-12T07:54:05Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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:

merge mainline changes

Location:

uspace/lib/c/generic/device

Files:

• hw_res.c (modified) (3 diffs)
• hw_res_parsed.c (modified) (6 diffs)
• pio_window.c (added)

uspace/lib/c/generic/device/hw_res.c

@@ -44 +44 @@
         
         async_exch_t *exch = async_exchange_begin(sess);
+        
         int rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_GET_RESOURCE_LIST, &count);
@@ -77 +78 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
+        
         int rc = async_req_1_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_ENABLE_INTERRUPT);
@@ -84 +86 @@
 }
 
+/** Setup DMA channel to specified place and mode.
+ *
+ * @param channel DMA channel.
+ * @param pa      Physical address of the buffer.
+ * @param size    DMA buffer size.
+ * @param mode    Mode of the DMA channel:
+ *                 - Read or Write
+ *                 - Allow automatic reset
+ *                 - Use address decrement instead of increment
+ *                 - Use SINGLE/BLOCK/ON DEMAND transfer mode
+ *
+ * @return Error code.
+ *
+ */
+int hw_res_dma_channel_setup(async_sess_t *sess,
+    unsigned channel, uint32_t pa, uint32_t size, uint8_t mode)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        const uint32_t packed = (channel & 0xffff) | (mode << 16);
+        const int ret = async_req_4_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_DMA_CHANNEL_SETUP, packed, pa, size);
+        
+        async_exchange_end(exch);
+        
+        return ret;
+}
+
+/** Query remaining bytes in the buffer.
+ *
+ * @param channel DMA channel.
+ *
+ * @return Number of bytes remaining in the buffer if positive.
+ * @return Error code if negative.
+ *
+ */
+int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        sysarg_t remain;
+        const int ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_DMA_CHANNEL_REMAIN, channel, &remain);
+        
+        async_exchange_end(exch);
+        
+        if (ret == EOK)
+                return remain;
+        
+        return ret;
+}
+
 /** @}
  */

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) {
@@ -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;
                 }