Merge tag 'v2.6.0' into develop

[sdk/emulator/qemu.git] / include / ui / console.h

diff --git a/include/ui/console.h b/include/ui/console.h
index d5a88d9..11acfa0 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -1,7 +1,11 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
+#include "errno.h"
+
+#ifndef __cplusplus
 #include "ui/qemu-pixman.h"
+#endif
 #include "qom/object.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/notify.h"
@@ -64,6 +68,17 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
 
 void kbd_put_ledstate(int ledstate);
 
+#ifdef CONFIG_MARU
+QEMUPutKbdEntry *qemu_add_ps2kbd_event_handler(QEMUPutKBDEvent *func,
+                                               void *opaque);
+void qemu_remove_ps2kbd_event_handler(QEMUPutKbdEntry *entry);
+void ps2kbd_put_keycode(int keycode);
+void hwkey_put_keycode(int type, int keycode);
+void rotation_put_type(int type);
+void hostkbd_put_type(int type);
+void tizen_close_put_type(int type);
+#endif
+
 struct MouseTransformInfo {
     /* Touchscreen resolution */
     int x;
@@ -456,5 +471,4 @@ int index_from_key(const char *key, size_t key_length);
 /* gtk.c */
 void early_gtk_display_init(int opengl);
 void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover);
-
 #endif