Changeset bfc5577a in mainline

Timestamp:

2012-04-18T20:10:55Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

a44b58c

Parents:

f4ebaf3c

Message:

rtc: fix CLOCK_DEV protocol

Location:

uspace/lib

Files:

• c/generic/device/clock_dev.c (modified) (6 diffs)
• drv/generic/remote_clock_dev.c (modified) (2 diffs)

uspace/lib/c/generic/device/clock_dev.c

@@ -49 +49 @@
 clock_dev_time_get(async_sess_t *sess, struct tm *t)
 {
-        ipc_call_t answer;
         aid_t req;
         int ret;
@@ -56 +55 @@
 
         req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
-            CLOCK_DEV_TIME_GET, &answer);
+            CLOCK_DEV_TIME_GET, NULL);
         ret = async_data_read_start(exch, t, sizeof(*t));
 
@@ -69 +68 @@
 
         async_wait_for(req, &rc);
-        if ((int) rc != EOK)
-                return ret;
-
-        return (int) IPC_GET_ARG1(answer);
+        return (int)rc;
 }
 
@@ -85 +81 @@
 clock_dev_time_set(async_sess_t *sess, struct tm *t)
 {
-        ipc_call_t answer;
         aid_t req;
         int ret;
@@ -92 +87 @@
 
         req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
-            CLOCK_DEV_TIME_SET, &answer);
+            CLOCK_DEV_TIME_SET, NULL);
         ret = async_data_write_start(exch, t, sizeof(*t));
 
@@ -105 +100 @@
 
         async_wait_for(req, &rc);
-        if ((int) rc != EOK)
-                return ret;
-
-        return (int) IPC_GET_ARG1(answer);
+        return (int)rc;
 }
 

uspace/lib/drv/generic/remote_clock_dev.c

@@ -96 +96 @@
                 async_data_read_finalize(cid, NULL, 0);
                 async_answer_0(callid, rc);
+                return;
         }
 
         /* The operation was successful */
         async_data_read_finalize(cid, &t, sizeof(struct tm));
-        async_answer_1(callid, EOK, rc);
+        async_answer_0(callid, rc);
 }
 
@@ -133 +134 @@
 
         rc = (*clock_dev_ops->time_set)(fun, &t);
-        if (rc < 0) {
-                /* Some error occurred */
-                async_answer_0(callid, rc);
-                return;
-        }
 
-        async_answer_1(callid, EOK, rc);
+        async_answer_0(callid, rc);
 }