Changeset 19b3cc6 in mainline for uspace/lib/c/generic/io/window.c

Timestamp:

2014-01-17T23:12:10Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

File:

• uspace/lib/c/generic/io/window.c (modified) (2 diffs)

uspace/lib/c/generic/io/window.c

@@ -40 +40 @@
 #include <stdio.h>
 
-int win_register(async_sess_t *sess, service_id_t *in, service_id_t *out, 
-    sysarg_t x_offset, sysarg_t y_offset)
+int win_register(async_sess_t *sess, service_id_t *in, service_id_t *out)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_2_2(exch, WINDOW_REGISTER, x_offset, y_offset, in, out);
+        int ret = async_req_0_2(exch, WINDOW_REGISTER, in, out);
         async_exchange_end(exch);
-
+        
         return ret;
 }
@@ -92 +91 @@
 }
 
-int win_resize(async_sess_t *sess, sysarg_t width, sysarg_t height, void *cells)
+int win_resize(async_sess_t *sess, sysarg_t x, sysarg_t y, sysarg_t width,
+    sysarg_t height, window_placement_flags_t placement_flags, void *cells)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-
+        
         ipc_call_t answer;
-        aid_t req = async_send_2(exch, WINDOW_RESIZE, width, height, &answer);
-
+        aid_t req = async_send_5(exch, WINDOW_RESIZE, x, y, width, height,
+            (sysarg_t) placement_flags, &answer);
+        
         int rc = async_share_out_start(exch, cells, AS_AREA_READ | AS_AREA_CACHEABLE);
-
+        
         async_exchange_end(exch);
-
+        
         sysarg_t ret;
         async_wait_for(req, &ret);
-
-        if (rc != EOK) {
+        
+        if (rc != EOK)
                 return rc;
-        } else if (ret != EOK) {
+        else if (ret != EOK)
                 return ret;
-        } else {
-                return EOK;
-        }
+        
+        return EOK;
 }