From patchwork Fri May 20 22:43:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 624686 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rBPRr1R0gz9t5c for ; Sat, 21 May 2016 09:35:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=lykfsxzb; dkim-atps=neutral Received: from localhost ([::1]:38012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3twc-0004S7-4L for incoming@patchwork.ozlabs.org; Fri, 20 May 2016 19:35:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8X-0004gX-Tm for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3t8P-0005cc-Kl for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:16 -0400 Received: from mail-ig0-x241.google.com ([2607:f8b0:4001:c05::241]:36678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8P-0005cP-Ev for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:09 -0400 Received: by mail-ig0-x241.google.com with SMTP id c3so182670igl.3 for ; Fri, 20 May 2016 15:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-transfer-encoding:subject:date:message-id:cc:to :mime-version; bh=9/3zsTrp3/Sf6L5M+VNTH7jiVai00XxYqBdnenoQXW0=; b=lykfsxzb4a6GcePAwzA660ovDodvMldEvmHQ5onD3ZVM0gO7cAn1K1CqjJJOk8FH6k PAGoDyv+sSokdwXnNY0FSSpBqQ+pWmXWXRdOOzYTrwxdLaPcH76Kkvv9WNNWu0S/+S4C Im3psaIur5RpSMnFFcswtdJP3eqfPJSUHgInWOzBRnYr5r/2sDh5fMCYK0omGoD5Jl8b zfpQ21UaYLNfeb29xIQIkk4PTyOT6a6jBTK+b21KdZky/eTk7IHJervcaO3jPR4CRJXA 8X/OXV/9SbbadwtVXre8H9cX+UIpHtz7eg0y+Nw6UbpipnwAimyGhXCNX8xq5sgA94fU W+1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:content-transfer-encoding:subject:date :message-id:cc:to:mime-version; bh=9/3zsTrp3/Sf6L5M+VNTH7jiVai00XxYqBdnenoQXW0=; b=S48b52bd8w63MHZ8kV1M25kIWQp5HSI6UiuUskpPy1DV9BIuLFjVl+ys4dKyTMxWKk UYTuzpGWTGMal8qsWhEur2m8s2uZ43XWwt7rOOmWztMBWXea5cTCoL2weY7vi+t9GMLY M0xc/yIxe/PrLcAp18edHczNPatj8PL+wR4GJ8ip11WJbieH2352fkPZXXetOPO7bpN8 qs+F9aslVK+NH95gomdlnRWFjk3LHWXW7Q4Gn7zC1Tm/iKds0rS76JgYdszaI1gD/1iU kzJhhxYyHNpwIn4MMmqO6R7JSG3KqsCNp/MaaJS0d792TjnEs6+wTqOVwJzeYCwmriiV Q98g== X-Gm-Message-State: AOPr4FVfn1bVTDmEMb900PscIsaLer77ZVoLqBQStyicdCb2piMWcRDSMcBEvwb+pWz5ug== X-Received: by 10.50.103.196 with SMTP id fy4mr4956801igb.62.1463784188964; Fri, 20 May 2016 15:43:08 -0700 (PDT) Received: from [192.168.0.5] (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by smtp.gmail.com with ESMTPSA id 11sm6456271ioe.25.2016.05.20.15.43.07 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 15:43:08 -0700 (PDT) From: Programmingkid Date: Fri, 20 May 2016 18:43:07 -0400 Message-Id: To: Peter Maydell Mime-Version: 1.0 (Apple Message framework v1084) X-Mailer: Apple Mail (2.1084) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c05::241 Subject: [Qemu-devel] [PATCH v4 4/5] adb.c: prevent NO_KEY value from going to guest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel qemu-devel Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The NO_KEY value should not be sent to the guest. This patch drops that value. Signed-off-by: John Arbuckle --- v4 changes: Added NO_KEY related code to this patch. Added removal of "= 0" code near end of qcode_to_adb_keycode. hw/input/adb.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index 5ca7b4a..2042903 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -62,6 +62,9 @@ do { printf("ADB: " fmt , ## __VA_ARGS__); } while (0) /* error codes */ #define ADB_RET_NOTPRESENT (-2) +/* The adb keyboard doesn't have every key imaginable */ +#define NO_KEY 0xff + static void adb_device_reset(ADBDevice *d) { qdev_reset_all(DEVICE(d)); @@ -191,6 +194,8 @@ typedef struct ADBKeyboardClass { } ADBKeyboardClass; int qcode_to_adb_keycode[] = { + /* Make sure future additions are automatically set to NO_KEY */ + [0 ... 0xff] = NO_KEY, [Q_KEY_CODE_SHIFT] = ADB_KEY_LEFT_SHIFT, [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT, @@ -305,20 +310,6 @@ int qcode_to_adb_keycode[] = { [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, }; static void adb_kbd_put_keycode(void *opaque, int keycode) @@ -430,7 +421,9 @@ static void adb_keyboard_event(DeviceState *dev, QemuConsole *src, return; } keycode = qcode_to_adb_keycode[qcode]; - + if (keycode == NO_KEY) { /* We don't want to send this to the guest */ + return; + } if (evt->u.key.data->down == false) { /* if key release event */ keycode = keycode | 0x80; /* create keyboard break code */ }