From: David Gibson <david@gibson.dropbear.id.au>
To: John Arbuckle <programmingkidx@gmail.com>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v5 2/4] adb.c: add support for QKeyCode
Date: Thu, 15 Sep 2016 10:00:29 +1000 [thread overview]
Message-ID: <20160915000029.GX15077@voom.fritz.box> (raw)
In-Reply-To: <1471487270-1490-3-git-send-email-programmingkidx@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 12775 bytes --]
On Wed, Aug 17, 2016 at 10:27:48PM -0400, John Arbuckle wrote:
> The old pc scancode translation is replaced with QEMU's QKeyCode. This is just
> a mechanical substitution, which a number of broken mappings left in.
>
> Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
> ---
> *v5 changes
> Merged Power key patch with patch 2/4.
> Moved qemu_input_handler_register() function call to adb_kbd_realizefn()
> function.
>
> *v4 changes
> Replaced ADB_KEY_LEFT_COMMAND with ADB_KEY_COMMAND.
> Removed ADB_KEY_RIGHT_COMMAND comment.
>
> *v3 changes
> Kept original pc_to_adb_keycode mapping.
>
> *v2 changes
> Changed order of this patch.
>
> hw/input/adb.c | 234 ++++++++++++++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 189 insertions(+), 45 deletions(-)
>
> diff --git a/hw/input/adb.c b/hw/input/adb.c
> index f0ad0d4..18c220b 100644
> --- a/hw/input/adb.c
> +++ b/hw/input/adb.c
> @@ -25,6 +25,9 @@
> #include "hw/hw.h"
> #include "hw/input/adb.h"
> #include "ui/console.h"
> +#include "include/hw/input/adb-keys.h"
> +#include "ui/input.h"
> +#include "sysemu/sysemu.h"
>
> /* debug ADB */
> //#define DEBUG_ADB
> @@ -187,23 +190,136 @@ typedef struct ADBKeyboardClass {
> DeviceRealize parent_realize;
> } ADBKeyboardClass;
>
> -static const uint8_t pc_to_adb_keycode[256] = {
> - 0, 53, 18, 19, 20, 21, 23, 22, 26, 28, 25, 29, 27, 24, 51, 48,
> - 12, 13, 14, 15, 17, 16, 32, 34, 31, 35, 33, 30, 36, 54, 0, 1,
> - 2, 3, 5, 4, 38, 40, 37, 41, 39, 50, 56, 42, 6, 7, 8, 9,
> - 11, 45, 46, 43, 47, 44,123, 67, 58, 49, 57,122,120, 99,118, 96,
> - 97, 98,100,101,109, 71,107, 89, 91, 92, 78, 86, 87, 88, 69, 83,
> - 84, 85, 82, 65, 0, 0, 10,103,111, 0, 0,110, 81, 0, 0, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 0, 0, 0, 94, 0, 93, 0, 0, 0, 0, 0, 0,104,102, 0, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76,125, 0, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,105, 0, 0, 0, 0, 0,
> - 0, 0, 0, 0, 0, 75, 0, 0,124, 0, 0, 0, 0, 0, 0, 0,
> - 0, 0, 0, 0, 0, 0, 0,115, 62,116, 0, 59, 0, 60, 0,119,
> - 61,121,114,117, 0, 0, 0, 0, 0, 0, 0, 55,126, 0,127, 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 0, 0, 0, 0, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> +int qcode_to_adb_keycode[] = {
> +
> + [Q_KEY_CODE_SHIFT] = ADB_KEY_LEFT_SHIFT,
> + [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT,
> + [Q_KEY_CODE_ALT] = ADB_KEY_LEFT_OPTION,
> + [Q_KEY_CODE_ALT_R] = ADB_KEY_RIGHT_OPTION,
> + [Q_KEY_CODE_ALTGR] = 0,
> + [Q_KEY_CODE_CTRL] = ADB_KEY_LEFT_CONTROL,
> + [Q_KEY_CODE_CTRL_R] = ADB_KEY_RIGHT_CONTROL,
> + [Q_KEY_CODE_META_L] = ADB_KEY_COMMAND,
> + [Q_KEY_CODE_META_R] = ADB_KEY_COMMAND,
> + [Q_KEY_CODE_SPC] = ADB_KEY_SPACEBAR,
> +
> + [Q_KEY_CODE_ESC] = ADB_KEY_ESC,
> + [Q_KEY_CODE_1] = ADB_KEY_1,
> + [Q_KEY_CODE_2] = ADB_KEY_2,
> + [Q_KEY_CODE_3] = ADB_KEY_3,
> + [Q_KEY_CODE_4] = ADB_KEY_4,
> + [Q_KEY_CODE_5] = ADB_KEY_5,
> + [Q_KEY_CODE_6] = ADB_KEY_6,
> + [Q_KEY_CODE_7] = ADB_KEY_7,
> + [Q_KEY_CODE_8] = ADB_KEY_8,
> + [Q_KEY_CODE_9] = ADB_KEY_9,
> + [Q_KEY_CODE_0] = ADB_KEY_0,
> + [Q_KEY_CODE_MINUS] = ADB_KEY_MINUS,
> + [Q_KEY_CODE_EQUAL] = ADB_KEY_EQUAL,
> + [Q_KEY_CODE_BACKSPACE] = ADB_KEY_DELETE,
> + [Q_KEY_CODE_TAB] = ADB_KEY_TAB,
> + [Q_KEY_CODE_Q] = ADB_KEY_Q,
> + [Q_KEY_CODE_W] = ADB_KEY_W,
> + [Q_KEY_CODE_E] = ADB_KEY_E,
> + [Q_KEY_CODE_R] = ADB_KEY_R,
> + [Q_KEY_CODE_T] = ADB_KEY_T,
> + [Q_KEY_CODE_Y] = ADB_KEY_Y,
> + [Q_KEY_CODE_U] = ADB_KEY_U,
> + [Q_KEY_CODE_I] = ADB_KEY_I,
> + [Q_KEY_CODE_O] = ADB_KEY_O,
> + [Q_KEY_CODE_P] = ADB_KEY_P,
> + [Q_KEY_CODE_BRACKET_LEFT] = ADB_KEY_LEFT_BRACKET,
> + [Q_KEY_CODE_BRACKET_RIGHT] = ADB_KEY_RIGHT_BRACKET,
> + [Q_KEY_CODE_RET] = ADB_KEY_RETURN,
> + [Q_KEY_CODE_A] = ADB_KEY_A,
> + [Q_KEY_CODE_S] = ADB_KEY_S,
> + [Q_KEY_CODE_D] = ADB_KEY_D,
> + [Q_KEY_CODE_F] = ADB_KEY_F,
> + [Q_KEY_CODE_G] = ADB_KEY_G,
> + [Q_KEY_CODE_H] = ADB_KEY_H,
> + [Q_KEY_CODE_J] = ADB_KEY_J,
> + [Q_KEY_CODE_K] = ADB_KEY_K,
> + [Q_KEY_CODE_L] = ADB_KEY_L,
> + [Q_KEY_CODE_SEMICOLON] = ADB_KEY_SEMICOLON,
> + [Q_KEY_CODE_APOSTROPHE] = ADB_KEY_APOSTROPHE,
> + [Q_KEY_CODE_GRAVE_ACCENT] = ADB_KEY_GRAVE_ACCENT,
> + [Q_KEY_CODE_BACKSLASH] = ADB_KEY_BACKSLASH,
> + [Q_KEY_CODE_Z] = ADB_KEY_Z,
> + [Q_KEY_CODE_X] = ADB_KEY_X,
> + [Q_KEY_CODE_C] = ADB_KEY_C,
> + [Q_KEY_CODE_V] = ADB_KEY_V,
> + [Q_KEY_CODE_B] = ADB_KEY_B,
> + [Q_KEY_CODE_N] = ADB_KEY_N,
> + [Q_KEY_CODE_M] = ADB_KEY_M,
> + [Q_KEY_CODE_COMMA] = ADB_KEY_COMMA,
> + [Q_KEY_CODE_DOT] = ADB_KEY_PERIOD,
> + [Q_KEY_CODE_SLASH] = ADB_KEY_FORWARD_SLASH,
> + [Q_KEY_CODE_ASTERISK] = ADB_KEY_KP_MULTIPLY,
> + [Q_KEY_CODE_CAPS_LOCK] = ADB_KEY_CAPS_LOCK,
> +
> + [Q_KEY_CODE_F1] = ADB_KEY_F1,
> + [Q_KEY_CODE_F2] = ADB_KEY_F2,
> + [Q_KEY_CODE_F3] = ADB_KEY_F3,
> + [Q_KEY_CODE_F4] = ADB_KEY_F4,
> + [Q_KEY_CODE_F5] = ADB_KEY_F5,
> + [Q_KEY_CODE_F6] = ADB_KEY_F6,
> + [Q_KEY_CODE_F7] = ADB_KEY_F7,
> + [Q_KEY_CODE_F8] = ADB_KEY_F8,
> + [Q_KEY_CODE_F9] = ADB_KEY_F9,
> + [Q_KEY_CODE_F10] = ADB_KEY_F10,
> + [Q_KEY_CODE_F11] = ADB_KEY_F11,
> + [Q_KEY_CODE_F12] = ADB_KEY_F12,
> + [Q_KEY_CODE_PRINT] = 0,
> + [Q_KEY_CODE_SYSRQ] = 0,
> + [Q_KEY_CODE_SCROLL_LOCK] = ADB_KEY_F14,
> + [Q_KEY_CODE_PAUSE] = 0,
> +
> + [Q_KEY_CODE_NUM_LOCK] = ADB_KEY_KP_CLEAR,
> + [Q_KEY_CODE_KP_EQUALS] = 0,
> + [Q_KEY_CODE_KP_DIVIDE] = ADB_KEY_KP_DIVIDE,
> + [Q_KEY_CODE_KP_MULTIPLY] = ADB_KEY_KP_MULTIPLY,
> + [Q_KEY_CODE_KP_SUBTRACT] = ADB_KEY_KP_SUBTRACT,
> + [Q_KEY_CODE_KP_ADD] = ADB_KEY_KP_PLUS,
> + [Q_KEY_CODE_KP_ENTER] = ADB_KEY_KP_ENTER,
> + [Q_KEY_CODE_KP_DECIMAL] = ADB_KEY_KP_PERIOD,
> + [Q_KEY_CODE_KP_0] = ADB_KEY_KP_0,
> + [Q_KEY_CODE_KP_1] = ADB_KEY_KP_1,
> + [Q_KEY_CODE_KP_2] = ADB_KEY_KP_2,
> + [Q_KEY_CODE_KP_3] = ADB_KEY_KP_3,
> + [Q_KEY_CODE_KP_4] = ADB_KEY_KP_4,
> + [Q_KEY_CODE_KP_5] = ADB_KEY_KP_5,
> + [Q_KEY_CODE_KP_6] = ADB_KEY_KP_6,
> + [Q_KEY_CODE_KP_7] = ADB_KEY_KP_7,
> + [Q_KEY_CODE_KP_8] = ADB_KEY_KP_8,
> + [Q_KEY_CODE_KP_9] = ADB_KEY_KP_9,
> +
> + [Q_KEY_CODE_UP] = ADB_KEY_UP,
> + [Q_KEY_CODE_DOWN] = ADB_KEY_DOWN,
> + [Q_KEY_CODE_LEFT] = ADB_KEY_LEFT,
> + [Q_KEY_CODE_RIGHT] = ADB_KEY_RIGHT,
> +
> + [Q_KEY_CODE_HELP] = 0,
> + [Q_KEY_CODE_INSERT] = ADB_KEY_HELP,
> + [Q_KEY_CODE_DELETE] = ADB_KEY_FORWARD_DELETE,
> + [Q_KEY_CODE_HOME] = ADB_KEY_HOME,
> + [Q_KEY_CODE_END] = ADB_KEY_END,
> + [Q_KEY_CODE_PGUP] = ADB_KEY_PAGE_UP,
> + [Q_KEY_CODE_PGDN] = ADB_KEY_PAGE_DOWN,
> +
> + [Q_KEY_CODE_LESS] = 0xa,
> + [Q_KEY_CODE_STOP] = 0,
> + [Q_KEY_CODE_AGAIN] = 0,
> + [Q_KEY_CODE_PROPS] = 0,
> + [Q_KEY_CODE_UNDO] = 0,
> + [Q_KEY_CODE_FRONT] = 0,
> + [Q_KEY_CODE_COPY] = 0,
> + [Q_KEY_CODE_OPEN] = 0,
> + [Q_KEY_CODE_PASTE] = 0,
> + [Q_KEY_CODE_FIND] = 0,
> + [Q_KEY_CODE_CUT] = 0,
> + [Q_KEY_CODE_LF] = 0,
> + [Q_KEY_CODE_COMPOSE] = 0,
> + [Q_KEY_CODE_POWER] = ADB_KEY_POWER
> };
>
> static void adb_kbd_put_keycode(void *opaque, int keycode)
> @@ -220,35 +336,40 @@ static void adb_kbd_put_keycode(void *opaque, int keycode)
>
> static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)
> {
> - static int ext_keycode;
> KBDState *s = ADB_KEYBOARD(d);
> - int adb_keycode, keycode;
> + int keycode;
> int olen;
>
> olen = 0;
> - for(;;) {
> - if (s->count == 0)
> - break;
> - keycode = s->data[s->rptr];
> - if (++s->rptr == sizeof(s->data))
> - s->rptr = 0;
> - s->count--;
> -
> - if (keycode == 0xe0) {
> - ext_keycode = 1;
> - } else {
> - if (ext_keycode)
> - adb_keycode = pc_to_adb_keycode[keycode | 0x80];
> - else
> - adb_keycode = pc_to_adb_keycode[keycode & 0x7f];
> - obuf[0] = adb_keycode | (keycode & 0x80);
> - /* NOTE: could put a second keycode if needed */
> - obuf[1] = 0xff;
> - olen = 2;
> - ext_keycode = 0;
> - break;
> - }
> + if (s->count == 0) {
> + return 0;
> + }
> + keycode = s->data[s->rptr];
> + s->rptr++;
> + if (s->rptr == sizeof(s->data)) {
> + s->rptr = 0;
> }
> + s->count--;
> + /*
> + * The power key is the only two byte value key, so it is a special case.
> + * Since 0x7f is not a used keycode for ADB we overload it to indicate the
> + * power button when we're storing keycodes in our internal buffer, and
> + * expand it out to two bytes when we send to the guest.
> + */
> + if (keycode == 0x7f) {
> + obuf[0] = 0x7f;
> + obuf[1] = 0x7f;
> + olen = 2;
> + } else {
> + obuf[0] = keycode;
> + /* NOTE: the power key key-up is the two byte sequence 0xff 0xff;
> + * otherwise we could in theory send a second keycode in the second
> + * byte, but choose not to bother.
> + */
> + obuf[1] = 0xff;
> + olen = 2;
> + }
> +
> return olen;
> }
>
> @@ -313,6 +434,26 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
> return olen;
> }
>
> +/* This is where keyboard events enter this file */
> +static void adb_keyboard_event(DeviceState *dev, QemuConsole *src,
> + InputEvent *evt)
> +{
> + KBDState *s = (KBDState *)dev;
> + int qcode, keycode;
> +
> + qcode = qemu_input_key_value_to_qcode(evt->u.key.data->key);
> + if (qcode >= ARRAY_SIZE(qcode_to_adb_keycode)) {
> + return;
> + }
> + keycode = qcode_to_adb_keycode[qcode];
> +
> + if (evt->u.key.data->down == false) { /* if key release event */
> + keycode = keycode | 0x80; /* create keyboard break code */
> + }
> +
> + adb_kbd_put_keycode(s, keycode);
Relying on adb_kbd_put_keycode() to truncate 0x7f7f to 0x7f is a bit
subtle. The truncation of 0x7f7f | 0x80 == 0x7fff to 0xff is even
more so.
But otherwise these patches look good, and I'll apply to ppc-for-2.8.
> +}
> +
> static const VMStateDescription vmstate_adb_kbd = {
> .name = "adb_kbd",
> .version_id = 2,
> @@ -340,14 +481,17 @@ static void adb_kbd_reset(DeviceState *dev)
> s->count = 0;
> }
>
> +static QemuInputHandler adb_keyboard_handler = {
> + .name = "QEMU ADB Keyboard",
> + .mask = INPUT_EVENT_MASK_KEY,
> + .event = adb_keyboard_event,
> +};
> +
> static void adb_kbd_realizefn(DeviceState *dev, Error **errp)
> {
> - ADBDevice *d = ADB_DEVICE(dev);
> ADBKeyboardClass *akc = ADB_KEYBOARD_GET_CLASS(dev);
> -
> akc->parent_realize(dev, errp);
> -
> - qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);
> + qemu_input_handler_register(dev, &adb_keyboard_handler);
> }
>
> static void adb_kbd_initfn(Object *obj)
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
next prev parent reply other threads:[~2016-09-15 0:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 2:27 [Qemu-devel] [PATCH v5 0/4] ADB improvements John Arbuckle
2016-08-18 2:27 ` [Qemu-devel] [PATCH v5 1/4] adb-keys.h: initial commit John Arbuckle
2016-08-18 2:27 ` [Qemu-devel] [PATCH v5 2/4] adb.c: add support for QKeyCode John Arbuckle
2016-08-18 11:04 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2016-09-15 0:00 ` David Gibson [this message]
2016-08-18 2:27 ` [Qemu-devel] [PATCH v5 3/4] adb.c: correct several key assignments John Arbuckle
2016-08-18 2:27 ` [Qemu-devel] [PATCH v5 4/4] adb.c: prevent NO_KEY value from going to guest John Arbuckle
2016-08-18 11:06 ` [Qemu-devel] [Qemu-ppc] " BALATON Zoltan
2016-08-20 1:29 ` Programmingkid
2016-08-20 17:18 ` BALATON Zoltan
2016-08-18 2:37 ` [Qemu-devel] [PATCH v5 0/4] ADB improvements no-reply
2016-08-23 12:19 ` David Gibson
2016-08-23 19:21 ` Programmingkid
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160915000029.GX15077@voom.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=programmingkidx@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.