Changeset 7707954 in mainline

Timestamp:

2010-03-18T21:20:17Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

bda60d9

Parents:

084ff99

Message:

child device registration - parts of code

Location:

uspace/lib

Files:

• libc/generic/devman.c (modified) (1 diff)
• libc/include/devman.h (modified) (1 diff)
• libdrv/generic/driver.c (modified) (2 diffs)
• libdrv/include/driver.h (modified) (2 diffs)

uspace/lib/libc/generic/devman.c

@@ -106 +106 @@
 }
 
+int devman_child_device_register(const char *name, long parent_handle, long *handle)
+{       
+        int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, &answer);
+
+        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        async_serialize_end();
+        
+        if (retval != EOK) {
+                if (handle != NULL) {
+                        *handle = -1;
+                }
+                return retval;
+        }       
+        
+        if (handle != NULL)
+                *handle = (int) IPC_GET_ARG1(answer);   
+}
+
 void devman_hangup_phone(devman_interface_t iface)
 {

uspace/lib/libc/include/devman.h

@@ -41 +41 @@
 #include <bool.h>
 
-extern int devman_get_phone(devman_interface_t, unsigned int);
-extern void devman_hangup_phone(devman_interface_t iface);
 
-extern int devman_driver_register(const char *, async_client_conn_t);
+int devman_get_phone(devman_interface_t, unsigned int);
+void devman_hangup_phone(devman_interface_t iface);
+
+int devman_driver_register(const char *, async_client_conn_t);
+int devman_child_device_register(const char *name, long parent_handle, long *handle);
 
 

uspace/lib/libdrv/generic/driver.c

@@ -129 +129 @@
 static void driver_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        ipc_callid_t callid;
         /* Select interface */
         switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
@@ -151 +150 @@
 }
 
+bool child_device_register(device_t *child, const char *child_name, device_t *parent)
+{
+        if (devman_child_device_register(child_name, parent->handle, &child->handle)) {
+                // TODO initialize child device
+                return true;
+        }
+        return false;
+}
+
 int driver_main(driver_t *drv) 
 {

uspace/lib/libdrv/include/driver.h

@@ -38 +38 @@
 #include <adt/list.h>
 
-
-
 typedef struct device {
         long handle;
@@ -61 +59 @@
 int driver_main(driver_t *drv);
 
+static inline device_t * create_device()
+{
+        device_t *dev = malloc(sizeof(device_t));
+        if (NULL != dev) {
+                memset(dev, 0, sizeof(device_t));
+        }
+        
+        return dev;
+}
+
+bool child_device_register(device_t *child, const char *child_name, device_t *parent);
+
+
+
 #endif