Changeset 878b764 in mainline

Timestamp:

2012-11-21T22:46:50Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bebf97d

Parents:

7a6d91b

Message:

rootamdm37x: Make rootamdm37x_add_fun use erro codes instead of error/bool mix.

File:

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

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -116 +116 @@
 };
 
-static bool rootamdm37x_add_fun(ddf_dev_t *dev, const char *name,
+static int rootamdm37x_add_fun(ddf_dev_t *dev, const char *name,
     const char *str_match_id, const rootamdm37x_fun_t *fun)
 {
@@ -128 +128 @@
         
         /* Add match id */
-        if (ddf_fun_add_match_id(fnode, str_match_id, 100) != EOK) {
+        int ret = ddf_fun_add_match_id(fnode, str_match_id, 100);
+        if (ret != EOK) {
                 ddf_fun_destroy(fnode);
-                return false;
+                return ret;
         }
         
@@ -138 +139 @@
         
         /* Register function. */
-        if (ddf_fun_bind(fnode) != EOK) {
+        ret = ddf_fun_bind(fnode);
+        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 false;
-        }
-        
-        return true;
+                return ret;
+        }
+        
+        return EOK;
 }
 
@@ -183 +185 @@
 
         /* Register functions */
-        if (!rootamdm37x_add_fun(dev, "ohci", "usb/host=ohci", &ohci))
+        if (rootamdm37x_add_fun(dev, "ohci", "usb/host=ohci", &ohci) != EOK)
                 ddf_msg(LVL_ERROR, "Failed to add OHCI function for "
                     "BeagleBoard-xM platform.");
-        if (!rootamdm37x_add_fun(dev, "ehci", "usb/host=ehci", &ehci))
+        if (rootamdm37x_add_fun(dev, "ehci", "usb/host=ehci", &ehci) != EOK)
                 ddf_msg(LVL_ERROR, "Failed to add EHCI function for "
                     "BeagleBoard-xM platform.");