Changeset 55a8e0c in mainline

Timestamp:

2011-11-13T21:22:51Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e6def65

Parents:

d98d136

Message:

isa: Add support for DMA channels.

Location:

uspace/drv/bus/isa

Files:

• isa.c (modified) (4 diffs)
• isa.dev (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -74 +74 @@
 #define ISA_FUN(fun) ((isa_fun_t *) ((fun)->driver_data))
 
-#define ISA_MAX_HW_RES 4
+#define ISA_MAX_HW_RES 5
 
 typedef struct {
@@ -314 +314 @@
 }
 
+static void isa_fun_set_dma(isa_fun_t *fun, int dma)
+{
+        size_t count = fun->hw_resources.count;
+        hw_resource_t *resources = fun->hw_resources.resources;
+
+        if (count < ISA_MAX_HW_RES) {
+                if (dma > 0 && dma < 4) {
+                        resources[count].type = DMA_CHANNEL_8;
+                        resources[count].res.dma_channel.dma8 = dma;
+
+                        fun->hw_resources.count++;
+                        ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma,
+                            fun->fnode->name);
+                        return;
+                }
+
+                if (dma > 4 && dma < 8) {
+                        resources[count].type = DMA_CHANNEL_16;
+                        resources[count].res.dma_channel.dma16 = dma;
+
+                        fun->hw_resources.count++;
+                        ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma,
+                            fun->fnode->name);
+                        return;
+                }
+
+                ddf_msg(LVL_WARN, "Skipped dma 0x%x for function %s", dma,
+                    fun->fnode->name);
+        }
+}
+
 static void isa_fun_set_io_range(isa_fun_t *fun, size_t addr, size_t len)
 {
@@ -343 +374 @@
         if (val != end)
                 isa_fun_set_irq(fun, irq);
+}
+
+static void fun_parse_dma(isa_fun_t *fun, char *val)
+{
+        int dma = 0;
+        char *end = NULL;
+
+        val = skip_spaces(val);
+        dma = (int)strtol(val, &end, 10);
+
+        if (val != end)
+                isa_fun_set_dma(fun, dma);
 }
 
@@ -436 +479 @@
         if (!prop_parse(fun, line, "io_range", &fun_parse_io_range) &&
             !prop_parse(fun, line, "irq", &fun_parse_irq) &&
+            !prop_parse(fun, line, "dma", &fun_parse_dma) &&
             !prop_parse(fun, line, "match", &fun_parse_match_id)) {
 

uspace/drv/bus/isa/isa.dev

@@ -16 +16 @@
 sb16:
         match 100 isa/sb16
-        irq 5
         io_range 220 20
         io_range 330 2
+        irq 5
+        dma 1
+        dma 5