Changeset 2b3dd78 in mainline for uspace/srv/hid/isdv4_tablet/isdv4.h


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/isdv4_tablet/isdv4.h

    ra0a9cc2 r2b3dd78  
    7474
    7575typedef enum {
    76         UNKNOWN, PRESS, RELEASE, PROXIMITY_IN, PROXIMITY_OUT, MOVE
     76        UNKNOWN,
     77        PRESS,
     78        RELEASE,
     79        PROXIMITY_IN,
     80        PROXIMITY_OUT,
     81        MOVE
    7782} isdv4_event_type_t;
    7883
    7984typedef enum {
    80         STYLUS_TIP, STYLUS_ERASER, TOUCH
     85        STYLUS_TIP,
     86        STYLUS_ERASER,
     87        TOUCH
    8188} isdv4_source_type_t;
    8289
Note: See TracChangeset for help on using the changeset viewer.