Changes in uspace/drv/isa/isa.c [af6b5157:41b56084] in mainline

File:

• uspace/drv/isa/isa.c (modified) (22 diffs)

uspace/drv/isa/isa.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +43 @@
 #include <stdlib.h>
 #include <str.h>
-#include <str_error.h>
 #include <ctype.h>
 #include <macros.h>
@@ -52 +50 @@
 #include <sys/stat.h>
 
-#include <ddf/driver.h>
+#include <driver.h>
 #include <ops/hw_res.h>
 
@@ -60 +58 @@
 
 #define NAME "isa"
-#define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
-
-/** Obtain soft-state pointer from function node pointer */
-#define ISA_FUN(fnode) ((isa_fun_t *) ((fnode)->driver_data))
+#define CHILD_DEV_CONF_PATH "/drv/isa/isa.dev"
 
 #define ISA_MAX_HW_RES 4
 
-typedef struct isa_fun {
-        ddf_fun_t *fnode;
+typedef struct isa_child_data {
         hw_resource_list_t hw_resources;
-} isa_fun_t;
-
-static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
-{
-        isa_fun_t *fun = ISA_FUN(fnode);
-        assert(fun != NULL);
-
-        return &fun->hw_resources;
-}
-
-static bool isa_enable_fun_interrupt(ddf_fun_t *fnode)
+} isa_child_data_t;
+
+static hw_resource_list_t *isa_get_child_resources(device_t *dev)
+{
+        isa_child_data_t *dev_data;
+
+        dev_data = (isa_child_data_t *)dev->driver_data;
+        if (dev_data == NULL)
+                return NULL;
+
+        return &dev_data->hw_resources;
+}
+
+static bool isa_enable_child_interrupt(device_t *dev)
 {
         // TODO
@@ -87 +84 @@
 }
 
-static hw_res_ops_t isa_fun_hw_res_ops = {
-        &isa_get_fun_resources,
-        &isa_enable_fun_interrupt
+static hw_res_ops_t isa_child_hw_res_ops = {
+        &isa_get_child_resources,
+        &isa_enable_child_interrupt
 };
 
-static ddf_dev_ops_t isa_fun_ops;
-
-static int isa_add_device(ddf_dev_t *dev);
+static device_ops_t isa_child_dev_ops;
+
+static int isa_add_device(device_t *dev);
 
 /** The isa device driver's standard operations */
@@ -107 +104 @@
 };
 
-static isa_fun_t *isa_fun_create(ddf_dev_t *dev, const char *name)
-{
-        isa_fun_t *fun = calloc(1, sizeof(isa_fun_t));
-        if (fun == NULL)
+
+static isa_child_data_t *create_isa_child_data() 
+{
+        isa_child_data_t *data;
+
+        data = (isa_child_data_t *) malloc(sizeof(isa_child_data_t));
+        if (data != NULL)
+                memset(data, 0, sizeof(isa_child_data_t));
+
+        return data;
+}
+
+static device_t *create_isa_child_dev()
+{
+        device_t *dev = create_device();
+        if (dev == NULL)
                 return NULL;
 
-        ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, name);
-        if (fnode == NULL) {
-                free(fun);
+        isa_child_data_t *data = create_isa_child_data();
+        if (data == NULL) {
+                delete_device(dev);
                 return NULL;
         }
 
-        fun->fnode = fnode;
-        fnode->driver_data = fun;
-        return fun;
-}
-
-static char *fun_conf_read(const char *conf_path)
+        dev->driver_data = data;
+        return dev;
+}
+
+static char *read_dev_conf(const char *conf_path)
 {
         bool suc = false;
@@ -143 +151 @@
         lseek(fd, 0, SEEK_SET); 
         if (len == 0) {
-                printf(NAME ": fun_conf_read error: configuration file '%s' "
+                printf(NAME ": read_dev_conf error: configuration file '%s' "
                     "is empty.\n", conf_path);
                 goto cleanup;
@@ -150 +158 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": fun_conf_read error: memory allocation failed.\n");
+                printf(NAME ": read_dev_conf error: memory allocation failed.\n");
                 goto cleanup;
         }
 
         if (0 >= read(fd, buf, len)) {
-                printf(NAME ": fun_conf_read error: unable to read file '%s'.\n",
+                printf(NAME ": read_dev_conf error: unable to read file '%s'.\n",
                     conf_path);
                 goto cleanup;
@@ -241 +249 @@
 }
 
-static void isa_fun_set_irq(isa_fun_t *fun, int irq)
-{
-        size_t count = fun->hw_resources.count;
-        hw_resource_t *resources = fun->hw_resources.resources;
+static void isa_child_set_irq(device_t *dev, int irq)
+{
+        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+
+        size_t count = data->hw_resources.count;
+        hw_resource_t *resources = data->hw_resources.resources;
 
         if (count < ISA_MAX_HW_RES) {
@@ -250 +260 @@
                 resources[count].res.interrupt.irq = irq;
 
-                fun->hw_resources.count++;
-
-                printf(NAME ": added irq 0x%x to function %s\n", irq,
-                    fun->fnode->name);
-        }
-}
-
-static void isa_fun_set_io_range(isa_fun_t *fun, size_t addr, size_t len)
-{
-        size_t count = fun->hw_resources.count;
-        hw_resource_t *resources = fun->hw_resources.resources;
+                data->hw_resources.count++;
+
+                printf(NAME ": added irq 0x%x to device %s\n", irq, dev->name);
+        }
+}
+
+static void isa_child_set_io_range(device_t *dev, size_t addr, size_t len)
+{
+        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+
+        size_t count = data->hw_resources.count;
+        hw_resource_t *resources = data->hw_resources.resources;
 
         if (count < ISA_MAX_HW_RES) {
@@ -268 +279 @@
                 resources[count].res.io_range.endianness = LITTLE_ENDIAN;
 
-                fun->hw_resources.count++;
+                data->hw_resources.count++;
 
                 printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "function %s\n", (unsigned int) addr, (unsigned int) len,
-                    fun->fnode->name);
-        }
-}
-
-static void fun_parse_irq(isa_fun_t *fun, char *val)
+                    "device %s\n", (unsigned int) addr, (unsigned int) len,
+                    dev->name);
+        }
+}
+
+static void get_dev_irq(device_t *dev, char *val)
 {
         int irq = 0;
         char *end = NULL;
 
-        val = skip_spaces(val);
+        val = skip_spaces(val); 
         irq = (int)strtol(val, &end, 0x10);
 
         if (val != end)
-                isa_fun_set_irq(fun, irq);
-}
-
-static void fun_parse_io_range(isa_fun_t *fun, char *val)
+                isa_child_set_irq(dev, irq);
+}
+
+static void get_dev_io_range(device_t *dev, char *val)
 {
         size_t addr, len;
         char *end = NULL;
 
-        val = skip_spaces(val);
+        val = skip_spaces(val); 
         addr = strtol(val, &end, 0x10);
 
@@ -299 +310 @@
                 return;
 
-        val = skip_spaces(end);
+        val = skip_spaces(end); 
         len = strtol(val, &end, 0x10);
 
@@ -305 +316 @@
                 return;
 
-        isa_fun_set_io_range(fun, addr, len);
+        isa_child_set_io_range(dev, addr, len);
 }
 
