Changeset c47e1a8 in mainline for uspace/lib/c/generic/device/char.c

Timestamp:

2010-05-21T07:50:04Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes (rev. 451)

File:

• uspace/lib/c/generic/device/char.c (moved) (moved from uspace/lib/libc/generic/device/char.c ) (2 diffs)

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

@@ -60 +60 @@
         
         aid_t req;
-        int rc;
+        int ret;
         
         if (read) {
                 req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE), CHAR_READ_DEV, &answer);
-                rc = async_data_read_start(dev_phone, buf, len);                
+                ret = async_data_read_start(dev_phone, buf, len);               
         } else {
                 req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE), CHAR_WRITE_DEV, &answer);
-                rc = async_data_write_start(dev_phone, buf, len);
+                ret = async_data_write_start(dev_phone, buf, len);
         }
         
-        if (rc != EOK) {
-                ipcarg_t rc_orig;
-                async_wait_for(req, &rc_orig);
+        ipcarg_t rc;
+        if (ret != EOK) {               
+                async_wait_for(req, &rc);
                 async_serialize_end();
-                if (rc_orig == EOK) {
-                        return rc;
+                if (rc == EOK) {
+                        return ret;
                 }
                 else {
-                        return (int) rc_orig;
+                        return (int) rc;
                 }
         }
@@ -85 +85 @@
         async_serialize_end();
         
-        if (EOK != rc) {
-                return rc;
+        ret = (int)rc;
+        if (EOK != ret) {
+                return ret;
         }