Changeset 084ff99 in mainline for uspace/lib

Timestamp:

2010-03-14T09:14:50Z (16 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/lib

Files:

• libc/include/ipc/driver.h (added)
• libdrv/generic/driver.c (modified) (2 diffs)
• libdrv/include/driver.h (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;