Changeset ba95e8f in mainline for uspace/lib

Timestamp:

2010-05-06T10:31:02Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

ca97cad

Parents:

bb864a0

Message:

fixed some bugs; now it is possible to read from serial port using character interface, this might be tested with the test_serial application

Location:

uspace/lib

Files:

• libc/generic/device/char.c (modified) (3 diffs)
• libdrv/generic/remote_char.c (modified) (4 diffs)

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

@@ -47 +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);
         
-        printf("async_data_read_start \n");
         int rc = async_data_read_start(dev_phone, buf, len);
         
-        printf("async_data_read_start, rc = %d\n", rc);
         if (rc != EOK) {
                 ipcarg_t rc_orig;
@@ -66 +63 @@
         }
         
-        printf("async_wait_for(req, &rc);\n", rc);
         async_wait_for(req, &rc);
-        printf("async_serialize_end();\n", rc);
         async_serialize_end();
         
@@ -75 +70 @@
         }
         
-        printf("IPC_GET_ARG1(answer);\n", rc);
         return IPC_GET_ARG1(answer);
 }

uspace/lib/libdrv/generic/remote_char.c

@@ -58 +58 @@
 {       
         char_iface_t *char_iface = (char_iface_t *)iface;
+        ipc_callid_t cid;
         
         size_t len;
-        if (!async_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&cid, &len)) {
                 // TODO handle protocol error
                 ipc_answer_0(callid, EINVAL);
@@ -67 +68 @@
         
         if (!char_iface->read) {
-                async_data_read_finalize(callid, NULL, 0);
+                async_data_read_finalize(cid, NULL, 0);
                 ipc_answer_0(callid, ENOTSUP);
                 return;
@@ -80 +81 @@
         
         if (ret < 0) { // some error occured
-                async_data_read_finalize(callid, buf, 0);
+                async_data_read_finalize(cid, buf, 0);
                 ipc_answer_0(callid, ret);
                 return;
         }
         
-        printf("remote_char_read - async_data_read_finalize\n");
-        async_data_read_finalize(callid, buf, ret);
-        printf("remote_char_read - ipc_answer_0(callid, EOK);\n");
-        ipc_answer_0(callid, EOK);      
+        async_data_read_finalize(cid, buf, ret);
+        ipc_answer_1(callid, EOK, ret); 
 }
 
@@ -117 +116 @@
                 ipc_answer_0(callid, ret);
         } else {
-                ipc_answer_0(callid, EOK);
+                ipc_answer_1(callid, EOK, ret);
         }
 }