Changeset bda60d9 in mainline for uspace/lib/libdrv

Timestamp:

2010-03-19T14:40:14Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d347b53

Parents:

7707954

Message:

adding child device - parts of code

Location:

uspace/lib/libdrv

Files:

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

uspace/lib/libdrv/generic/driver.c

@@ -72 +72 @@
         // result of the operation - device was added, device is not present etc.
         ipcarg_t ret = 0;       
-        ipcarg_t dev_handle =  IPC_GET_ARG1(*icall);
+        device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
         
         printf("%s: adding device with handle = %x \n", driver->name, dev_handle);
@@ -109 +109 @@
                                 ipc_answer_0(callid, ENOENT);
                 }
-        }
-        
+        }       
 }
 
@@ -150 +149 @@
 }
 
-bool child_device_register(device_t *child, const char *child_name, device_t *parent)
+bool child_device_register(device_t *child, device_t *parent)
 {
-        if (devman_child_device_register(child_name, parent->handle, &child->handle)) {
+        printf("%s: child_device_register\n", driver->name);
+        
+        assert(NULL != child->name);
+        
+        if (devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle)) {
                 // TODO initialize child device
                 return true;

uspace/lib/libdrv/include/driver.h

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <ipc/devman.h>
 
 typedef struct device {
-        long handle;
+        device_handle_t handle;
         ipcarg_t parent_phone;  
+        const char *name;
+        match_id_list_t match_ids;
         
         // TODO add more items - parent bus type etc.
@@ -64 +67 @@
         if (NULL != dev) {
                 memset(dev, 0, sizeof(device_t));
-        }
-        
+        }       
+        list_initialize(&dev->match_ids.ids);
         return dev;
 }
 
-bool child_device_register(device_t *child, const char *child_name, device_t *parent);
+static inline delete_device(device_t *dev) {
+        clean_match_ids(&dev->match_ids);
+        if (NULL != dev->name) {
+                free(dev->name);
+        }
+        free(dev);
+}
 
+bool child_device_register(device_t *child, device_t *parent);