Changes in uspace/drv/bus/isa/isa.c [d9cf684a:5960b48] in mainline

File:

• uspace/drv/bus/isa/isa.c (modified) (13 diffs)

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.
  *
@@ -52 +51 @@
 #include <dirent.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
 #include <sysinfo.h>
 #include <ns.h>
+#include <sys/stat.h>
 
 #include <ddf/driver.h>
@@ -66 +65 @@
 #include <device/hw_res.h>
 
-#include "i8237.h"
-
 #define NAME "isa"
 #define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
@@ -77 +74 @@
 #define ISA_FUN(fun) ((isa_fun_t *) ((fun)->driver_data))
 
-#define ISA_MAX_HW_RES 5
+#define ISA_MAX_HW_RES 4
 
 typedef struct {
@@ -109 +106 @@
         sysarg_t apic;
         sysarg_t i8259;
-        
+
         async_sess_t *irc_sess = NULL;
-        
+
         if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
             || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
@@ -117 +114 @@
                     SERVICE_IRC, 0, 0);
         }
-        
+
         if (!irc_sess)
                 return false;
-        
+
         assert(isa_fun);
         const hw_resource_list_t *res = &isa_fun->hw_resources;
@@ -127 +124 @@
                 if (res->resources[i].type == INTERRUPT) {
                         const int irq = res->resources[i].res.interrupt.irq;
-                        
+
                         async_exch_t *exch = async_exchange_begin(irc_sess);
                         const int rc =
                             async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
                         async_exchange_end(exch);
-                        
+
                         if (rc != EOK) {
                                 async_hangup(irc_sess);
@@ -139 +136 @@
                 }
         }
-        
+
         async_hangup(irc_sess);
         return true;
 }
 
-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 = {
-        .get_resource_list = isa_get_fun_resources,
-        .enable_interrupt = isa_enable_fun_interrupt,
-        .dma_channel_setup = isa_dma_channel_fun_setup,
+        &isa_get_fun_resources,
+        &isa_enable_fun_interrupt
 };
 
@@ -339 +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)
 {
@@ -397 +339 @@
 
         val = skip_spaces(val);
-        irq = (int)strtol(val, &end, 0x10);
+        irq = (int)strtol(val, &end, 10);
 
         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);
 }
 
@@ -506 +436 @@
         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)) {
 
@@ -517 +446 @@
 {
         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);
 }
 
@@ -701 +630 @@
 
 
-static void isa_init()
+static void isa_init() 
 {
         ddf_log_init(NAME, LVL_ERROR);