Changeset aa2b32c in mainline for uspace/lib/c/include/io/pos_event.h

Timestamp:

2013-04-29T12:44:05Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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

File:

• uspace/lib/c/include/io/pos_event.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (3 diffs)

uspace/lib/c/include/io/pos_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup genarch
+/** @addtogroup libc
  * @{
  */
@@ -33 +34 @@
  */
 
-#ifndef KERN_LOGO_196X66_H_
-#define KERN_LOGO_196X66_H_
+#ifndef LIBC_IO_POS_EVENT_H_
+#define LIBC_IO_POS_EVENT_H_
 
-#define LOGO_WIDTH   196
-#define LOGO_HEIGHT  66
-#define LOGO_COLOR   0xffffff
+#include <sys/types.h>
 
-#include <typedefs.h>
+typedef enum {
+        POS_UPDATE,
+        POS_PRESS,
+        POS_RELEASE
+} pos_event_type_t;
 
-extern uint32_t fb_logo[LOGO_WIDTH * LOGO_HEIGHT];
+/** Positioning device event */
+typedef struct {
+        sysarg_t pos_id;
+        pos_event_type_t type;
+        sysarg_t btn_num;
+        sysarg_t hpos;
+        sysarg_t vpos;
+} pos_event_t;
 
 #endif