Changeset 56fd7cf in mainline for uspace/drv/infrastructure

Timestamp:

2012-08-17T11:37:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d5a540

Parents:

be2a38ad

Message:

Make ddf_dev_t and ddf_fun_t opaque. This further tighthens the DDF interface.

Location:

uspace/drv/infrastructure

Files:

• root/root.c (modified) (1 diff)
• rootmac/rootmac.c (modified) (5 diffs)
• rootpc/rootpc.c (modified) (6 diffs)
• rootvirt/rootvirt.c (modified) (3 diffs)

uspace/drv/infrastructure/root/root.c

@@ -204 +204 @@
 {
         ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
-            dev->handle);
+            ddf_dev_get_handle(dev));
 
         /*

uspace/drv/infrastructure/rootmac/rootmac.c

@@ -44 +44 @@
 #define NAME  "rootmac"
 
-/** Obtain function soft-state from DDF function node */
-#define ROOTMAC_FUN(fnode) \
-        ((rootmac_fun_t *) (fnode)->driver_data)
-
 typedef struct {
         hw_resource_list_t hw_resources;
@@ -80 +76 @@
 static ddf_dev_ops_t rootmac_fun_ops;
 
+/** Obtain function soft-state from DDF function node */
+static rootmac_fun_t *rootmac_fun(ddf_fun_t *fnode)
+{
+        return ddf_fun_data_get(fnode);
+}
+
 static bool rootmac_add_fun(ddf_dev_t *dev, const char *name,
-    const char *str_match_id, rootmac_fun_t *fun)
+    const char *str_match_id, rootmac_fun_t *fun_proto)
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
         
         ddf_fun_t *fnode = NULL;
-        match_id_t *match_id = NULL;
+        int rc;
         
         /* Create new device. */
@@ -93 +95 @@
                 goto failure;
         
-        fnode->driver_data = fun;
+        rootmac_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(rootmac_fun_t));
+        *fun = *fun_proto;
         
-        /* Initialize match id list */
-        match_id = create_match_id();
-        if (match_id == NULL)
+        /* Add match ID */
+        rc = ddf_fun_add_match_id(fnode, str_match_id, 100);
+        if (rc != EOK)
                 goto failure;
         
-        match_id->id = str_match_id;
-        match_id->score = 100;
-        add_match_id(&fnode->match_ids, match_id);
-        
         /* Set provided operations to the device. */
-        fnode->ops = &rootmac_fun_ops;
+        ddf_fun_set_ops(fnode, &rootmac_fun_ops);
         
         /* Register function. */
@@ -116 +115 @@
         
 failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-        
         if (fnode != NULL)
                 ddf_fun_destroy(fnode);
@@ -162 +158 @@
 static hw_resource_list_t *rootmac_get_resources(ddf_fun_t *fnode)
 {
-        rootmac_fun_t *fun = ROOTMAC_FUN(fnode);
+        rootmac_fun_t *fun = rootmac_fun(fnode);
         assert(fun != NULL);
         

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -53 +53 @@
 
 #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 {
@@ -101 +98 @@
 };
 
+/** Obtain function soft-state from DDF function node */
+static rootpc_fun_t *rootpc_fun(ddf_fun_t *fnode)
+{
+        return ddf_fun_data_get(fnode);
+}
+
 static hw_resource_list_t *rootpc_get_resources(ddf_fun_t *fnode)
 {
-        rootpc_fun_t *fun = ROOTPC_FUN(fnode);
+        rootpc_fun_t *fun = rootpc_fun(fnode);
         
         assert(fun != NULL);
@@ -126 +129 @@
 static bool
 rootpc_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id,
-    rootpc_fun_t *fun)
+    rootpc_fun_t *fun_proto)
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
         
         ddf_fun_t *fnode = NULL;
-        match_id_t *match_id = NULL;
+        int rc;
         
         /* Create new device. */
@@ -138 +141 @@
                 goto failure;
         
-        fnode->driver_data = fun;
-        
-        /* Initialize match id list */
-        match_id = create_match_id();
-        if (match_id == NULL)
+        rootpc_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(rootpc_fun_t));
+        *fun = *fun_proto;
+        
+        /* Add match ID */
+        rc = ddf_fun_add_match_id(fnode, str_match_id, 100);
+        if (rc != EOK)
                 goto failure;
         
-        match_id->id = str_match_id;
-        match_id->score = 100;
-        add_match_id(&fnode->match_ids, match_id);
-        
         /* Set provided operations to the device. */
-        fnode->ops = &rootpc_fun_ops;
+        ddf_fun_set_ops(fnode, &rootpc_fun_ops);
         
         /* Register function. */
@@ -161 +161 @@
         
 failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-        
         if (fnode != NULL)
                 ddf_fun_destroy(fnode);
@@ -186 +183 @@
 {
         ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d",
-            (int)dev->handle);
+            (int)ddf_dev_get_handle(dev));
         
         /* Register functions. */

uspace/drv/infrastructure/rootvirt/rootvirt.c

@@ -151 +151 @@
 {
         int rc;
-        const char *name = rvfun->fun->name;
+        const char *name = ddf_fun_get_name(rvfun->fun);
 
         ddf_msg(LVL_DEBUG, "rootvirt_fun_remove('%s')", name);
@@ -183 +183 @@
         }
 
-        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle);
+        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)ddf_dev_get_handle(dev));
 
         rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
@@ -207 +207 @@
 static int rootvirt_dev_remove(ddf_dev_t *dev)
 {
-        rootvirt_t *rootvirt = (rootvirt_t *)dev->driver_data;
+        rootvirt_t *rootvirt = (rootvirt_t *)ddf_dev_data_get(dev);
         int rc;