From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aejlM-0005iV-B8 for qemu-devel@nongnu.org; Sat, 12 Mar 2016 08:39:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aejlJ-0002ya-4v for qemu-devel@nongnu.org; Sat, 12 Mar 2016 08:39:24 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 12 Mar 2016 14:38:57 +0100 Message-Id: <1457789937-30923-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] adb: change handler only when recognized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, programmingkidx@gmail.com 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 --- This conflicts with some in-list patches, but may explain why translation= tables are not correct, or don't work in all situations. I have another patch to add 3-button mouse support, but I'll wait for 2.7= merge window. 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 f0ad0d4..82bfb05 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -237,6 +237,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) if (keycode =3D=3D 0xe0) { ext_keycode =3D 1; } else { + /* FIXME: take handler into account when translating keycode= */ if (ext_keycode) adb_keycode =3D pc_to_adb_keycode[keycode | 0x80]; else @@ -283,9 +284,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; } } @@ -492,8 +499,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.1.4