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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/io/visualizer.c

    rdbf32b1 r95c675b  
    3333 */
    3434
     35#include <assert.h>
    3536#include <errno.h>
    3637#include <as.h>
     
    175176        sysarg_t x_offset, sysarg_t y_offset)
    176177{
    177 #ifdef __32_BITS__
     178        assert(x_offset <= UINT16_MAX);
     179        assert(y_offset <= UINT16_MAX);
     180
    178181        sysarg_t offsets = ((x_offset << 16) | (y_offset & 0x0000ffff));
    179 #else
    180         sysarg_t offsets = ((x_offset << 32) | (y_offset & 0xffffffff));
    181 #endif
    182182
    183183        async_exch_t *exch = async_exchange_begin(sess);
Note: See TracChangeset for help on using the changeset viewer.