Changes in uspace/drv/bus/isa/isa.c [0bbd13e:85c4cc45] in mainline

File:

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

uspace/drv/bus/isa/isa.c

@@ -52 +52 @@
 #include <dirent.h>
 #include <fcntl.h>
-#include <ipc/irc.h>
-#include <ipc/services.h>
-#include <sysinfo.h>
-#include <ns.h>
 #include <sys/stat.h>
 #include <ipc/irc.h>
@@ -66 +62 @@
 #include <ops/hw_res.h>
 
+#include <devman.h>
+#include <ipc/devman.h>
 #include <device/hw_res.h>
 
-#include "i8237.h"
+#include "dma_controller.h"
 
 #define NAME "isa"
@@ -91 +89 @@
         fibril_mutex_t mutex;
         ddf_fun_t *fnode;
+        hw_resource_t resources[ISA_MAX_HW_RES];
         hw_resource_list_t hw_resources;
         link_t bus_link;
@@ -147 +146 @@
 
 static int isa_dma_channel_fun_setup(ddf_fun_t *fnode,
-    unsigned int channel, uint32_t pa, uint16_t size, uint8_t mode)
+    unsigned channel, uint32_t pa, uint16_t size, uint8_t mode)
 {
         assert(fnode);
@@ -153 +152 @@
         const hw_resource_list_t *res = &isa_fun->hw_resources;
         assert(res);
-        
-        const unsigned int ch = channel;
+        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))) {
+                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;
 }
@@ -175 +172 @@
 static ddf_dev_ops_t isa_fun_ops;
 
-static int isa_dev_add(ddf_dev_t *dev);
+static int isa_add_device(ddf_dev_t *dev);
 static int isa_dev_remove(ddf_dev_t *dev);
 static int isa_fun_online(ddf_fun_t *fun);
@@ -182 +179 @@
 /** The isa device driver's standard operations */
 static driver_ops_t isa_ops = {
-        .dev_add = &isa_dev_add,
+        .add_device = &isa_add_device,
         .dev_remove = &isa_dev_remove,
         .fun_online = &isa_fun_online,
@@ -201 +198 @@
 
         isa_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(isa_fun_t));
-        if (fun == NULL) {
-                ddf_fun_destroy(fnode);
+        if (fun == NULL)
                 return NULL;
-        }
 
         fibril_mutex_initialize(&fun->mutex);
+        fun->hw_resources.resources = fun->resources;
+
         fun->fnode = fnode;
         return fun;
@@ -347 +344 @@
         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)) {
+                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)) {
+                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);
@@ -401 +396 @@
 
         val = skip_spaces(val);
-        irq = (int) strtol(val, &end, 10);
+        irq = (int)strtol(val, &end, 0x10);
 
         if (val != end)
@@ -409 +404 @@
 static void fun_parse_dma(isa_fun_t *fun, char *val)
 {
-        unsigned int dma = 0;
+        int dma = 0;
         char *end = NULL;
-        
+
         val = skip_spaces(val);
-        dma = (unsigned int) strtol(val, &end, 10);
-        
+        dma = (int)strtol(val, &end, 10);
+
         if (val != end)
                 isa_fun_set_dma(fun, dma);
@@ -518 +513 @@
 }
 
-static void fun_hw_res_alloc(isa_fun_t *fun)
-{
-        fun->hw_resources.resources =
-            (hw_resource_t *) malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
-}
-
-static void fun_hw_res_free(isa_fun_t *fun)
-{
-        free(fun->hw_resources.resources);
-        fun->hw_resources.resources = NULL;
-}
-
 static char *isa_fun_read_info(char *fun_conf, isa_bus_t *isa)
 {
@@ -558 +541 @@
                 return NULL;
         }
-
-        /* Allocate buffer for the list of hardware resources of the device. */
-        fun_hw_res_alloc(fun);
 
         /* Get properties of the device (match ids, irq and io range). */
@@ -609 +589 @@
 }
 
-static int isa_dev_add(ddf_dev_t *dev)
+static int isa_add_device(ddf_dev_t *dev)
 {
         isa_bus_t *isa;
 
-        ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
+        ddf_msg(LVL_DEBUG, "isa_add_device, device handle = %d",
             (int) dev->handle);
 
@@ -677 +657 @@
                 list_remove(&fun->bus_link);
 
-                fun_hw_res_free(fun);
                 ddf_fun_destroy(fun->fnode);
         }