Commit-ID: 9fbdd7c4fb0bd5c81d294f283317bc3156242ddc
Gitweb: http://git.kernel.org/tip/9fbdd7c4fb0bd5c81d294f283317bc3156242ddc
Author: Pekka Enberg <penberg@xxxxxxxxxx>
AuthorDate: Mon, 6 Jun 2011 22:47:05 +0300
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Tue, 7 Jun 2011 00:10:51 +0300
kvm tools: Kill libvnc dependency from hw/i8042.c
This patch kills the libvnc dependency from hw/i8042.c so we can use the same
hardware driver for SDL UI.
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: John Floren <john@xxxxxxxxxxx>
Cc: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/Makefile | 3 +-
tools/kvm/hw/i8042.c | 161 +----------------------------------------
tools/kvm/include/kvm/i8042.h | 17 +----
tools/kvm/ui/vnc.c | 156 +++++++++++++++++++++++++++++++++++++++
4 files changed, 163 insertions(+), 174 deletions(-)
diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 55949aa..6dca3c5 100644
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -52,7 +52,7 @@ OBJS += util/rbtree-interval.o
OBJS += util/strbuf.o
OBJS += virtio/9p.o
OBJS += hw/vesa.o
-
+OBJS += hw/i8042.o
FLAGS_BFD=$(CFLAGS) -lbfd
has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))
@@ -67,7 +67,6 @@ has_vncserver := $(call try-cc,$(SOURCE_VNCSERVER),$(FLAGS_VNCSERVER))
ifeq ($(has_vncserver),y)
OBJS += ui/vnc.o
CFLAGS += -DCONFIG_HAS_VNCSERVER
- OBJS += hw/i8042.o
LIBS += -lvncserver
endif
diff --git a/tools/kvm/hw/i8042.c b/tools/kvm/hw/i8042.c
index d64ccec..21a779e 100644
--- a/tools/kvm/hw/i8042.c
+++ b/tools/kvm/hw/i8042.c
@@ -6,8 +6,6 @@
#include "kvm/kvm.h"
#include "kvm/i8042.h"
-#include <rfb/keysym.h>
-#include <rfb/rfb.h>
#include <stdint.h>
/*
@@ -115,7 +113,7 @@ static void kbd_update_irq(void)
/*
* Add a byte to the mouse queue, then set IRQs
*/
-static void mouse_queue(u8 c)
+void mouse_queue(u8 c)
{
if (state.mcount >= QUEUE_SIZE)
return;
@@ -129,7 +127,7 @@ static void mouse_queue(u8 c)
/*
* Add a byte to the keyboard queue, then set IRQs
*/
-static void kbd_queue(u8 c)
+void kbd_queue(u8 c)
{
if (state.kcount >= QUEUE_SIZE)
return;
@@ -289,161 +287,6 @@ static void kbd_reset(void)
}
/*
- * We can map the letters and numbers without a fuss,
- * but the other characters not so much.
- */
-static char letters[26] = {
- 0x1c, 0x32, 0x21, 0x23, 0x24, /* a-e */
- 0x2b, 0x34, 0x33, 0x43, 0x3b, /* f-j */
- 0x42, 0x4b, 0x3a, 0x31, 0x44, /* k-o */
- 0x4d, 0x15, 0x2d, 0x1b, 0x2c, /* p-t */
- 0x3c, 0x2a, 0x1d, 0x22, 0x35, /* u-y */
- 0x1a,
-};
-
-static char num[10] = {
- 0x45, 0x16, 0x1e, 0x26, 0x2e, 0x23, 0x36, 0x3d, 0x3e, 0x46,
-};
-
-/*
- * This is called when the VNC server receives a key event
- * The reason this function is such a beast is that we have
- * to convert from ASCII characters (which is what VNC gets)
- * to PC keyboard scancodes, which is what Linux expects to
- * get from its keyboard. ASCII and the scancode set don't
- * really seem to mesh in any good way beyond some basics with
- * the letters and numbers.
- */
-void kbd_handle_key(rfbBool down, rfbKeySym key, rfbClientPtr cl)
-{
- char tosend = 0;
-
- if (key >= 0x41 && key <= 0x5a)
- key += 0x20; /* convert to lowercase */
-
- if (key >= 0x61 && key <= 0x7a) /* a-z */
- tosend = letters[key - 0x61];
-
- if (key >= 0x30 && key <= 0x39)
- tosend = num[key - 0x30];
-
- switch (key) {
- case XK_Insert: kbd_queue(0xe0); tosend = 0x70; break;
- case XK_Delete: kbd_queue(0xe0); tosend = 0x71; break;
- case XK_Up: kbd_queue(0xe0); tosend = 0x75; break;
- case XK_Down: kbd_queue(0xe0); tosend = 0x72; break;
- case XK_Left: kbd_queue(0xe0); tosend = 0x6b; break;
- case XK_Right: kbd_queue(0xe0); tosend = 0x74; break;
- case XK_Page_Up: kbd_queue(0xe0); tosend = 0x7d; break;
- case XK_Page_Down: kbd_queue(0xe0); tosend = 0x7a; break;
- case XK_Home: kbd_queue(0xe0); tosend = 0x6c; break;
- case XK_BackSpace: tosend = 0x66; break;
- case XK_Tab: tosend = 0x0d; break;
- case XK_Return: tosend = 0x5a; break;
- case XK_Escape: tosend = 0x76; break;
- case XK_End: tosend = 0x69; break;
- case XK_Shift_L: tosend = 0x12; break;
- case XK_Shift_R: tosend = 0x59; break;
- case XK_Control_R: kbd_queue(0xe0);
- case XK_Control_L: tosend = 0x14; break;
- case XK_Alt_R: kbd_queue(0xe0);
- case XK_Alt_L: tosend = 0x11; break;
- case XK_quoteleft: tosend = 0x0e; break;
- case XK_minus: tosend = 0x4e; break;
- case XK_equal: tosend = 0x55; break;
- case XK_bracketleft: tosend = 0x54; break;
- case XK_bracketright: tosend = 0x5b; break;
- case XK_backslash: tosend = 0x5d; break;
- case XK_Caps_Lock: tosend = 0x58; break;
- case XK_semicolon: tosend = 0x4c; break;
- case XK_quoteright: tosend = 0x52; break;
- case XK_comma: tosend = 0x41; break;
- case XK_period: tosend = 0x49; break;
- case XK_slash: tosend = 0x4a; break;
- case XK_space: tosend = 0x29; break;
-
- /*
- * This is where I handle the shifted characters.
- * They don't really map nicely the way A-Z maps to a-z,
- * so I'm doing it manually
- */
- case XK_exclam: tosend = 0x16; break;
- case XK_quotedbl: tosend = 0x52; break;
- case XK_numbersign: tosend = 0x26; break;
- case XK_dollar: tosend = 0x25; break;
- case XK_percent: tosend = 0x2e; break;
- case XK_ampersand: tosend = 0x3d; break;
- case XK_parenleft: tosend = 0x46; break;
- case XK_parenright: tosend = 0x45; break;
- case XK_asterisk: tosend = 0x3e; break;
- case XK_plus: tosend = 0x55; break;
- case XK_colon: tosend = 0x4c; break;
- case XK_less: tosend = 0x41; break;
- case XK_greater: tosend = 0x49; break;
- case XK_question: tosend = 0x4a; break;
- case XK_at: tosend = 0x1e; break;
- case XK_asciicircum: tosend = 0x36; break;
- case XK_underscore: tosend = 0x4e; break;
- case XK_braceleft: tosend = 0x54; break;
- case XK_braceright: tosend = 0x5b; break;
- case XK_bar: tosend = 0x5d; break;
- case XK_asciitilde: tosend = 0x0e; break;
- default: break;
- }
-
- /*
- * If this is a "key up" event (the user has released the key, we
- * need to send 0xf0 first.
- */
- if (!down && tosend != 0x0)
- kbd_queue(0xf0);
-
- if (tosend)
- kbd_queue(tosend);
-}
-
-/* The previous X and Y coordinates of the mouse */
-static int xlast, ylast = -1;
-
-/*
- * This function is called by the VNC server whenever a mouse event occurs.
- */
-void kbd_handle_ptr(int buttonMask, int x, int y, rfbClientPtr cl)
-{
- int dx, dy;
- char b1 = 0x8;
-
- /* The VNC mask and the PS/2 button encoding are the same */
- b1 |= buttonMask;
-
- if (xlast >= 0 && ylast >= 0) {
- /* The PS/2 mouse sends deltas, not absolutes */
- dx = x - xlast;
- dy = ylast - y;
-
- /* Set overflow bits if needed */
- if (dy > 255)
- b1 |= 0x80;
- if (dx > 255)
- b1 |= 0x40;
-
- /* Set negative bits if needed */
- if (dy < 0)
- b1 |= 0x20;
- if (dx < 0)
- b1 |= 0x10;
-
- mouse_queue(b1);
- mouse_queue(dx);
- mouse_queue(dy);
- }
-
- xlast = x;
- ylast = y;
- rfbDefaultPtrAddEvent(buttonMask, x, y, cl);
-}
-
-/*
* Called when the OS has written to one of the keyboard's ports (0x60 or 0x64)
*/
static bool kbd_in(struct ioport *ioport, struct kvm *kvm, u16 port, void *data, int size, u32 count)
diff --git a/tools/kvm/include/kvm/i8042.h b/tools/kvm/include/kvm/i8042.h
index 066a8cc..13f18e2 100644
--- a/tools/kvm/include/kvm/i8042.h
+++ b/tools/kvm/include/kvm/i8042.h
@@ -1,21 +1,12 @@
#ifndef KVM__PCKBD_H
#define KVM__PCKBD_H
+#include <linux/types.h>
+
struct kvm;
+void mouse_queue(u8 c);
+void kbd_queue(u8 c);
void kbd__init(struct kvm *kvm);
-#ifdef CONFIG_HAS_VNCSERVER
-#include <rfb/keysym.h>
-#include <rfb/rfb.h>
-
-void kbd_handle_key(rfbBool, rfbKeySym, rfbClientPtr);
-void kbd_handle_ptr(int, int, int, rfbClientPtr);
-
-#else
-
-void kbd__init(struct kvm *kvm) { }
-
-#endif
-
#endif
diff --git a/tools/kvm/ui/vnc.c b/tools/kvm/ui/vnc.c
index 086cf82..518e7f1 100644
--- a/tools/kvm/ui/vnc.c
+++ b/tools/kvm/ui/vnc.c
@@ -4,6 +4,7 @@
#include "kvm/i8042.h"
#include <linux/types.h>
+#include <rfb/keysym.h>
#include <rfb/rfb.h>
#include <pthread.h>
@@ -16,6 +17,161 @@
*/
#define VESA_UPDATE_TIME 6000
+/*
+ * We can map the letters and numbers without a fuss,
+ * but the other characters not so much.
+ */
+static char letters[26] = {
+ 0x1c, 0x32, 0x21, 0x23, 0x24, /* a-e */
+ 0x2b, 0x34, 0x33, 0x43, 0x3b, /* f-j */
+ 0x42, 0x4b, 0x3a, 0x31, 0x44, /* k-o */
+ 0x4d, 0x15, 0x2d, 0x1b, 0x2c, /* p-t */
+ 0x3c, 0x2a, 0x1d, 0x22, 0x35, /* u-y */
+ 0x1a,
+};
+
+static char num[10] = {
+ 0x45, 0x16, 0x1e, 0x26, 0x2e, 0x23, 0x36, 0x3d, 0x3e, 0x46,
+};
+
+/*
+ * This is called when the VNC server receives a key event
+ * The reason this function is such a beast is that we have
+ * to convert from ASCII characters (which is what VNC gets)
+ * to PC keyboard scancodes, which is what Linux expects to
+ * get from its keyboard. ASCII and the scancode set don't
+ * really seem to mesh in any good way beyond some basics with
+ * the letters and numbers.
+ */
+static void kbd_handle_key(rfbBool down, rfbKeySym key, rfbClientPtr cl)
+{
+ char tosend = 0;
+
+ if (key >= 0x41 && key <= 0x5a)
+ key += 0x20; /* convert to lowercase */
+
+ if (key >= 0x61 && key <= 0x7a) /* a-z */
+ tosend = letters[key - 0x61];
+
+ if (key >= 0x30 && key <= 0x39)
+ tosend = num[key - 0x30];
+
+ switch (key) {
+ case XK_Insert: kbd_queue(0xe0); tosend = 0x70; break;
+ case XK_Delete: kbd_queue(0xe0); tosend = 0x71; break;
+ case XK_Up: kbd_queue(0xe0); tosend = 0x75; break;
+ case XK_Down: kbd_queue(0xe0); tosend = 0x72; break;
+ case XK_Left: kbd_queue(0xe0); tosend = 0x6b; break;
+ case XK_Right: kbd_queue(0xe0); tosend = 0x74; break;
+ case XK_Page_Up: kbd_queue(0xe0); tosend = 0x7d; break;
+ case XK_Page_Down: kbd_queue(0xe0); tosend = 0x7a; break;
+ case XK_Home: kbd_queue(0xe0); tosend = 0x6c; break;
+ case XK_BackSpace: tosend = 0x66; break;
+ case XK_Tab: tosend = 0x0d; break;
+ case XK_Return: tosend = 0x5a; break;
+ case XK_Escape: tosend = 0x76; break;
+ case XK_End: tosend = 0x69; break;
+ case XK_Shift_L: tosend = 0x12; break;
+ case XK_Shift_R: tosend = 0x59; break;
+ case XK_Control_R: kbd_queue(0xe0);
+ case XK_Control_L: tosend = 0x14; break;
+ case XK_Alt_R: kbd_queue(0xe0);
+ case XK_Alt_L: tosend = 0x11; break;
+ case XK_quoteleft: tosend = 0x0e; break;
+ case XK_minus: tosend = 0x4e; break;
+ case XK_equal: tosend = 0x55; break;
+ case XK_bracketleft: tosend = 0x54; break;
+ case XK_bracketright: tosend = 0x5b; break;
+ case XK_backslash: tosend = 0x5d; break;
+ case XK_Caps_Lock: tosend = 0x58; break;
+ case XK_semicolon: tosend = 0x4c; break;
+ case XK_quoteright: tosend = 0x52; break;
+ case XK_comma: tosend = 0x41; break;
+ case XK_period: tosend = 0x49; break;
+ case XK_slash: tosend = 0x4a; break;
+ case XK_space: tosend = 0x29; break;
+
+ /*
+ * This is where I handle the shifted characters.
+ * They don't really map nicely the way A-Z maps to a-z,
+ * so I'm doing it manually
+ */
+ case XK_exclam: tosend = 0x16; break;
+ case XK_quotedbl: tosend = 0x52; break;
+ case XK_numbersign: tosend = 0x26; break;
+ case XK_dollar: tosend = 0x25; break;
+ case XK_percent: tosend = 0x2e; break;
+ case XK_ampersand: tosend = 0x3d; break;
+ case XK_parenleft: tosend = 0x46; break;
+ case XK_parenright: tosend = 0x45; break;
+ case XK_asterisk: tosend = 0x3e; break;
+ case XK_plus: tosend = 0x55; break;
+ case XK_colon: tosend = 0x4c; break;
+ case XK_less: tosend = 0x41; break;
+ case XK_greater: tosend = 0x49; break;
+ case XK_question: tosend = 0x4a; break;
+ case XK_at: tosend = 0x1e; break;
+ case XK_asciicircum: tosend = 0x36; break;
+ case XK_underscore: tosend = 0x4e; break;
+ case XK_braceleft: tosend = 0x54; break;
+ case XK_braceright: tosend = 0x5b; break;
+ case XK_bar: tosend = 0x5d; break;
+ case XK_asciitilde: tosend = 0x0e; break;
+ default: break;
+ }
+
+ /*
+ * If this is a "key up" event (the user has released the key, we
+ * need to send 0xf0 first.
+ */
+ if (!down && tosend != 0x0)
+ kbd_queue(0xf0);
+
+ if (tosend)
+ kbd_queue(tosend);
+}
+
+/* The previous X and Y coordinates of the mouse */
+static int xlast, ylast = -1;
+
+/*
+ * This function is called by the VNC server whenever a mouse event occurs.
+ */
+static void kbd_handle_ptr(int buttonMask, int x, int y, rfbClientPtr cl)
+{
+ int dx, dy;
+ char b1 = 0x8;
+
+ /* The VNC mask and the PS/2 button encoding are the same */
+ b1 |= buttonMask;
+
+ if (xlast >= 0 && ylast >= 0) {
+ /* The PS/2 mouse sends deltas, not absolutes */
+ dx = x - xlast;
+ dy = ylast - y;
+
+ /* Set overflow bits if needed */
+ if (dy > 255)
+ b1 |= 0x80;
+ if (dx > 255)
+ b1 |= 0x40;
+
+ /* Set negative bits if needed */
+ if (dy < 0)
+ b1 |= 0x20;
+ if (dx < 0)
+ b1 |= 0x10;
+
+ mouse_queue(b1);
+ mouse_queue(dx);
+ mouse_queue(dy);
+ }
+
+ xlast = x;
+ ylast = y;
+ rfbDefaultPtrAddEvent(buttonMask, x, y, cl);
+}
+
static void vnc__write(struct framebuffer *fb, u64 addr, u8 *data, u32 len)
{
memcpy(&fb->mem[addr - fb->mem_addr], data, len);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|