Changeset 084ff99 in mainline

Timestamp:

2010-03-14T09:14:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

7707954

Parents:

67ba309

Message:

passing device to driver (parts of code)

Location:

uspace

Files:

• lib/libc/include/ipc/driver.h (added)
• lib/libdrv/generic/driver.c (modified) (2 diffs)
• lib/libdrv/include/driver.h (modified) (1 diff)
• srv/devman/devman.c (modified) (7 diffs)
• srv/devman/devman.h (modified) (7 diffs)
• srv/drivers/root/root.c (modified) (1 diff)

uspace/lib/libdrv/generic/driver.c

@@ -50 +50 @@
 #include <devman.h>
 #include <ipc/devman.h>
+#include <ipc/driver.h>
 
 #include "driver.h"
 
 static driver_t *driver;
+LIST_INITIALIZE(devices);
+
+static device_t* driver_create_device()
+{
+        device_t *dev = (device_t *)malloc(sizeof(device_t));
+        if (NULL != dev) {
+                memset(dev, 0, sizeof(device_t));               
+        }       
+        return dev;     
+}
+
+static void driver_add_device(ipc_callid_t iid, ipc_call_t *icall) 
+{
+        printf("%s: driver_add_device\n", driver->name);
+        
+        // result of the operation - device was added, device is not present etc.
+        ipcarg_t ret = 0;       
+        ipcarg_t dev_handle =  IPC_GET_ARG1(*icall);
+        
+        printf("%s: adding device with handle = %x \n", driver->name, dev_handle);
+        
+        device_t *dev = driver_create_device();
+        dev->handle = dev_handle;
+        if (driver->driver_ops->add_device(dev)) {
+                list_append(&dev->link, &devices);
+                // TODO set return value
+        }
+        
+        ipc_answer_1(iid, EOK, ret);
+}
 
 static void driver_connection_devman(ipc_callid_t iid, ipc_call_t *icall)
 {
+        printf("%s: driver_connection_devman \n", driver->name);
+        
         /* Accept connection */
         ipc_answer_0(iid, EOK);
@@ -70 +103 @@
                         continue;
                 case DRIVER_ADD_DEVICE:
-                        // TODO
+                        driver_add_device(callid, &call);
                         break;
                 default:

uspace/lib/libdrv/include/driver.h

@@ -32 +32 @@
 /** @file
  */
-
 #ifndef LIBDRV_DRIVER_H_
 #define LIBDRV_DRIVER_H_
 
-typedef enum {
-        DRIVER_DEVMAN = 1,
-        DRIVER_CLIENT,
-        DRIVER_DRIVER
-} driver_interface_t;
+
+#include <adt/list.h>
+
+
 
 typedef struct device {
-        int parent_handle;
+        long handle;
         ipcarg_t parent_phone;  
+        
         // TODO add more items - parent bus type etc.
-        int handle;     
+        
+        link_t link;
 } device_t;
 

uspace/srv/devman/devman.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <ipc/driver.h>
+#include <ipc/devman.h>
 
 #include "devman.h"
@@ -308 +310 @@
 }
 
-/** Create root device node of the device tree.
- * 
- * @return root device node.
- */
-node_t * create_root_node()
+/** Create root device node in the device tree.
+ * 
+ * @param tree the device tree.
+ * @return true on success, false otherwise.
+ */
+bool create_root_node(dev_tree_t *tree)
 {
         printf(NAME ": create_root_node\n");
         node_t *node = create_dev_node();
         if (node) {
-                init_dev_node(node, NULL);
+                insert_dev_node(tree, node, NULL);
                 match_id_t *id = create_match_id();
                 id->id = "root";
                 id->score = 100;
                 add_match_id(&node->match_ids, id);
-        }
-        return node;    
+                tree->root_node = node;
+        }
+        return node != NULL;    
 }
 
@@ -448 +452 @@
         link_t *link;
         
-        link = driver->devices.next;
-        while (link != &driver->devices) {
-                dev = list_get_instance(link, node_t, driver_devices);
-                add_device(driver, dev);
-                link = link->next;
-        }       
+        int phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+        
+        if (0 < phone) {
+                
+                link = driver->devices.next;
+                while (link != &driver->devices) {
+                        dev = list_get_instance(link, node_t, driver_devices);
+                        add_device(phone, driver, dev);
+                        link = link->next;
+                }
+                
+                ipc_hangup(phone);
+        }
 }
 
