Changeset f658458 in mainline for uspace/lib/libdrv

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/libdrv

Files:

• generic/driver.c (modified) (2 diffs)
• generic/remote_char.c (modified) (1 diff)
• include/driver.h (modified) (1 diff)

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];     
 }