Changeset 15d0046 in mainline for uspace/drv/platform/amdm37x/main.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/platform/amdm37x/main.c (moved) (moved from uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c ) (11 diffs)

uspace/drv/platform/amdm37x/main.c

@@ -28 +28 @@
 
 /**
- * @defgroup root_amdm37x TI AM/DM37x platform driver.
+ * @defgroup amdm37x TI AM/DM37x platform driver.
  * @brief HelenOS TI AM/DM37x platform driver.
  * @{
@@ -45 +45 @@
 #include "amdm37x.h"
 
-#define NAME  "rootamdm37x"
+#define NAME  "amdm37x"
 
 typedef struct {
@@ -51 +51 @@
         match_id_t match_id;
         hw_resource_list_t hw_resources;
-} rootamdm37x_fun_t;
+} amdm37x_fun_t;
 
 /* See amdm37x TRM page 3316 for these values */
@@ -130 +130 @@
 };
 
-static const rootamdm37x_fun_t amdm37x_funcs[] = {
+static const amdm37x_fun_t amdm37x_funcs[] = {
 {
         .name = "ohci",
@@ -149 +149 @@
 
 
-static hw_resource_list_t *rootamdm37x_get_resources(ddf_fun_t *fnode);
-static bool rootamdm37x_enable_interrupt(ddf_fun_t *fun);
+static hw_resource_list_t *amdm37x_get_resources(ddf_fun_t *fnode);
+static bool amdm37x_enable_interrupt(ddf_fun_t *fun);
 
 static hw_res_ops_t fun_hw_res_ops = {
-        .get_resource_list = &rootamdm37x_get_resources,
-        .enable_interrupt = &rootamdm37x_enable_interrupt,
-};
-
-static ddf_dev_ops_t rootamdm37x_fun_ops = {
+        .get_resource_list = &amdm37x_get_resources,
+        .enable_interrupt = &amdm37x_enable_interrupt,
+};
+
+static ddf_dev_ops_t amdm37x_fun_ops = {
         .interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops
 };
 
-static int rootamdm37x_add_fun(ddf_dev_t *dev, const rootamdm37x_fun_t *fun)
+static int amdm37x_add_fun(ddf_dev_t *dev, const amdm37x_fun_t *fun)
 {
         assert(dev);
@@ -182 +182 @@
         
         /* Alloc needed data */
-        rootamdm37x_fun_t *rf =
-            ddf_fun_data_alloc(fnode, sizeof(rootamdm37x_fun_t));
+        amdm37x_fun_t *rf =
+            ddf_fun_data_alloc(fnode, sizeof(amdm37x_fun_t));
         if (!rf) {
                 ddf_fun_destroy(fnode);
@@ -191 +191 @@
 
         /* Set provided operations to the device. */
-        ddf_fun_set_ops(fnode, &rootamdm37x_fun_ops);
+        ddf_fun_set_ops(fnode, &amdm37x_fun_ops);
         
         /* Register function. */
@@ -212 +212 @@
  *
  */
-static int rootamdm37x_dev_add(ddf_dev_t *dev)
+static int amdm37x_dev_add(ddf_dev_t *dev)
 {
         assert(dev);
@@ -240 +240 @@
         /* Register functions */
         for (unsigned i = 0; i < ARRAY_SIZE(amdm37x_funcs); ++i) {
-                if (rootamdm37x_add_fun(dev, &amdm37x_funcs[i]) != EOK)
+                if (amdm37x_add_fun(dev, &amdm37x_funcs[i]) != EOK)
                         ddf_msg(LVL_ERROR, "Failed to add %s function for "
                             "BeagleBoard-xM platform.", amdm37x_funcs[i].name);
@@ -248 +248 @@
 
 /** The root device driver's standard operations. */
-static driver_ops_t rootamdm37x_ops = {
-        .dev_add = &rootamdm37x_dev_add
+static driver_ops_t amdm37x_ops = {
+        .dev_add = &amdm37x_dev_add
 };
 
 /** The root device driver structure. */
-static driver_t rootamdm37x_driver = {
+static driver_t amdm37x_driver = {
         .name = NAME,
-        .driver_ops = &rootamdm37x_ops
-};
-
-static hw_resource_list_t * rootamdm37x_get_resources(ddf_fun_t *fnode)
-{
-        rootamdm37x_fun_t *fun = ddf_fun_data_get(fnode);
+        .driver_ops = &amdm37x_ops
+};
+
+static hw_resource_list_t * amdm37x_get_resources(ddf_fun_t *fnode)
+{
+        amdm37x_fun_t *fun = ddf_fun_data_get(fnode);
         assert(fun != NULL);
         return &fun->hw_resources;
 }
 
-static bool rootamdm37x_enable_interrupt(ddf_fun_t *fun)
+static bool amdm37x_enable_interrupt(ddf_fun_t *fun)
 {
         //TODO: Implement
@@ -275 +275 @@
         printf("%s: HelenOS AM/DM37x(OMAP37x) platform driver\n", NAME);
         ddf_log_init(NAME);
-        return ddf_driver_main(&rootamdm37x_driver);
+        return ddf_driver_main(&amdm37x_driver);
 }