@@ -463 +474 @@
  */
 void initialize_running_driver(driver_t *driver) 
-{
+{       
         fibril_mutex_lock(&driver->driver_mutex);
         
@@ -480 +491 @@
  * @param node the device's node in the device tree.
  */
-void add_device(driver_t *drv, node_t *node)
+void add_device(int phone, driver_t *drv, node_t *node)
 {
         printf(NAME ": add_device\n");
-        
-        // TODO
-        
-        // pass a new device to the running driver, which was previously assigned to it
-                // send the phone of the parent's driver and device's handle within the parent's driver to the driver 
-                // let the driver to probe the device and specify whether the device is actually present
-                // if the device is present, remember its handle within the driver
+
+        ipcarg_t ret;
+        ipcarg_t rc = async_req_1_1(phone, DRIVER_ADD_DEVICE, node->handle, &ret);
+        if (rc != EOK) {
+                // TODO handle error
+                return false;
+        }
+        
+        // TODO inspect return value (ret) to find out whether the device was successfully probed and added
         
         return true;
 }
 
-/**
+/** 
  * Find suitable driver for a device and assign the driver to it.
  * 
@@ -523 +536 @@
         if (DRIVER_RUNNING == drv->state) {
                 // notify driver about new device
-                add_device(drv, node);          
+                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                if (phone > 0) {
+                        add_device(phone, drv, node);           
+                        ipc_hangup(phone);
+                }
         }
         
@@ -542 +559 @@
         printf(NAME ": init_device_tree.\n");
         
+        atomic_set(&tree->current_handle, 0);
+        
         // create root node and add it to the device tree
-        if (NULL == (tree->root_node = create_root_node())) {
+        if (!create_root_node(tree)) {
                 return false;
         }

uspace/srv/devman/devman.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 #include <fibril_synch.h>
+#include <atomic.h>
 
 #include "util.h"
@@ -115 +116 @@
 /** Representation of a node in the device tree.*/
 struct node {
+        /** The global unique identifier of the device.*/
+        long handle;
         /** The node of the parent device. */
         node_t *parent;
@@ -137 +140 @@
         /** Root device node. */
         node_t *root_node;
+        atomic_t current_handle;
 } dev_tree_t;
 
@@ -191 +195 @@
 void add_driver(driver_list_t *drivers_list, driver_t *drv);
 void attach_driver(node_t *node, driver_t *drv);
-void add_device(driver_t *drv, node_t *node);
+void add_device(int phone, driver_t *drv, node_t *node);
 bool start_driver(driver_t *drv);
 
@@ -230 +234 @@
 
 // Device nodes
-node_t * create_root_node();
 
 static inline node_t * create_dev_node()
@@ -238 +241 @@
                 memset(res, 0, sizeof(node_t));
         }
+        
+        list_initialize(&res->children);
+        list_initialize(&res->match_ids.ids);
+        
         return res;
 }
 
-static inline void init_dev_node(node_t *node, node_t *parent)
-{
-        assert(NULL != node);
+static inline void insert_dev_node(dev_tree_t *tree, node_t *node, node_t *parent)
+{
+        assert(NULL != node && NULL != tree);
+        
+        node->handle = atomic_postinc(&tree->current_handle);
 
         node->parent = parent;
         if (NULL != parent) {
+                fibril_mutex_lock(&parent->children_mutex);
                 list_append(&node->sibling, &parent->children);
+                fibril_mutex_unlock(&parent->children_mutex);
         }
-
-        list_initialize(&node->children);
-
-        list_initialize(&node->match_ids.ids);
 }
 
@@ -259 +266 @@
 
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list);
+bool create_root_node(dev_tree_t *tree);
 
 

uspace/srv/drivers/root/root.c

@@ -65 +65 @@
 static bool root_add_device(device_t *dev) 
 {
+        printf(NAME ": root_add_device, device handle = %s", dev->handle);
         // TODO add root device and register its children
         return true;