Changeset df747b9c in mainline for uspace/lib/libdrv

Timestamp:

2010-04-23T11:30:25Z (15 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

Location:

uspace/lib/libdrv

Files:

• generic/driver.c (modified) (3 diffs)
• include/driver.h (modified) (2 diffs)

uspace/lib/libdrv/generic/driver.c

@@ -103 +103 @@
 static void driver_add_device(ipc_callid_t iid, ipc_call_t *icall)
 {
-        // TODO device state - the driver may detect the device is not actually present 
-        // (old non PnP devices) or is not working properly. 
-        // We should send such information to device manager.
-        
-        ipcarg_t ret;
+        char *dev_name = NULL;
+        int res = EOK;
+        
         device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
         device_t *dev = driver_create_device();
         dev->handle = dev_handle;
-        async_string_receive(&dev->name, 0, NULL);
-        add_to_devices_list(dev);
-        if (driver->driver_ops->add_device(dev)) {              
+        
+        async_string_receive(&dev_name, 0, NULL);
+        dev->name = dev_name;
+        
+        add_to_devices_list(dev);               
+        res = driver->driver_ops->add_device(dev);
+        if (0 == res) {
                 printf("%s: new device with handle = %x was added.\n", driver->name, dev_handle);
-                ret = 1;
         } else {
-                printf("%s: failed to add a new device with handle = %x.\n", driver->name, dev_handle); 
+                printf("%s: failed to add a new device with handle = %d.\n", driver->name, dev_handle); 
                 remove_from_devices_list(dev);
-                // TODO delete device           
-                ret = 0;
-        }
-        ipc_answer_0(iid, EOK);
+                delete_device(dev);             
+        }
+        
+        ipc_answer_0(iid, res);
 }
 
@@ -270 +271 @@
 }
 
-bool child_device_register(device_t *child, device_t *parent)
+int child_device_register(device_t *child, device_t *parent)
 {
         // printf("%s: child_device_register\n", driver->name);
@@ -276 +277 @@
         assert(NULL != child->name);
 
+        int res;
+        
         add_to_devices_list(child);
-        if (EOK == devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle)) {
-                return true;
+        if (EOK == (res = devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle))) {
+                return res;
         }
         remove_from_devices_list(child);        
-        return false;
+        return res;
 }
 

uspace/lib/libdrv/include/driver.h

@@ -109 +109 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver.*/
-        bool (*add_device)(device_t *dev);
+        int (*add_device)(device_t *dev);
         // TODO add other generic driver operations
 } driver_ops_t;
@@ -161 +161 @@
 }
 
-bool child_device_register(device_t *child, device_t *parent);
+int child_device_register(device_t *child, device_t *parent);