Changeset f658458 in mainline for uspace/lib/libc

Timestamp:

2010-05-02T20:49:09Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

bb864a0

Parents:

25a7e11d

Message:

parts of generic char interface, fixed some bugs

Location:

uspace/lib/libc

Files:

• generic/device/char.c (modified) (2 diffs)
• generic/devman.c (modified) (1 diff)
• include/devman.h (modified) (1 diff)
• include/ipc/devman.h (modified) (1 diff)

uspace/lib/libc/generic/device/char.c

@@ -38 +38 @@
 #include <async.h>
 #include <malloc.h>
+#include <stdio.h>
 
 
@@ -46 +47 @@
         async_serialize_start();
         
+        printf("calling interface %d\n", DEV_IFACE_ID(CHAR_DEV_IFACE));
         aid_t req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE), CHAR_READ_DEV, &answer);
         

uspace/lib/libc/generic/devman.c

@@ -230 +230 @@
 }
 
+int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags)
+{
+        int phone = devman_get_phone(DEVMAN_CLIENT, flags);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, DEVMAN_DEVICE_GET_HANDLE, flags, 0,
+            &answer);
+        
+        ipcarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
+        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 = (device_handle_t) -1;
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (device_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
+
+
 /** @}
  */

uspace/lib/libc/include/devman.h

@@ -51 +51 @@
 int devman_parent_device_connect(device_handle_t handle, unsigned int flags);
 
+int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags);
+
 
 #endif

uspace/lib/libc/include/ipc/devman.h

@@ -138 +138 @@
 } devman_to_driver_t;
 
+typedef enum {
+        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD
+} client_to_devman_t;
+
 #endif