From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzMdg-0008Tr-2e for qemu-devel@nongnu.org; Wed, 26 Oct 2016 07:45:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzMdd-0005QR-8V for qemu-devel@nongnu.org; Wed, 26 Oct 2016 07:45:00 -0400 From: David Gibson Date: Wed, 26 Oct 2016 22:42:53 +1100 Message-Id: <1477482173-8761-50-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1477482173-8761-1-git-send-email-david@gibson.dropbear.id.au> References: <1477482173-8761-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 49/49] adb: change handler only when recognized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: agraf@suse.de, clg@kaod.org, thuth@redhat.com, lvivier@redhat.com, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson From: Herv=C3=A9 Poussineau ADB devices must take new handler into account only when they recognize i= t. This lets operating systems probe for valid/invalid handles, to know devi= ce capabilities. Add a FIXME in keyboard handler, which should use a different translation table depending of the selected handler. Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: David Gibson --- hw/input/adb.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index 3d39368..43d3205 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -396,9 +396,15 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *ob= uf, d->devaddr =3D buf[1] & 0xf; break; default: - /* XXX: check this */ d->devaddr =3D buf[1] & 0xf; - d->handler =3D buf[2]; + /* we support handlers: + * 1: Apple Standard Keyboard + * 2: Apple Extended Keyboard (LShift =3D RShift) + * 3: Apple Extended Keyboard (LShift !=3D RShift) + */ + if (buf[2] =3D=3D 1 || buf[2] =3D=3D 2 || buf[2] =3D=3D = 3) { + d->handler =3D buf[2]; + } break; } } @@ -437,6 +443,7 @@ static void adb_keyboard_event(DeviceState *dev, Qemu= Console *src, if (qcode >=3D ARRAY_SIZE(qcode_to_adb_keycode)) { return; } + /* FIXME: take handler into account when translating qcode */ keycode =3D qcode_to_adb_keycode[qcode]; if (keycode =3D=3D NO_KEY) { /* We don't want to send this to the g= uest */ ADB_DPRINTF("Ignoring NO_KEY\n"); @@ -631,8 +638,21 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *= obuf, d->devaddr =3D buf[1] & 0xf; break; default: - /* XXX: check this */ d->devaddr =3D buf[1] & 0xf; + /* we support handlers: + * 0x01: Classic Apple Mouse Protocol / 100 cpi operatio= ns + * 0x02: Classic Apple Mouse Protocol / 200 cpi operatio= ns + * we don't support handlers (at least): + * 0x03: Mouse systems A3 trackball + * 0x04: Extended Apple Mouse Protocol + * 0x2f: Microspeed mouse + * 0x42: Macally + * 0x5f: Microspeed mouse + * 0x66: Microspeed mouse + */ + if (buf[2] =3D=3D 1 || buf[2] =3D=3D 2) { + d->handler =3D buf[2]; + } break; } } --=20 2.7.4