Changeset df747b9c in mainline for uspace/srv/drivers/root/root.c

Timestamp:

2010-04-23T11:30:25Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5af21c5

Parents:

a78fa2a

Message:

added device states (usable, invalid, not present, not initialized); add_device driver callback method returns integer (errno) instead of bool

File:

• uspace/srv/drivers/root/root.c (modified) (7 diffs)

uspace/srv/drivers/root/root.c

@@ -52 +52 @@
 #define NAME "root"
 
-static bool root_add_device(device_t *dev);
+static int root_add_device(device_t *dev);
 
 /** The root device driver's standard operations.
@@ -67 +67 @@
 };
 
-/** Create the device which represents the root of HW device tree. 
+/** Create the device which represents the root of HW device tree.
+ * 
  * @param parent parent of the newly created device.
+ * @return 0 on success, negative error number otherwise.
  */
-static bool add_platform_child(device_t *parent) {
+static int add_platform_child(device_t *parent) {
         printf(NAME ": adding new child for platform device.\n");
         
+        int res = EOK;
         device_t *platform = NULL;
         match_id_t *match_id = NULL;    
@@ -78 +81 @@
         // create new device
         if (NULL == (platform = create_device())) {
+                res = ENOMEM;
                 goto failure;
         }       
@@ -86 +90 @@
         // initialize match id list
         if (NULL == (match_id = create_match_id())) {
+                res = ENOMEM;
                 goto failure;
         }
@@ -95 +100 @@
         
         // register child  device
-        if (!child_device_register(platform, parent)) {
+        res = child_device_register(platform, parent);
+        if (EOK != res) {
                 goto failure;
         }
         
-        return true;
+        return res;
         
 failure:
@@ -111 +117 @@
         }
         
-        return false;   
+        return res;     
 }
 
@@ -117 +123 @@
  * @param dev the device which is root of the whole device tree (both of HW and pseudo devices).
  */
-static bool root_add_device(device_t *dev) 
+static int root_add_device(device_t *dev) 
 {
         printf(NAME ": root_add_device, device handle = %d\n", dev->handle);
         
         // register root device's children      
-        if (!add_platform_child(dev)) {
+        int res = add_platform_child(dev);      
+        if (EOK != res) {
                 printf(NAME ": failed to add child device for platform.\n");
-                return false;
         }
         
-        return true;
+        return res;
 }