@@ -320 +331 @@
 }
 
-static void fun_parse_match_id(isa_fun_t *fun, char *val)
+static void get_dev_match_id(device_t *dev, char *val)
 {
         char *id = NULL;
         int score = 0;
         char *end = NULL;
-        int rc;
-
-        val = skip_spaces(val);
+
+        val = skip_spaces(val); 
 
         score = (int)strtol(val, &end, 10);
         if (val == end) {
                 printf(NAME " : error - could not read match score for "
-                    "function %s.\n", fun->fnode->name);
+                    "device %s.\n", dev->name);
                 return;
         }
 
-        val = skip_spaces(end);
+        match_id_t *match_id = create_match_id();
+        if (match_id == NULL) {
+                printf(NAME " : failed to allocate match id for device %s.\n",
+                    dev->name);
+                return;
+        }
+
+        val = skip_spaces(end); 
         get_match_id(&id, val);
         if (id == NULL) {
                 printf(NAME " : error - could not read match id for "
-                    "function %s.\n", fun->fnode->name);
+                    "device %s.\n", dev->name);
+                delete_match_id(match_id);
                 return;
         }
 
-        printf(NAME ": adding match id '%s' with score %d to function %s\n", id,
-            score, fun->fnode->name);
-
-        rc = ddf_fun_add_match_id(fun->fnode, id, score);
-        if (rc != EOK)
-                printf(NAME ": error adding match ID: %s\n", str_error(rc));
-}
-
-static bool prop_parse(isa_fun_t *fun, char *line, const char *prop,
-    void (*read_fn)(isa_fun_t *, char *))
+        match_id->id = id;
+        match_id->score = score;
+
+        printf(NAME ": adding match id '%s' with score %d to device %s\n", id,
+            score, dev->name);
+        add_match_id(&dev->match_ids, match_id);
+}
+
+static bool read_dev_prop(device_t *dev, char *line, const char *prop,
+    void (*read_fn)(device_t *, char *))
 {
         size_t proplen = str_size(prop);
@@ -360 +378 @@
                 line += proplen;
                 line = skip_spaces(line);
-                (*read_fn)(fun, line);
+                (*read_fn)(dev, line);
 
                 return true;
@@ -368 +386 @@
 }
 
