Changeset bb864a0 in mainline

Timestamp:

2010-05-05T20:55:40Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

ba95e8f

Parents:

f658458

Message:

backup

Location:

uspace

Files:

• lib/libc/generic/device/char.c (modified) (3 diffs)
• lib/libdrv/generic/remote_char.c (modified) (1 diff)
• srv/drivers/serial/serial.c (modified) (1 diff)

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

@@ -50 +50 @@
         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;
@@ -63 +66 @@
         }
         
+        printf("async_wait_for(req, &rc);\n", rc);
         async_wait_for(req, &rc);
+        printf("async_serialize_end();\n", rc);
         async_serialize_end();
         
@@ -70 +75 @@
         }
         
+        printf("IPC_GET_ARG1(answer);\n", rc);
         return IPC_GET_ARG1(answer);
 }

uspace/lib/libdrv/generic/remote_char.c

@@ -85 +85 @@
         }
         
+        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);      
 }

uspace/srv/drivers/serial/serial.c

@@ -95 +95 @@
 {
         printf(NAME ": serial_read %s\n", dev->name);
-        // TODO
-        return 0;
+        
+        int ret = 0;
+        
+        serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
+        fibril_mutex_lock(&data->mutex);
+        
+        while (!buf_is_empty(&data->input_buffer) && ret < count) {
+                buf[ret] = (char)buf_pop_front(&data->input_buffer);
+                ret++;
+        }
+        
+        fibril_mutex_unlock(&data->mutex);
+        
+        return ret;
 }