Changeset f658458 in mainline for uspace/lib

Timestamp:

2010-05-02T20:49:09Z (16 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

Files:

• libc/generic/device/char.c (modified) (2 diffs)
• libc/generic/devman.c (modified) (1 diff)
• libc/include/devman.h (modified) (1 diff)
• libc/include/ipc/devman.h (modified) (1 diff)
• libdrv/generic/driver.c (modified) (2 diffs)
• libdrv/generic/remote_char.c (modified) (1 diff)
• libdrv/include/driver.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
 

uspace/lib/libdrv/generic/driver.c

@@ -254 +254 @@
                         if (!is_valid_iface_idx(iface_idx)) {
                                 // this is not device's interface
-                                printf("%s: driver_connection_gen error - invalid interface id %x.", driver->name, method);
+                                printf("%s: driver_connection_gen error - invalid interface id %d.", driver->name, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);
                                 break;
@@ -265 +265 @@
                         if (NULL == iface) {
                                 printf("%s: driver_connection_gen error - ", driver->name);
-                                printf("device with handle %x has no interface with id %x.\n", handle, method);
+                                printf("device with handle %d has no interface with id %d.\n", handle, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);
                                 break;

uspace/lib/libdrv/generic/remote_char.c

@@ -56 +56 @@
 
 static void remote_char_read(device_t *dev, void *iface, ipc_callid_t callid, ipc_call_t *call)
-{
+{       
         char_iface_t *char_iface = (char_iface_t *)iface;
-        if (!char_iface->read) {
-                ipc_answer_0(callid, ENOTSUP);
-                return;
-        }
         
         size_t len;
         if (!async_data_read_receive(&callid, &len)) {
                 // TODO handle protocol error
+                ipc_answer_0(callid, EINVAL);
+                return;
+        }
+        
+        if (!char_iface->read) {
+                async_data_read_finalize(callid, NULL, 0);
+                ipc_answer_0(callid, ENOTSUP);
                 return;
         }

uspace/lib/libdrv/include/driver.h

@@ -163 +163 @@
 {
         assert(is_valid_iface_idx(idx));        
-
+        if (NULL == dev->class) {
+                return NULL;
+        }
         return dev->class->interfaces[idx];     
 }