Changes in uspace/drv/rootpc/rootpc.c [aa7dc64:41b56084] in mainline

File:

• uspace/drv/rootpc/rootpc.c (modified) (8 diffs)

uspace/drv/rootpc/rootpc.c

@@ -46 +46 @@
 #include <macros.h>
 
-#include <ddf/driver.h>
+#include <driver.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -55 +55 @@
 #define NAME "rootpc"
 
-/** Obtain function soft-state from DDF function node */
-#define ROOTPC_FUN(fnode) ((rootpc_fun_t *) (fnode)->driver_data)
-
-typedef struct rootpc_fun {
+typedef struct rootpc_child_dev_data {
         hw_resource_list_t hw_resources;
-} rootpc_fun_t;
-
-static int rootpc_add_device(ddf_dev_t *dev);
+} rootpc_child_dev_data_t;
+
+static int rootpc_add_device(device_t *dev);
 static void root_pc_init(void);
 
@@ -85 +82 @@
 };
 
-static rootpc_fun_t pci_data = {
+static rootpc_child_dev_data_t pci_data = {
         .hw_resources = {
                 1,
@@ -92 +89 @@
 };
 
-static hw_resource_list_t *rootpc_get_resources(ddf_fun_t *fnode)
-{
-        rootpc_fun_t *fun = ROOTPC_FUN(fnode);
-        
-        assert(fun != NULL);
-        return &fun->hw_resources;
-}
-
-static bool rootpc_enable_interrupt(ddf_fun_t *fun)
+static hw_resource_list_t *rootpc_get_child_resources(device_t *dev)
+{
+        rootpc_child_dev_data_t *data;
+        
+        data = (rootpc_child_dev_data_t *) dev->driver_data;
+        if (NULL == data)
+                return NULL;
+        
+        return &data->hw_resources;
+}
+
+static bool rootpc_enable_child_interrupt(device_t *dev)
 {
         /* TODO */
@@ -107 +107 @@
 }
 
-static hw_res_ops_t fun_hw_res_ops = {
-        &rootpc_get_resources,
-        &rootpc_enable_interrupt
+static hw_res_ops_t child_hw_res_ops = {
+        &rootpc_get_child_resources,
+        &rootpc_enable_child_interrupt
 };
 
 /* Initialized in root_pc_init() function. */
-static ddf_dev_ops_t rootpc_fun_ops;
+static device_ops_t rootpc_child_ops;
 
 static bool
-rootpc_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id,
-    rootpc_fun_t *fun)
-{
-        printf(NAME ": adding new function '%s'.\n", name);
-        
-        ddf_fun_t *fnode = NULL;
+rootpc_add_child(device_t *parent, const char *name, const char *str_match_id,
+    rootpc_child_dev_data_t *drv_data)
+{
+        printf(NAME ": adding new child device '%s'.\n", name);
+        
+        device_t *child = NULL;
         match_id_t *match_id = NULL;
         
         /* Create new device. */
-        fnode = ddf_fun_create(dev, fun_inner, name);
-        if (fnode == NULL)
+        child = create_device();
+        if (NULL == child)
                 goto failure;
         
-        fnode->driver_data = fun;
+        child->name = name;
+        child->driver_data = drv_data;
         
         /* Initialize match id list */
         match_id = create_match_id();
-        if (match_id == NULL)
+        if (NULL == match_id)
                 goto failure;
         
         match_id->id = str_match_id;
         match_id->score = 100;
-        add_match_id(&fnode->match_ids, match_id);
+        add_match_id(&child->match_ids, match_id);
         
         /* Set provided operations to the device. */
-        fnode->ops = &rootpc_fun_ops;
-        
-        /* Register function. */
-        if (ddf_fun_bind(fnode) != EOK) {
-                printf(NAME ": error binding function %s.\n", name);
+        child->ops = &rootpc_child_ops;
+        
+        /* Register child device. */
+        if (EOK != child_device_register(child, parent))
                 goto failure;
-        }
         
         return true;
         
 failure:
-        if (match_id != NULL)
+        if (NULL != match_id)
                 match_id->id = NULL;
         
-        if (fnode != NULL)
-                ddf_fun_destroy(fnode);
-        
-        printf(NAME ": failed to add function '%s'.\n", name);
+        if (NULL != child) {
+                child->name = NULL;
+                delete_device(child);
+        }
+        
+        printf(NAME ": failed to add child device '%s'.\n", name);
         
         return false;
 }
 
-static bool rootpc_add_functions(ddf_dev_t *dev)
-{
-        return rootpc_add_fun(dev, "pci0", "intel_pci", &pci_data);
+static bool rootpc_add_children(device_t *dev)
+{
+        return rootpc_add_child(dev, "pci0", "intel_pci", &pci_data);
 }
 
@@ -174 +175 @@
  * @return              Zero on success, negative error number otherwise.
  */
-static int rootpc_add_device(ddf_dev_t *dev)
+static int rootpc_add_device(device_t *dev)
 {
         printf(NAME ": rootpc_add_device, device handle = %d\n",
             (int)dev->handle);
         
-        /* Register functions. */
-        if (!rootpc_add_functions(dev)) {
-                printf(NAME ": failed to add functions for PC platform.\n");
+        /* Register child devices. */
+        if (!rootpc_add_children(dev)) {
+                printf(NAME ": failed to add child devices for PC platform.\n");
         }
         
@@ -189 +190 @@
 static void root_pc_init(void)
 {
-        rootpc_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_hw_res_ops;
 }
 
@@ -196 +197 @@
         printf(NAME ": HelenOS PC platform driver\n");
         root_pc_init();
-        return ddf_driver_main(&rootpc_driver);
+        return driver_main(&rootpc_driver);
 }