Changeset efdfebc in mainline for uspace/drv/infrastructure/rootmac/rootmac.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/rootmac/rootmac.c (modified) (8 diffs)

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;
 } rootmac_fun_t;
 
-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 = 0xfec00000,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xfee00000,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
         }
 };
@@ -63 +69 @@
 static rootmac_fun_t pci_data = {
         .hw_resources = {
-                1,
-                &pci_conf_regs
+                2,
+                pci_conf_regs
         }
 };
@@ -70 +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. */
@@ -83 +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. */
@@ -106 +115 @@
         
 failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-        
         if (fnode != NULL)
                 ddf_fun_destroy(fnode);
@@ -127 +133 @@
 static int rootmac_dev_add(ddf_dev_t *dev)
 {
+#if 0
         /* Register functions */
-        if (!rootmac_add_fun(dev, "pci0", "pangea_pci", &pci_data))
+        if (!rootmac_add_fun(dev, "pci0", "intel_pci", &pci_data))
                 ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
+#else
+        (void)pci_data;
+        (void)rootmac_add_fun;
+#endif
         
         return EOK;
@@ -147 +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);
         
@@ -168 +179 @@
 {
         printf("%s: HelenOS Mac platform driver\n", NAME);
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME);
         rootmac_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
         return ddf_driver_main(&rootmac_driver);