-static void fun_prop_parse(isa_fun_t *fun, char *line)
+static void get_dev_prop(device_t *dev, char *line)
 {
         /* Skip leading spaces. */
         line = skip_spaces(line);
 
-        if (!prop_parse(fun, line, "io_range", &fun_parse_io_range) &&
-            !prop_parse(fun, line, "irq", &fun_parse_irq) &&
-            !prop_parse(fun, line, "match", &fun_parse_match_id))
+        if (!read_dev_prop(dev, line, "io_range", &get_dev_io_range) &&
+            !read_dev_prop(dev, line, "irq", &get_dev_irq) &&
+            !read_dev_prop(dev, line, "match", &get_dev_match_id))
         {
             printf(NAME " error undefined device property at line '%s'\n",
@@ -382 +400 @@
 }
 
-static void fun_hw_res_alloc(isa_fun_t *fun)
-{
-        fun->hw_resources.resources = 
+static void child_alloc_hw_res(device_t *dev)
+{
+        isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
+        data->hw_resources.resources = 
             (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
 }
 
-static char *isa_fun_read_info(char *fun_conf, ddf_dev_t *dev)
+static char *read_isa_dev_info(char *dev_conf, device_t *parent)
 {
         char *line;
-        char *fun_name = NULL;
+        char *dev_name = NULL;
 
         /* Skip empty lines. */
         while (true) {
-                line = str_get_line(fun_conf, &fun_conf);
+                line = str_get_line(dev_conf, &dev_conf);
 
                 if (line == NULL) {
@@ -407 +426 @@
 
         /* Get device name. */
-        fun_name = get_device_name(line);
-        if (fun_name == NULL)
+        dev_name = get_device_name(line);
+        if (dev_name == NULL)
                 return NULL;
 
-        isa_fun_t *fun = isa_fun_create(dev, fun_name);
-        if (fun == NULL) {
-                free(fun_name);
+        device_t *dev = create_isa_child_dev();
+        if (dev == NULL) {
+                free(dev_name);
                 return NULL;
         }
 
+        dev->name = dev_name;
+
         /* Allocate buffer for the list of hardware resources of the device. */
-        fun_hw_res_alloc(fun);
+        child_alloc_hw_res(dev);
 
         /* Get properties of the device (match ids, irq and io range). */
         while (true) {
-                line = str_get_line(fun_conf, &fun_conf);
+                line = str_get_line(dev_conf, &dev_conf);
 
                 if (line_empty(line)) {
@@ -433 +454 @@
                  * and store it in the device structure.
                  */
-                fun_prop_parse(fun, line);
+                get_dev_prop(dev, line);
+
+                //printf(NAME ": next line ='%s'\n", dev_conf);
+                //printf(NAME ": current line ='%s'\n", line);
         }
 
         /* Set device operations to the device. */
-        fun->fnode->ops = &isa_fun_ops;
-
-        printf(NAME ": Binding function %s.\n", fun->fnode->name);
-
-        /* XXX Handle error */
-        (void) ddf_fun_bind(fun->fnode);
-
-        return fun_conf;
-}
-
-static void fun_conf_parse(char *conf, ddf_dev_t *dev)
+        dev->ops = &isa_child_dev_ops;
+
+        printf(NAME ": child_device_register(dev, parent); device is %s.\n",
+            dev->name);
+        child_device_register(dev, parent);
+
+        return dev_conf;
+}
+
+static void parse_dev_conf(char *conf, device_t *parent)
 {
         while (conf != NULL && *conf != '\0') {
-                conf = isa_fun_read_info(conf, dev);
-        }
-}
-
-static void isa_functions_add(ddf_dev_t *dev)
-{
-        char *fun_conf;
-
-        fun_conf = fun_conf_read(CHILD_FUN_CONF_PATH);
-        if (fun_conf != NULL) {
-                fun_conf_parse(fun_conf, dev);
-                free(fun_conf);
-        }
-}
-
-static int isa_add_device(ddf_dev_t *dev)
+                conf = read_isa_dev_info(conf, parent);
+        }
+}
+
+static void add_legacy_children(device_t *parent)
+{
+        char *dev_conf;
+
+        dev_conf = read_dev_conf(CHILD_DEV_CONF_PATH);
+        if (dev_conf != NULL) {
+                parse_dev_conf(dev_conf, parent);
+                free(dev_conf);
+        }
+}
+
+static int isa_add_device(device_t *dev)
 {
         printf(NAME ": isa_add_device, device handle = %d\n",
             (int) dev->handle);
 
-        /* Make the bus device more visible. Does not do anything. */
-        printf(NAME ": adding a 'ctl' function\n");
-
-        ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
-        if (ctl == NULL) {
-                printf(NAME ": Error creating control function.\n");
-                return EXDEV;
-        }
-
-        if (ddf_fun_bind(ctl) != EOK) {
-                printf(NAME ": Error binding control function.\n");
-                return EXDEV;
-        }
-
-        /* Add functions as specified in the configuration file. */
-        isa_functions_add(dev);
-        printf(NAME ": finished the enumeration of legacy functions\n");
+        /* Add child devices. */
+        add_legacy_children(dev);
+        printf(NAME ": finished the enumeration of legacy devices\n");
 
         return EOK;
@@ -493 +502 @@
 static void isa_init() 
 {
-        isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
+        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_hw_res_ops;
 }
 
@@ -500 +509 @@
         printf(NAME ": HelenOS ISA bus driver\n");
         isa_init();
-        return ddf_driver_main(&isa_driver);
+        return driver_main(&isa_driver);
 }
 
@@ -506 +515 @@
  * @}
  */
+