Changeset efdfebc in mainline for uspace/drv/infrastructure/rootpc/rootpc.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -54 +54 @@
 #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 {
         hw_resource_list_t hw_resources;
@@ -75 +72 @@
 };
 
-static hw_resource_t pci_conf_regs = {
-        .type = IO_RANGE,
-        .res.io_range = {
-                .address = 0xCF8,
-                .size = 8,
-                .endianness = LITTLE_ENDIAN
+static hw_resource_t pci_conf_regs[] = {
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCF8,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCFC,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
         }
 };
@@ -86 +93 @@
 static rootpc_fun_t pci_data = {
         .hw_resources = {
-                1,
-                &pci_conf_regs
-        }
-};
+                sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]),
+                pci_conf_regs
+        }
+};
+
+/** 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);
@@ -116 +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. */
@@ -128 +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. */
@@ -151 +161 @@
         
 failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-        
         if (fnode != NULL)
                 ddf_fun_destroy(fnode);
@@ -176 +183 @@
 {
         ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d",
-            (int)dev->handle);
+            (int)ddf_dev_get_handle(dev));
         
         /* Register functions. */
@@ -188 +195 @@
 static void root_pc_init(void)
 {
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         rootpc_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
 }