Changeset ec388d7 in mainline

Timestamp:

2011-11-14T10:03:49Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a0d1d9d

Parents:

8a5962f

Message:

isa: Add DMA controller driver implementation.

Location:

uspace/drv/bus/isa

Files:

• Makefile (modified) (2 diffs)
• dma_controller.c (added)
• dma_controller.h (added)
• isa.c (modified) (4 diffs)

uspace/drv/bus/isa/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2010 Lenka Trochtova
+# Copyright (c) 2011 Jan Vesely
 # All rights reserved.
 #
@@ -33 +34 @@
 
 SOURCES = \
+        dma_controller.c \
         isa.c
 

uspace/drv/bus/isa/isa.c

@@ -2 +2 @@
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -65 +66 @@
 #include <device/hw_res.h>
 
+#include "dma_controller.h"
+
 #define NAME "isa"
 #define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
@@ -119 +122 @@
 
         assert(isa_fun);
-        hw_resource_list_t *res = &isa_fun->hw_resources;
+        const hw_resource_list_t *res = &isa_fun->hw_resources;
         assert(res);
-        for (size_t i = 0; i < res->count; i++) {
+        for (size_t i = 0; i < res->count; ++i) {
                 if (res->resources[i].type == INTERRUPT) {
                         const int irq = res->resources[i].res.interrupt.irq;
@@ -141 +144 @@
 }
 
+static int isa_dma_channel_fun_setup(ddf_fun_t *fnode,
+    unsigned channel, uint32_t pa, uint16_t size, uint8_t mode)
+{
+        assert(fnode);
+        isa_fun_t *isa_fun = fnode->driver_data;
+        const hw_resource_list_t *res = &isa_fun->hw_resources;
+        assert(res);
+        const int ch = channel;
+        for (size_t i = 0; i < res->count; ++i) {
+                if ((res->resources[i].type == DMA_CHANNEL_16 &&
+                    res->resources[i].res.dma_channel.dma16 == ch) ||
+                    (res->resources[i].type == DMA_CHANNEL_8 &&
+                    res->resources[i].res.dma_channel.dma8 == ch)) {
+                        return dma_setup_channel(channel, pa, size, mode);
+                }
+        }
+        return EINVAL;
+}
+
 static hw_res_ops_t isa_fun_hw_res_ops = {
-        .get_resource_list = &isa_get_fun_resources,
-        .enable_interrupt = &isa_enable_fun_interrupt,
+        .get_resource_list = isa_get_fun_resources,
+        .enable_interrupt = isa_enable_fun_interrupt,
+        .dma_channel_setup = isa_dma_channel_fun_setup,
 };