From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JbHG9-00082q-MK for qemu-devel@nongnu.org; Mon, 17 Mar 2008 11:28:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JbHG8-00081y-5Y for qemu-devel@nongnu.org; Mon, 17 Mar 2008 11:28:20 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JbHG7-00081d-Vg for qemu-devel@nongnu.org; Mon, 17 Mar 2008 11:28:20 -0400 Received: from smtp7-g19.free.fr ([212.27.42.64]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JbHG7-0005oe-Hn for qemu-devel@nongnu.org; Mon, 17 Mar 2008 11:28:19 -0400 Received: from smtp7-g19.free.fr (localhost [127.0.0.1]) by smtp7-g19.free.fr (Postfix) with ESMTP id C674D3228B1 for ; Mon, 17 Mar 2008 16:28:17 +0100 (CET) Received: from [127.0.0.1] (rob92-4-82-225-201-66.fbx.proxad.net [82.225.201.66]) by smtp7-g19.free.fr (Postfix) with ESMTP id 906643228A2 for ; Mon, 17 Mar 2008 16:28:17 +0100 (CET) Message-ID: <47DE8E11.8030808@reactos.org> Date: Mon, 17 Mar 2008 16:28:17 +0100 From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080403010909060808070102" Subject: [Qemu-devel] [PATCH] Add KBD_CMD_SCANCODE command v2 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------080403010909060808070102 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Hi, PS/2 controller emulation lacks the KBD_CMD_SCANCODE command, which=20 gets/sets the scancode set (1, 2 or 3). Scancode sets 1 and 3 are still not supported. Changelog v1 to v2 - Fix typo (AT scancode set is 2, not 3) - Use ps2_put_keycode() instead of ps2_queue(), to work even in=20 non-translated mode (in KBD_CMD_GET_ID and KBD_CMD_SCANCODE) - Fix keyboard reset, which should also reset scancode set Thanks Aurelien for your comments. Herv=E9 --------------080403010909060808070102 Content-Type: text/plain; name="ps2_v2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ps2_v2.patch" Index: ps2.c =================================================================== RCS file: /sources/qemu/qemu/hw/ps2.c,v retrieving revision 1.10 diff -u -r1.10 ps2.c --- ps2.c 16 Dec 2007 23:41:11 -0000 1.10 +++ ps2.c 17 Mar 2008 15:20:00 -0000 @@ -34,6 +34,7 @@ /* Keyboard Commands */ #define KBD_CMD_SET_LEDS 0xED /* Set keyboard leds */ #define KBD_CMD_ECHO 0xEE +#define KBD_CMD_SCANCODE 0xF0 /* Get/set scancode set */ #define KBD_CMD_GET_ID 0xF2 /* get keyboard ID */ #define KBD_CMD_SET_RATE 0xF3 /* Set typematic rate */ #define KBD_CMD_ENABLE 0xF4 /* Enable scanning */ @@ -89,6 +90,7 @@ conversions we do the translation (if any) in the PS/2 emulation not the keyboard controller. */ int translate; + int scancode_set; /* 1=XT, 2=AT, 3=PS/2 */ } PS2KbdState; typedef struct { @@ -131,10 +133,13 @@ s->update_irq(s->update_arg, 1); } +/* keycode is expressed in scancode set 2 */ static void ps2_put_keycode(void *opaque, int keycode) { PS2KbdState *s = opaque; - if (!s->translate && keycode < 0xe0) + + /* XXX: add support for scancode sets 1 and 3 */ + if (!s->translate && keycode < 0xe0 && s->scancode_set == 2) { if (keycode & 0x80) ps2_queue(&s->common, 0xf0); @@ -174,6 +179,7 @@ static void ps2_reset_keyboard(PS2KbdState *s) { s->scan_enabled = 1; + s->scancode_set = 2; } void ps2_write_keyboard(void *opaque, int val) @@ -192,8 +198,9 @@ break; case KBD_CMD_GET_ID: ps2_queue(&s->common, KBD_REPLY_ACK); - ps2_queue(&s->common, 0xab); - ps2_queue(&s->common, 0x83); + /* We emulate a MF2 AT keyboard here */ + ps2_put_keycode(s, 0xab); + ps2_put_keycode(s, 0x83); break; case KBD_CMD_ECHO: ps2_queue(&s->common, KBD_CMD_ECHO); @@ -202,6 +209,7 @@ s->scan_enabled = 1; ps2_queue(&s->common, KBD_REPLY_ACK); break; + case KBD_CMD_SCANCODE: case KBD_CMD_SET_LEDS: case KBD_CMD_SET_RATE: s->common.write_cmd = val; @@ -227,6 +235,21 @@ break; } break; + case KBD_CMD_SCANCODE: + if (val == 0) { + if (s->scancode_set == 1) + ps2_put_keycode(s, 0x43); + else if (s->scancode_set == 2) + ps2_put_keycode(s, 0x41); + else if (s->scancode_set == 3) + ps2_put_keycode(s, 0x3f); + } else { + if (val >= 1 && val <= 3) + s->scancode_set = val; + ps2_queue(&s->common, KBD_REPLY_ACK); + } + s->common.write_cmd = -1; + break; case KBD_CMD_SET_LEDS: ps2_queue(&s->common, KBD_REPLY_ACK); s->common.write_cmd = -1; @@ -493,6 +516,7 @@ ps2_common_save (f, &s->common); qemu_put_be32(f, s->scan_enabled); qemu_put_be32(f, s->translate); + qemu_put_be32(f, s->scancode_set); } static void ps2_mouse_save(QEMUFile* f, void* opaque) @@ -516,12 +540,16 @@ { PS2KbdState *s = (PS2KbdState*)opaque; - if (version_id != 2) + if (version_id != 2 && version_id != 3) return -EINVAL; ps2_common_load (f, &s->common); s->scan_enabled=qemu_get_be32(f); s->translate=qemu_get_be32(f); + if (version_id == 3) + s->scancode_set=qemu_get_be32(f); + else + s->scancode_set=2; return 0; } @@ -552,8 +580,9 @@ s->common.update_irq = update_irq; s->common.update_arg = update_arg; + s->scancode_set = 2; ps2_reset(&s->common); - register_savevm("ps2kbd", 0, 2, ps2_kbd_save, ps2_kbd_load, s); + register_savevm("ps2kbd", 0, 3, ps2_kbd_save, ps2_kbd_load, s); qemu_add_kbd_event_handler(ps2_put_keycode, s); qemu_register_reset(ps2_reset, &s->common); return s; --------------080403010909060808070102--