Changeset bebf97d in mainline

Timestamp:

2012-11-21T22:59:09Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c739102

Parents:

878b764

Message:

rootamdm37x: Don't use data implant.

File:

• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (9 diffs)

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -35 +35 @@
 /** @file
  */
-#define _DDF_DATA_IMPLANT
 
 #define DEBUG_CM 0
@@ -52 +51 @@
 } rootamdm37x_fun_t;
 
+/* See amdm37x TRM page. 3316 for these values */
 #define OHCI_BASE_ADDRESS  0x48064400
 #define OHCI_SIZE  1024
@@ -60 +60 @@
         {
                 .type = MEM_RANGE,
-                /* See amdm37x TRM page. 3316 for these values */
                 .res.io_range = {
                         .address = OHCI_BASE_ADDRESS,
@@ -71 +70 @@
                 .res.interrupt = { .irq = 76 },
         },
-};
-
-static const rootamdm37x_fun_t ohci = {
-        .hw_resources = {
-            .resources = ohci_res,
-            .count = sizeof(ohci_res)/sizeof(ohci_res[0]),
-        }
 };
 
@@ -96 +88 @@
 };
 
+static const rootamdm37x_fun_t ohci = {
+        .hw_resources = {
+            .resources = ohci_res,
+            .count = sizeof(ohci_res)/sizeof(ohci_res[0]),
+        }
+};
+
 static const rootamdm37x_fun_t ehci = {
         .hw_resources = {
@@ -111 +110 @@
 };
 
-static ddf_dev_ops_t rootamdm37x_fun_ops =
-{
+static ddf_dev_ops_t rootamdm37x_fun_ops = {
         .interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops
 };
@@ -126 +124 @@
                 return ENOMEM;
         
-        
         /* Add match id */
         int ret = ddf_fun_add_match_id(fnode, str_match_id, 100);
@@ -134 +131 @@
         }
         
+        /* Alloc needed data */
+        rootamdm37x_fun_t *rf =
+            ddf_fun_data_alloc(fnode, sizeof(rootamdm37x_fun_t));
+        if (!rf) {
+                ddf_fun_destroy(fnode);
+                return ENOMEM;
+        }
+        *rf = *fun;
+
         /* Set provided operations to the device. */
-        ddf_fun_data_implant(fnode, (void*)fun);
         ddf_fun_set_ops(fnode, &rootamdm37x_fun_ops);
         
@@ -142 +147 @@
         if (ret != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding function %s.", name);
-                // TODO This will try to free our data!
                 ddf_fun_destroy(fnode);
                 return ret;