Changeset b39eb79 in mainline for uspace/drv/bus/isa

Timestamp:

2011-12-26T17:21:21Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9b56a8dd

Parents:

cf5c05c0 (diff), 7e1b130 (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.

Location:

uspace/drv/bus/isa

Files:

• Makefile (modified) (2 diffs)
• i8237.c (added)
• i8237.h (moved) (moved from uspace/lib/usbdev/src/pipepriv.h ) (2 diffs)
• isa.c (modified) (10 diffs)
• isa.dev (modified) (1 diff)

uspace/drv/bus/isa/Makefile

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

uspace/drv/bus/isa/i8237.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libusbdev
+/** @addtogroup isa
  * @{
  */
+
 /** @file
- * Library internal functions on USB pipes.
+ * @brief DMA memory management
  */
-#ifndef LIBUSBDEV_PIPEPRIV_H_
-#define LIBUSBDEV_PIPEPRIV_H_
 
-#include <usb/dev/pipes.h>
-#include <bool.h>
+#ifndef DRV_BUS_ISA_I8237_H
+#define DRV_BUS_ISA_I8237_H
 
-void pipe_acquire(usb_pipe_t *);
-void pipe_release(usb_pipe_t *);
-
-void pipe_start_transaction(usb_pipe_t *);
-void pipe_end_transaction(usb_pipe_t *);
-
-int pipe_add_ref(usb_pipe_t *, bool);
-void pipe_drop_ref(usb_pipe_t *);
-
+extern int dma_setup_channel(unsigned int, uint32_t, uint16_t, uint8_t);
 
 #endif
+
 /**
  * @}

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.
  *
@@ -56 +57 @@
 #include <ns.h>
 #include <sys/stat.h>
+#include <ipc/irc.h>
+#include <ipc/services.h>
+#include <sysinfo.h>
+#include <ns.h>
 
 #include <ddf/driver.h>
@@ -65 +70 @@
 #include <device/hw_res.h>
 
+#include "i8237.h"
+
 #define NAME "isa"
 #define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
@@ -74 +81 @@
 #define ISA_FUN(fun) ((isa_fun_t *) ((fun)->driver_data))
 
-#define ISA_MAX_HW_RES 4
+#define ISA_MAX_HW_RES 5
 
 typedef struct {
@@ -141 +148 @@
 }
 
+static int isa_dma_channel_fun_setup(ddf_fun_t *fnode,
+    unsigned int 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 unsigned 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 = {
-        &isa_get_fun_resources,
-        &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,
 };
 
@@ -314 +343 @@
 }
 
+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 +405 @@
         if (val != end)
                 isa_fun_set_irq(fun, irq);
+}
+
+static void fun_parse_dma(isa_fun_t *fun, char *val)
+{
+        unsigned int dma = 0;
+        char *end = NULL;
+        
+        val = skip_spaces(val);
+        dma = (unsigned int) strtol(val, &end, 10);
+        
+        if (val != end)
+                isa_fun_set_dma(fun, dma);
 }
 
@@ -436 +510 @@
         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)) {
 
@@ -446 +521 @@
 {
         fun->hw_resources.resources =
-            (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
+            (hw_resource_t *) malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
 }
 
@@ -630 +705 @@
 
 
-static void isa_init() 
+static void isa_init()
 {
         ddf_log_init(NAME, LVL_ERROR);

uspace/drv/bus/isa/isa.dev

@@ -15 +15 @@
         io_range 060 5
         
+
+ne2k:
+        match 100 isa/ne2k
+        irq 5
+        io_range 300 20
+
+sb16:
+        match 100 isa/sb16
+        io_range 220 20
+        io_range 330 2
+        irq 5
+        dma 1
+        dma 5