From patchwork Thu Mar 24 01:21:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 601424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qVpZ34G3Pz9sB6 for ; Thu, 24 Mar 2016 12:22:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TbrIfdf3; dkim-atps=neutral Received: from localhost ([::1]:46941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aityL-00076U-NI for incoming@patchwork.ozlabs.org; Wed, 23 Mar 2016 21:22:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aity5-0006pq-Oe for qemu-devel@nongnu.org; Wed, 23 Mar 2016 21:21:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aity0-0003Od-Km for qemu-devel@nongnu.org; Wed, 23 Mar 2016 21:21:45 -0400 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]:35816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aity0-0003OC-G0 for qemu-devel@nongnu.org; Wed, 23 Mar 2016 21:21:40 -0400 Received: by mail-io0-x241.google.com with SMTP id 124so7820957iov.2 for ; Wed, 23 Mar 2016 18:21:40 -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:to :mime-version; bh=oPLk+26CYinDSfWExBRn9j22kpSMj7LAovZNGCq076A=; b=TbrIfdf3kTBw8uaH5yc2Y2fsNH3IgsM1eNOZisjxLlSbEfaPlpzB5p2Y19VelYEFWP Ye4rxSJEufF/qsb0m3mCL4pUzkprTAlLkyTMU20LuOKZFdINIH6zYwauikWo5u9KmL8a y7O+AAgMsBmUWJmCsr8PA3M3xvOoIgO5mvXtokyJaQAizsJ95ocE574lTIwdbh6VEPOv L1/pA1kyugAdQwN7i84TUR4e4QdGFHrZePykw7pOqj6JfXTF7u8U9PQMwJ/60DRNw85O PT6G457jEBKFBpQ6Ug4xTYguNt0VDzeqRFf+f5F5ssgELfm/5mcJTCMl6tWTIWkkHnnQ 1TIQ== 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:to:mime-version; bh=oPLk+26CYinDSfWExBRn9j22kpSMj7LAovZNGCq076A=; b=cT6QXnP4JQQ/oqIl+ks5MbWP4e4ceBVn6nLOL1VlkDPFrEf7dq0UsSM1/M4JTXW0Bb FdX0pKlzNLHNyQQimCYc3gl+5K4rXHvkVcHEqvfPrAhNFrDpRQBe751D6q5Is+MblmWg ulm1CHLO+o5s1yE2lX9arD7e3HRMjmNNRoS/TYbgu1j1KR0Qrms12WVasW7I9E8Ck+tB J82367vARqIfVNDxKnKg/mGo7eL1Pg3XOXgTEHKJ5CK1o+Fea8Kw2TKjgVghRbbqhtdE QMLo3xP2dDRZGbjquo0BjEhpQMUGjZxHkkQ7zqtSFEffNO10h2zlDJ0w+BuFrroxPKfj 3CNA== X-Gm-Message-State: AD7BkJLKPJzsL+yEZnyeFSStdoqLQoI/Y3B1WNEjXsh+fM5kOj8h8TBKz3YBFi2w8E+6WA== X-Received: by 10.107.40.11 with SMTP id o11mr6017584ioo.183.1458782500114; Wed, 23 Mar 2016 18:21:40 -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 z200sm2237652iod.26.2016.03.23.18.21.39 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 18:21:39 -0700 (PDT) From: Programmingkid Date: Wed, 23 Mar 2016 21:21:37 -0400 Message-Id: <3C4793C7-2453-4575-8123-E31D694B1BB4@gmail.com> To: Peter Maydell , Gerd Hoffmann , qemu-devel qemu-devel 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:c06::241 Subject: [Qemu-devel] [PATCH 4/4] adb.c: add power key support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add support for the power key. It has to be handled differently from the other keys because it is the only 16-bit value key. Signed-off-by: John Arbuckle --- hw/input/adb.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index 8413db9..fab241b 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -358,10 +358,17 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) s->rptr = 0; } s->count--; - obuf[0] = keycode; - /* NOTE: could put a second keycode if needed */ - obuf[1] = 0xff; - olen = 2; + /* The power key is the only two byte value key, so it is a special case. */ + if (keycode == 0x7f) { + obuf[0] = 0x7f; + obuf[1] = 0x7f; + olen = 2; + } else { + obuf[0] = keycode; + /* NOTE: could put a second keycode if needed */ + obuf[1] = 0xff; + olen = 2; + } return olen; } @@ -440,11 +447,22 @@ static void adb_keyboard_event(DeviceState *dev, QemuConsole *src, } keycode = qcode_to_adb_keycode[qcode]; - if (evt->u.key.data->down == false) { /* if key release event */ - keycode = keycode | 0x80; /* create keyboard break code */ + /* The power button is a special case because it is a 16-bit value */ + if (qcode == Q_KEY_CODE_POWER) { + if (evt->u.key.data->down == true) { /* Power button pushed keycode */ + adb_kbd_put_keycode(s, 0x7f); + } else { /* Power button released keycode */ + adb_kbd_put_keycode(s, 0xff); + } } - adb_kbd_put_keycode(s, keycode); + /* For all non-power keys - safe for 8-bit keycodes */ + else { + if (evt->u.key.data->down == false) { /* if key release event */ + keycode = keycode | 0x80; /* create keyboard break code */ + } + adb_kbd_put_keycode(s, keycode); + } } static const VMStateDescription vmstate_adb_kbd = {