Changeset aa2b32c in mainline for uspace/lib/c/include

Timestamp:

2013-04-29T12:44:05Z (13 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

Location:

uspace/lib/c/include/io

Files:

• con_srv.h (modified) (2 diffs)
• cons_event.h (added)
• console.h (modified) (2 diffs)
• pos_event.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (3 diffs)
• window.h (modified) (1 diff)

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

@@ -41 +41 @@
 #include <io/color.h>
 #include <io/concaps.h>
-#include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/pixel.h>
 #include <io/style.h>
@@ -82 +82 @@
         void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
         void (*set_cursor_visibility)(con_srv_t *, bool);
-        int (*get_event)(con_srv_t *, kbd_event_t *);
+        int (*get_event)(con_srv_t *, cons_event_t *);
 } con_ops_t;
 

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

@@ -39 +39 @@
 #include <io/concaps.h>
 #include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/keycode.h>
 #include <async.h>
@@ -82 +83 @@
 extern void console_cursor_visibility(console_ctrl_t *, bool);
 extern int console_get_color_cap(console_ctrl_t *, sysarg_t *);
-extern bool console_get_kbd_event(console_ctrl_t *, kbd_event_t *);
-extern bool console_get_kbd_event_timeout(console_ctrl_t *, kbd_event_t *,
+extern bool console_get_event(console_ctrl_t *, cons_event_t *);
+extern bool console_get_event_timeout(console_ctrl_t *, cons_event_t *,
     suseconds_t *);
 

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

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

@@ -40 +40 @@
 #include <async.h>
 #include <loc.h>
-#include <io/console.h>
-
-typedef enum {
-        POS_UPDATE,
-        POS_PRESS,
-        POS_RELEASE
-} pos_event_type_t;
-
-typedef struct {
-        sysarg_t pos_id;
-        pos_event_type_t type;
-        sysarg_t btn_num;
-        sysarg_t hpos;
-        sysarg_t vpos;
-} pos_event_t;
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
 
 typedef struct {