Changeset 95c675b in mainline for uspace/lib/c/generic/io/visualizer.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

uspace/lib/c/generic/io/visualizer.c

@@ -33 +33 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <as.h>
@@ -175 +176 @@
         sysarg_t x_offset, sysarg_t y_offset)
 {
-#ifdef __32_BITS__
+        assert(x_offset <= UINT16_MAX);
+        assert(y_offset <= UINT16_MAX);
+
         sysarg_t offsets = ((x_offset << 16) | (y_offset & 0x0000ffff));
-#else
-        sysarg_t offsets = ((x_offset << 32) | (y_offset & 0xffffffff));
-#endif
 
         async_exch_t *exch = async_exchange_begin(sess);