Changeset a78fa2a in mainline

Timestamp:

2010-04-23T08:35:36Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

df747b9c

Parents:

1f8657b

Message:

Send device's name to a driver when the device is passed to it.

Location:

uspace

Files:

• lib/libdrv/generic/driver.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)

uspace/lib/libdrv/generic/driver.c

@@ -111 +111 @@
         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)) {              
@@ -121 +122 @@
                 ret = 0;
         }
-        ipc_answer_1(iid, EOK, ret);
+        ipc_answer_0(iid, EOK);
 }
 

uspace/srv/devman/devman.c

@@ -503 +503 @@
 {
         printf(NAME ": add_device\n");
-
-        ipcarg_t ret;
-        ipcarg_t rc = async_req_1_1(phone, DRIVER_ADD_DEVICE, node->handle, &ret);
-        if (rc != EOK) {
+        
+        ipcarg_t rc;
+        ipc_call_t answer;
+        
+        // send the device to the driver
+        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle, &answer);
+        
+        // send the device's name to the driver
+        rc = async_data_write_start(phone, node->name, str_size(node->name) + 1);
+    if (rc != EOK) {
                 // TODO handle error
-                return;
-        }
-        
-        // TODO inspect return value (ret) to find out whether the device was successfully probed and added
+    }
+        
+        // wait for answer from the driver
+        async_wait_for(req, &rc);
+        switch(rc) {
+                // TODO inspect return value to find out whether the device was successfully probed and added
+        case EOK:
+        case ENOENT:
+                
+                break;
+                
+        }
         
         return;