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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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 changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/hid/isdv4_tablet/isdv4.h (modified) (2 diffs)

uspace/srv/hid/isdv4_tablet/isdv4.h

@@ -76 +76 @@
 } isdv4_source_type_t;
 
-typedef struct isdv4_event {
+struct isdv4_event {
         isdv4_event_type_t type;
         isdv4_source_type_t source;
@@ -83 +83 @@
         unsigned int pressure;
         unsigned int button;
-} isdv4_event_t;
+};
 
 extern int isdv4_init(isdv4_state_t *, async_sess_t *, isdv4_event_fn);