[Qemu-commits] [qemu/qemu] 06b361: ps2: reject unknown commands, instead of blindly a...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 06b3611fc2a3001d3940fa3bfa404c679b7d2b13
      
https://github.com/qemu/qemu/commit/06b3611fc2a3001d3940fa3bfa404c679b7d2b13
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  ps2: reject unknown commands, instead of blindly accepting them

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4df23b64c51cc830d19eb29801070d31aa1e81cd
      
https://github.com/qemu/qemu/commit/4df23b64c51cc830d19eb29801070d31aa1e81cd
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  ps2: correctly handle 'get/set scancode' command

When getting scancode, current scancode must be preceded from reply ack.
When setting scancode, we must reject invalid scancodes.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 57d5c005d35dc6d6d7e15a6b8c4d9ea16a7c738d
      
https://github.com/qemu/qemu/commit/57d5c005d35dc6d6d7e15a6b8c4d9ea16a7c738d
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  ps2: allow keycode translation for all scancode sets

Change ps2_put_keycode to get an untranslated scancode, which is translated if 
needed.

As qemu_input_key_value_to_scancode() gives translated scancodes, untranslate 
them
in ps2_keyboard_event first before giving them to ps2_put_keycode.

Results are not changed, except for some keys in translated set 3.

Translation table is available at
https://www.win.tue.nl/~aeb/linux/kbd/scancodes-10.html

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8c10e0baf0260b59a4e984744462a18016662e3e
      
https://github.com/qemu/qemu/commit/8c10e0baf0260b59a4e984744462a18016662e3e
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  ps2: use QEMU qcodes instead of scancodes

This fixes problems with translated set 1, where most make code were wrong.
This fixes problems with set 3 for extended keys (like arrows) and lot of other 
keys.
Added a FIXME for set 3, where most keys must not (by default) deliver a break 
code.

Detailed list of changes on untranslated set 2:
- change of ALTGR break code from 0xe4 to 0xf0 0x08
- change of ALTGR_R break code from 0xe0 0xe4 to 0xe0 0xf0 0x08
- change of F7 make code from 0x02 to 0x83
- change of F7 break code from 0xf0 0x02 to 0xf0 0x83
- change of PRINT make code from 0xe0 0x7c to 0xe0 0x12 0xe0 0x7c
- change of PRINT break code from 0xe0 0xf0 0x7c to 0xe0 0xf0 0x7c 0xe0 0xf0 
0x12
- change of PAUSE key: new make code = old make code + old break code, no more 
break code
- change on RO break code from 0xf3 to 0xf0 0x51
- change on KP_COMMA break code from 0xfe to 0xf0 0x6d

Detailed list of changes on translated set 2 (the most commonly used):
- change of PRINT make code from 0xe0 0x37 to 0xe0 0x2a 0xe0 0x37
- change of PRINT break code from 0xe0 0xb7 to 0xe0 0xb7 0xe0 0xaa
- change of PAUSE key: new make code = old make code + old break code, no more 
break code

Reference:
http://www.computer-engineering.org/ps2keyboard/scancodes1.html
http://www.computer-engineering.org/ps2keyboard/scancodes2.html
http://www.computer-engineering.org/ps2keyboard/scancodes3.html
Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ec044a80e7216ca290ee2dce0afb864256efa956
      
https://github.com/qemu/qemu/commit/ec044a80e7216ca290ee2dce0afb864256efa956
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  ps2: do not generate invalid key codes for unknown keys

Instead, print a warning message.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4af27939e5232c130327066e47eb805be0be1438
      
https://github.com/qemu/qemu/commit/4af27939e5232c130327066e47eb805be0be1438
  Author: Peter Maydell <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/input/ps2.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160928-1' into 
staging

input queue: ps2 kbd cleanups and improvements

# gpg: Signature made Wed 28 Sep 2016 13:52:16 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-input-20160928-1:
  ps2: do not generate invalid key codes for unknown keys
  ps2: use QEMU qcodes instead of scancodes
  ps2: allow keycode translation for all scancode sets
  ps2: correctly handle 'get/set scancode' command
  ps2: reject unknown commands, instead of blindly accepting them

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/79907e688d07...4af27939e523