2005-11-26 11:36:25 +01:00
|
|
|
/*
|
|
|
|
* QEMU PS/2 keyboard/mouse emulation
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-11-26 11:36:25 +01:00
|
|
|
* Copyright (c) 2003 Fabrice Bellard
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2005-11-26 11:36:25 +01:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2016-01-26 19:17:30 +01:00
|
|
|
#include "qemu/osdep.h"
|
2016-09-15 22:06:27 +02:00
|
|
|
#include "qemu/log.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/hw.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/input/ps2.h"
|
2012-11-28 12:06:30 +01:00
|
|
|
#include "ui/console.h"
|
2014-03-13 12:39:38 +01:00
|
|
|
#include "ui/input.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2005-11-26 11:36:25 +01:00
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
#include "trace.h"
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
/* debug PC keyboard */
|
|
|
|
//#define DEBUG_KBD
|
|
|
|
|
|
|
|
/* debug PC keyboard : only mouse */
|
|
|
|
//#define DEBUG_MOUSE
|
|
|
|
|
|
|
|
/* Keyboard Commands */
|
|
|
|
#define KBD_CMD_SET_LEDS 0xED /* Set keyboard leds */
|
|
|
|
#define KBD_CMD_ECHO 0xEE
|
2008-03-18 07:54:34 +01:00
|
|
|
#define KBD_CMD_SCANCODE 0xF0 /* Get/set scancode set */
|
2005-11-26 11:36:25 +01:00
|
|
|
#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 */
|
|
|
|
#define KBD_CMD_RESET_DISABLE 0xF5 /* reset and disable scanning */
|
|
|
|
#define KBD_CMD_RESET_ENABLE 0xF6 /* reset and enable scanning */
|
|
|
|
#define KBD_CMD_RESET 0xFF /* Reset */
|
|
|
|
|
|
|
|
/* Keyboard Replies */
|
|
|
|
#define KBD_REPLY_POR 0xAA /* Power on reset */
|
2008-04-13 18:08:44 +02:00
|
|
|
#define KBD_REPLY_ID 0xAB /* Keyboard ID */
|
2005-11-26 11:36:25 +01:00
|
|
|
#define KBD_REPLY_ACK 0xFA /* Command ACK */
|
|
|
|
#define KBD_REPLY_RESEND 0xFE /* Command NACK, send the cmd again */
|
|
|
|
|
|
|
|
/* Mouse Commands */
|
|
|
|
#define AUX_SET_SCALE11 0xE6 /* Set 1:1 scaling */
|
|
|
|
#define AUX_SET_SCALE21 0xE7 /* Set 2:1 scaling */
|
|
|
|
#define AUX_SET_RES 0xE8 /* Set resolution */
|
|
|
|
#define AUX_GET_SCALE 0xE9 /* Get scaling factor */
|
|
|
|
#define AUX_SET_STREAM 0xEA /* Set stream mode */
|
|
|
|
#define AUX_POLL 0xEB /* Poll */
|
|
|
|
#define AUX_RESET_WRAP 0xEC /* Reset wrap mode */
|
|
|
|
#define AUX_SET_WRAP 0xEE /* Set wrap mode */
|
|
|
|
#define AUX_SET_REMOTE 0xF0 /* Set remote mode */
|
|
|
|
#define AUX_GET_TYPE 0xF2 /* Get type */
|
|
|
|
#define AUX_SET_SAMPLE 0xF3 /* Set sample rate */
|
|
|
|
#define AUX_ENABLE_DEV 0xF4 /* Enable aux device */
|
|
|
|
#define AUX_DISABLE_DEV 0xF5 /* Disable aux device */
|
|
|
|
#define AUX_SET_DEFAULT 0xF6
|
|
|
|
#define AUX_RESET 0xFF /* Reset aux device */
|
|
|
|
#define AUX_ACK 0xFA /* Command byte ACK. */
|
|
|
|
|
|
|
|
#define MOUSE_STATUS_REMOTE 0x40
|
|
|
|
#define MOUSE_STATUS_ENABLED 0x20
|
|
|
|
#define MOUSE_STATUS_SCALE21 0x10
|
|
|
|
|
2014-04-24 14:06:19 +02:00
|
|
|
#define PS2_QUEUE_SIZE 16 /* Buffer size required by PS/2 protocol */
|
2005-11-26 11:36:25 +01:00
|
|
|
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
/* Bits for 'modifiers' field in PS2KbdState */
|
|
|
|
#define MOD_CTRL_L (1 << 0)
|
|
|
|
#define MOD_SHIFT_L (1 << 1)
|
|
|
|
#define MOD_ALT_L (1 << 2)
|
|
|
|
#define MOD_CTRL_R (1 << 3)
|
|
|
|
#define MOD_SHIFT_R (1 << 4)
|
|
|
|
#define MOD_ALT_R (1 << 5)
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
typedef struct {
|
2014-04-24 14:06:19 +02:00
|
|
|
/* Keep the data array 256 bytes long, which compatibility
|
|
|
|
with older qemu versions. */
|
|
|
|
uint8_t data[256];
|
2005-11-26 11:36:25 +01:00
|
|
|
int rptr, wptr, count;
|
|
|
|
} PS2Queue;
|
|
|
|
|
2017-06-06 13:21:03 +02:00
|
|
|
struct PS2State {
|
2005-11-26 11:36:25 +01:00
|
|
|
PS2Queue queue;
|
|
|
|
int32_t write_cmd;
|
|
|
|
void (*update_irq)(void *, int);
|
|
|
|
void *update_arg;
|
2017-06-06 13:21:03 +02:00
|
|
|
};
|
2005-11-26 11:36:25 +01:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PS2State common;
|
|
|
|
int scan_enabled;
|
2006-02-08 05:42:17 +01:00
|
|
|
int translate;
|
2008-03-18 07:54:34 +01:00
|
|
|
int scancode_set; /* 1=XT, 2=AT, 3=PS/2 */
|
2011-10-17 13:37:34 +02:00
|
|
|
int ledstate;
|
2016-09-15 22:06:25 +02:00
|
|
|
bool need_high_bit;
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
unsigned int modifiers; /* bitmask of MOD_* constants above */
|
2005-11-26 11:36:25 +01:00
|
|
|
} PS2KbdState;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PS2State common;
|
|
|
|
uint8_t mouse_status;
|
|
|
|
uint8_t mouse_resolution;
|
|
|
|
uint8_t mouse_sample_rate;
|
|
|
|
uint8_t mouse_wrap;
|
|
|
|
uint8_t mouse_type; /* 0 = PS2, 3 = IMPS/2, 4 = IMEX */
|
|
|
|
uint8_t mouse_detect_state;
|
|
|
|
int mouse_dx; /* current values, needed for 'poll' mode */
|
|
|
|
int mouse_dy;
|
|
|
|
int mouse_dz;
|
|
|
|
uint8_t mouse_buttons;
|
|
|
|
} PS2MouseState;
|
|
|
|
|
2016-09-15 22:06:25 +02:00
|
|
|
static uint8_t translate_table[256] = {
|
|
|
|
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
|
|
|
|
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
|
|
|
|
0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a,
|
|
|
|
0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
|
|
|
|
0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c,
|
|
|
|
0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
|
|
|
|
0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e,
|
|
|
|
0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
|
|
|
|
0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60,
|
|
|
|
0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
|
|
|
|
0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e,
|
|
|
|
0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
|
|
|
|
0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b,
|
|
|
|
0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
|
|
|
|
0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45,
|
|
|
|
0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
|
|
|
|
0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87,
|
|
|
|
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
|
|
|
|
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
|
|
|
|
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
|
|
|
|
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
|
|
|
|
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
|
|
|
|
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
|
|
|
|
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
|
|
|
|
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
|
|
|
|
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
|
|
|
|
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
|
|
|
|
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
|
|
|
|
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
|
|
|
|
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
|
|
|
|
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
|
|
|
|
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
|
|
|
|
};
|
|
|
|
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
static unsigned int ps2_modifier_bit(QKeyCode key)
|
|
|
|
{
|
|
|
|
switch (key) {
|
|
|
|
case Q_KEY_CODE_CTRL:
|
|
|
|
return MOD_CTRL_L;
|
|
|
|
case Q_KEY_CODE_CTRL_R:
|
|
|
|
return MOD_CTRL_R;
|
|
|
|
case Q_KEY_CODE_SHIFT:
|
|
|
|
return MOD_SHIFT_L;
|
|
|
|
case Q_KEY_CODE_SHIFT_R:
|
|
|
|
return MOD_SHIFT_R;
|
|
|
|
case Q_KEY_CODE_ALT:
|
|
|
|
return MOD_ALT_L;
|
|
|
|
case Q_KEY_CODE_ALT_R:
|
|
|
|
return MOD_ALT_R;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-06 13:21:04 +02:00
|
|
|
static void ps2_reset_queue(PS2State *s)
|
|
|
|
{
|
|
|
|
PS2Queue *q = &s->queue;
|
|
|
|
|
|
|
|
q->rptr = 0;
|
|
|
|
q->wptr = 0;
|
|
|
|
q->count = 0;
|
|
|
|
}
|
|
|
|
|
2017-06-06 13:21:03 +02:00
|
|
|
void ps2_queue(PS2State *s, int b)
|
2005-11-26 11:36:25 +01:00
|
|
|
{
|
|
|
|
PS2Queue *q = &s->queue;
|
|
|
|
|
2014-04-24 14:06:19 +02:00
|
|
|
if (q->count >= PS2_QUEUE_SIZE - 1)
|
2005-11-26 11:36:25 +01:00
|
|
|
return;
|
|
|
|
q->data[q->wptr] = b;
|
|
|
|
if (++q->wptr == PS2_QUEUE_SIZE)
|
|
|
|
q->wptr = 0;
|
|
|
|
q->count++;
|
|
|
|
s->update_irq(s->update_arg, 1);
|
|
|
|
}
|
|
|
|
|
2016-09-15 22:06:25 +02:00
|
|
|
/* keycode is the untranslated scancode in the current scancode set. */
|
2005-11-26 11:36:25 +01:00
|
|
|
static void ps2_put_keycode(void *opaque, int keycode)
|
|
|
|
{
|
2006-02-08 05:42:17 +01:00
|
|
|
PS2KbdState *s = opaque;
|
2008-03-18 07:54:34 +01:00
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_put_keycode(opaque, keycode);
|
2012-02-23 13:45:22 +01:00
|
|
|
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
2016-09-15 22:06:25 +02:00
|
|
|
|
|
|
|
if (s->translate) {
|
|
|
|
if (keycode == 0xf0) {
|
|
|
|
s->need_high_bit = true;
|
|
|
|
} else if (s->need_high_bit) {
|
|
|
|
ps2_queue(&s->common, translate_table[keycode] | 0x80);
|
|
|
|
s->need_high_bit = false;
|
|
|
|
} else {
|
|
|
|
ps2_queue(&s->common, translate_table[keycode]);
|
2011-02-21 01:06:32 +01:00
|
|
|
}
|
2016-09-15 22:06:25 +02:00
|
|
|
} else {
|
|
|
|
ps2_queue(&s->common, keycode);
|
|
|
|
}
|
2005-11-26 11:36:25 +01:00
|
|
|
}
|
|
|
|
|
2014-03-13 12:39:38 +01:00
|
|
|
static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
|
|
|
|
InputEvent *evt)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState *)dev;
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
InputKeyEvent *key = evt->u.key.data;
|
2016-09-15 22:06:26 +02:00
|
|
|
int qcode;
|
2018-01-17 17:41:15 +01:00
|
|
|
uint16_t keycode = 0;
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
int mod;
|
2014-03-13 12:39:38 +01:00
|
|
|
|
|
|
|
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
2016-09-15 22:06:26 +02:00
|
|
|
assert(evt->type == INPUT_EVENT_KIND_KEY);
|
|
|
|
qcode = qemu_input_key_value_to_qcode(key->key);
|
2016-09-15 22:06:25 +02:00
|
|
|
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
mod = ps2_modifier_bit(qcode);
|
|
|
|
trace_ps2_keyboard_event(s, qcode, key->down, mod, s->modifiers);
|
|
|
|
if (key->down) {
|
|
|
|
s->modifiers |= mod;
|
|
|
|
} else {
|
|
|
|
s->modifiers &= ~mod;
|
|
|
|
}
|
|
|
|
|
2016-09-15 22:06:26 +02:00
|
|
|
if (s->scancode_set == 1) {
|
|
|
|
if (qcode == Q_KEY_CODE_PAUSE) {
|
2017-10-19 16:28:46 +02:00
|
|
|
if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x46);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xc6);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe1);
|
|
|
|
ps2_put_keycode(s, 0x1d);
|
|
|
|
ps2_put_keycode(s, 0x45);
|
|
|
|
ps2_put_keycode(s, 0xe1);
|
|
|
|
ps2_put_keycode(s, 0x9d);
|
|
|
|
ps2_put_keycode(s, 0xc5);
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
}
|
|
|
|
} else if (qcode == Q_KEY_CODE_PRINT) {
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
if (s->modifiers & MOD_ALT_L) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xb8);
|
|
|
|
ps2_put_keycode(s, 0x38);
|
|
|
|
ps2_put_keycode(s, 0x54);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xd4);
|
|
|
|
ps2_put_keycode(s, 0xb8);
|
|
|
|
ps2_put_keycode(s, 0x38);
|
|
|
|
}
|
|
|
|
} else if (s->modifiers & MOD_ALT_R) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xb8);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x38);
|
|
|
|
ps2_put_keycode(s, 0x54);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xd4);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xb8);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x38);
|
|
|
|
}
|
2017-10-19 16:28:44 +02:00
|
|
|
} else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L |
|
|
|
|
MOD_SHIFT_R | MOD_CTRL_R)) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x37);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xb7);
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
} else {
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x2a);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x37);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xb7);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xaa);
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
}
|
2016-09-15 22:06:25 +02:00
|
|
|
} else {
|
2018-01-17 17:41:15 +01:00
|
|
|
if (qcode < qemu_input_map_qcode_to_atset1_len)
|
|
|
|
keycode = qemu_input_map_qcode_to_atset1[qcode];
|
2016-09-15 22:06:26 +02:00
|
|
|
if (keycode) {
|
|
|
|
if (keycode & 0xff00) {
|
|
|
|
ps2_put_keycode(s, keycode >> 8);
|
|
|
|
}
|
|
|
|
if (!key->down) {
|
|
|
|
keycode |= 0x80;
|
|
|
|
}
|
|
|
|
ps2_put_keycode(s, keycode & 0xff);
|
|
|
|
} else {
|
2016-09-15 22:06:27 +02:00
|
|
|
qemu_log_mask(LOG_UNIMP,
|
|
|
|
"ps2: ignoring key with qcode %d\n", qcode);
|
2016-09-15 22:06:26 +02:00
|
|
|
}
|
2016-09-15 22:06:25 +02:00
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
} else if (s->scancode_set == 2) {
|
|
|
|
if (qcode == Q_KEY_CODE_PAUSE) {
|
2017-10-19 16:28:46 +02:00
|
|
|
if (s->modifiers & (MOD_CTRL_L | MOD_CTRL_R)) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x7e);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x7e);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe1);
|
|
|
|
ps2_put_keycode(s, 0x14);
|
|
|
|
ps2_put_keycode(s, 0x77);
|
|
|
|
ps2_put_keycode(s, 0xe1);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x14);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x77);
|
|
|
|
}
|
2016-09-15 22:06:25 +02:00
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
} else if (qcode == Q_KEY_CODE_PRINT) {
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
if (s->modifiers & MOD_ALT_L) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0x84);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x84);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
}
|
|
|
|
} else if (s->modifiers & MOD_ALT_R) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0x84);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x84);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x11);
|
|
|
|
}
|
2017-10-19 16:28:44 +02:00
|
|
|
} else if (s->modifiers & (MOD_SHIFT_L | MOD_CTRL_L |
|
|
|
|
MOD_SHIFT_R | MOD_CTRL_R)) {
|
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x7c);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x7c);
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
} else {
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
if (key->down) {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x12);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0x7c);
|
|
|
|
} else {
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x7c);
|
|
|
|
ps2_put_keycode(s, 0xe0);
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
ps2_put_keycode(s, 0x12);
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
}
|
|
|
|
} else {
|
2018-01-17 17:41:15 +01:00
|
|
|
if (qcode < qemu_input_map_qcode_to_atset2_len)
|
|
|
|
keycode = qemu_input_map_qcode_to_atset2[qcode];
|
2016-09-15 22:06:26 +02:00
|
|
|
if (keycode) {
|
|
|
|
if (keycode & 0xff00) {
|
|
|
|
ps2_put_keycode(s, keycode >> 8);
|
|
|
|
}
|
|
|
|
if (!key->down) {
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
}
|
|
|
|
ps2_put_keycode(s, keycode & 0xff);
|
|
|
|
} else {
|
2016-09-15 22:06:27 +02:00
|
|
|
qemu_log_mask(LOG_UNIMP,
|
|
|
|
"ps2: ignoring key with qcode %d\n", qcode);
|
2016-09-15 22:06:25 +02:00
|
|
|
}
|
|
|
|
}
|
2016-09-15 22:06:26 +02:00
|
|
|
} else if (s->scancode_set == 3) {
|
2018-01-17 17:41:15 +01:00
|
|
|
if (qcode < qemu_input_map_qcode_to_atset3_len)
|
|
|
|
keycode = qemu_input_map_qcode_to_atset3[qcode];
|
2016-09-15 22:06:26 +02:00
|
|
|
if (keycode) {
|
|
|
|
/* FIXME: break code should be configured on a key by key basis */
|
|
|
|
if (!key->down) {
|
|
|
|
ps2_put_keycode(s, 0xf0);
|
|
|
|
}
|
|
|
|
ps2_put_keycode(s, keycode);
|
|
|
|
} else {
|
2016-09-15 22:06:27 +02:00
|
|
|
qemu_log_mask(LOG_UNIMP,
|
|
|
|
"ps2: ignoring key with qcode %d\n", qcode);
|
2016-09-15 22:06:26 +02:00
|
|
|
}
|
2014-03-13 12:39:38 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-06 13:21:03 +02:00
|
|
|
uint32_t ps2_read_data(PS2State *s)
|
2005-11-26 11:36:25 +01:00
|
|
|
{
|
|
|
|
PS2Queue *q;
|
|
|
|
int val, index;
|
2007-09-17 10:09:54 +02:00
|
|
|
|
2017-06-06 13:21:03 +02:00
|
|
|
trace_ps2_read_data(s);
|
2005-11-26 11:36:25 +01:00
|
|
|
q = &s->queue;
|
|
|
|
if (q->count == 0) {
|
|
|
|
/* NOTE: if no data left, we return the last keyboard one
|
|
|
|
(needed for EMM386) */
|
|
|
|
/* XXX: need a timer to do things correctly */
|
|
|
|
index = q->rptr - 1;
|
|
|
|
if (index < 0)
|
|
|
|
index = PS2_QUEUE_SIZE - 1;
|
|
|
|
val = q->data[index];
|
|
|
|
} else {
|
|
|
|
val = q->data[q->rptr];
|
|
|
|
if (++q->rptr == PS2_QUEUE_SIZE)
|
|
|
|
q->rptr = 0;
|
|
|
|
q->count--;
|
|
|
|
/* reading deasserts IRQ */
|
|
|
|
s->update_irq(s->update_arg, 0);
|
|
|
|
/* reassert IRQs if data left */
|
|
|
|
s->update_irq(s->update_arg, q->count != 0);
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2011-10-17 13:37:34 +02:00
|
|
|
static void ps2_set_ledstate(PS2KbdState *s, int ledstate)
|
|
|
|
{
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_set_ledstate(s, ledstate);
|
2011-10-17 13:37:34 +02:00
|
|
|
s->ledstate = ledstate;
|
|
|
|
kbd_put_ledstate(ledstate);
|
|
|
|
}
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
static void ps2_reset_keyboard(PS2KbdState *s)
|
|
|
|
{
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_reset_keyboard(s);
|
2005-11-26 11:36:25 +01:00
|
|
|
s->scan_enabled = 1;
|
2008-03-18 07:54:34 +01:00
|
|
|
s->scancode_set = 2;
|
2017-06-06 13:21:05 +02:00
|
|
|
ps2_reset_queue(&s->common);
|
2011-10-17 13:37:34 +02:00
|
|
|
ps2_set_ledstate(s, 0);
|
2005-11-26 11:36:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void ps2_write_keyboard(void *opaque, int val)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState *)opaque;
|
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_write_keyboard(opaque, val);
|
2005-11-26 11:36:25 +01:00
|
|
|
switch(s->common.write_cmd) {
|
|
|
|
default:
|
|
|
|
case -1:
|
|
|
|
switch(val) {
|
|
|
|
case 0x00:
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
break;
|
|
|
|
case 0x05:
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_RESEND);
|
|
|
|
break;
|
|
|
|
case KBD_CMD_GET_ID:
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
2008-03-18 07:54:34 +01:00
|
|
|
/* We emulate a MF2 AT keyboard here */
|
2008-04-13 18:08:44 +02:00
|
|
|
ps2_queue(&s->common, KBD_REPLY_ID);
|
|
|
|
if (s->translate)
|
|
|
|
ps2_queue(&s->common, 0x41);
|
|
|
|
else
|
|
|
|
ps2_queue(&s->common, 0x83);
|
2005-11-26 11:36:25 +01:00
|
|
|
break;
|
|
|
|
case KBD_CMD_ECHO:
|
|
|
|
ps2_queue(&s->common, KBD_CMD_ECHO);
|
|
|
|
break;
|
|
|
|
case KBD_CMD_ENABLE:
|
|
|
|
s->scan_enabled = 1;
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
break;
|
2008-03-18 07:54:34 +01:00
|
|
|
case KBD_CMD_SCANCODE:
|
2005-11-26 11:36:25 +01:00
|
|
|
case KBD_CMD_SET_LEDS:
|
|
|
|
case KBD_CMD_SET_RATE:
|
|
|
|
s->common.write_cmd = val;
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
break;
|
|
|
|
case KBD_CMD_RESET_DISABLE:
|
|
|
|
ps2_reset_keyboard(s);
|
|
|
|
s->scan_enabled = 0;
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
break;
|
|
|
|
case KBD_CMD_RESET_ENABLE:
|
|
|
|
ps2_reset_keyboard(s);
|
|
|
|
s->scan_enabled = 1;
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
break;
|
|
|
|
case KBD_CMD_RESET:
|
|
|
|
ps2_reset_keyboard(s);
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_POR);
|
|
|
|
break;
|
|
|
|
default:
|
2016-09-15 22:06:23 +02:00
|
|
|
ps2_queue(&s->common, KBD_REPLY_RESEND);
|
2005-11-26 11:36:25 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2008-03-18 07:54:34 +01:00
|
|
|
case KBD_CMD_SCANCODE:
|
|
|
|
if (val == 0) {
|
2016-09-15 22:06:24 +02:00
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
2016-09-15 22:06:25 +02:00
|
|
|
ps2_put_keycode(s, s->scancode_set);
|
2016-09-15 22:06:24 +02:00
|
|
|
} else if (val >= 1 && val <= 3) {
|
|
|
|
s->scancode_set = val;
|
2008-03-18 07:54:34 +01:00
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
2016-09-15 22:06:24 +02:00
|
|
|
} else {
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_RESEND);
|
2008-03-18 07:54:34 +01:00
|
|
|
}
|
|
|
|
s->common.write_cmd = -1;
|
|
|
|
break;
|
2005-11-26 11:36:25 +01:00
|
|
|
case KBD_CMD_SET_LEDS:
|
2011-10-17 13:37:34 +02:00
|
|
|
ps2_set_ledstate(s, val);
|
2005-11-26 11:36:25 +01:00
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
s->common.write_cmd = -1;
|
|
|
|
break;
|
|
|
|
case KBD_CMD_SET_RATE:
|
|
|
|
ps2_queue(&s->common, KBD_REPLY_ACK);
|
|
|
|
s->common.write_cmd = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-08 05:42:17 +01:00
|
|
|
/* Set the scancode translation mode.
|
|
|
|
0 = raw scancodes.
|
|
|
|
1 = translated scancodes (used by qemu internally). */
|
|
|
|
|
|
|
|
void ps2_keyboard_set_translation(void *opaque, int mode)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState *)opaque;
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_keyboard_set_translation(opaque, mode);
|
2006-02-08 05:42:17 +01:00
|
|
|
s->translate = mode;
|
|
|
|
}
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
static void ps2_mouse_send_packet(PS2MouseState *s)
|
|
|
|
{
|
|
|
|
unsigned int b;
|
|
|
|
int dx1, dy1, dz1;
|
|
|
|
|
|
|
|
dx1 = s->mouse_dx;
|
|
|
|
dy1 = s->mouse_dy;
|
|
|
|
dz1 = s->mouse_dz;
|
|
|
|
/* XXX: increase range to 8 bits ? */
|
|
|
|
if (dx1 > 127)
|
|
|
|
dx1 = 127;
|
|
|
|
else if (dx1 < -127)
|
|
|
|
dx1 = -127;
|
|
|
|
if (dy1 > 127)
|
|
|
|
dy1 = 127;
|
|
|
|
else if (dy1 < -127)
|
|
|
|
dy1 = -127;
|
|
|
|
b = 0x08 | ((dx1 < 0) << 4) | ((dy1 < 0) << 5) | (s->mouse_buttons & 0x07);
|
|
|
|
ps2_queue(&s->common, b);
|
|
|
|
ps2_queue(&s->common, dx1 & 0xff);
|
|
|
|
ps2_queue(&s->common, dy1 & 0xff);
|
|
|
|
/* extra byte for IMPS/2 or IMEX */
|
|
|
|
switch(s->mouse_type) {
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
if (dz1 > 127)
|
|
|
|
dz1 = 127;
|
|
|
|
else if (dz1 < -127)
|
|
|
|
dz1 = -127;
|
|
|
|
ps2_queue(&s->common, dz1 & 0xff);
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
if (dz1 > 7)
|
|
|
|
dz1 = 7;
|
|
|
|
else if (dz1 < -7)
|
|
|
|
dz1 = -7;
|
|
|
|
b = (dz1 & 0x0f) | ((s->mouse_buttons & 0x18) << 1);
|
|
|
|
ps2_queue(&s->common, b);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_mouse_send_packet(s, dx1, dy1, dz1, b);
|
2005-11-26 11:36:25 +01:00
|
|
|
/* update deltas */
|
|
|
|
s->mouse_dx -= dx1;
|
|
|
|
s->mouse_dy -= dy1;
|
|
|
|
s->mouse_dz -= dz1;
|
|
|
|
}
|
|
|
|
|
2014-03-13 12:58:29 +01:00
|
|
|
static void ps2_mouse_event(DeviceState *dev, QemuConsole *src,
|
|
|
|
InputEvent *evt)
|
2005-11-26 11:36:25 +01:00
|
|
|
{
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
static const int bmap[INPUT_BUTTON__MAX] = {
|
2016-12-06 20:00:06 +01:00
|
|
|
[INPUT_BUTTON_LEFT] = PS2_MOUSE_BUTTON_LEFT,
|
|
|
|
[INPUT_BUTTON_MIDDLE] = PS2_MOUSE_BUTTON_MIDDLE,
|
|
|
|
[INPUT_BUTTON_RIGHT] = PS2_MOUSE_BUTTON_RIGHT,
|
|
|
|
[INPUT_BUTTON_SIDE] = PS2_MOUSE_BUTTON_SIDE,
|
|
|
|
[INPUT_BUTTON_EXTRA] = PS2_MOUSE_BUTTON_EXTRA,
|
2014-03-13 12:58:29 +01:00
|
|
|
};
|
|
|
|
PS2MouseState *s = (PS2MouseState *)dev;
|
2016-03-03 17:16:49 +01:00
|
|
|
InputMoveEvent *move;
|
|
|
|
InputBtnEvent *btn;
|
2005-11-26 11:36:25 +01:00
|
|
|
|
|
|
|
/* check if deltas are recorded when disabled */
|
|
|
|
if (!(s->mouse_status & MOUSE_STATUS_ENABLED))
|
|
|
|
return;
|
|
|
|
|
2015-10-26 23:34:58 +01:00
|
|
|
switch (evt->type) {
|
2014-03-13 12:58:29 +01:00
|
|
|
case INPUT_EVENT_KIND_REL:
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
move = evt->u.rel.data;
|
2016-03-03 17:16:49 +01:00
|
|
|
if (move->axis == INPUT_AXIS_X) {
|
|
|
|
s->mouse_dx += move->value;
|
|
|
|
} else if (move->axis == INPUT_AXIS_Y) {
|
|
|
|
s->mouse_dy -= move->value;
|
2014-03-13 12:58:29 +01:00
|
|
|
}
|
|
|
|
break;
|
2007-09-17 10:09:54 +02:00
|
|
|
|
2014-03-13 12:58:29 +01:00
|
|
|
case INPUT_EVENT_KIND_BTN:
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
btn = evt->u.btn.data;
|
2016-03-03 17:16:49 +01:00
|
|
|
if (btn->down) {
|
|
|
|
s->mouse_buttons |= bmap[btn->button];
|
|
|
|
if (btn->button == INPUT_BUTTON_WHEEL_UP) {
|
2014-03-13 12:58:29 +01:00
|
|
|
s->mouse_dz--;
|
2016-03-03 17:16:49 +01:00
|
|
|
} else if (btn->button == INPUT_BUTTON_WHEEL_DOWN) {
|
2014-03-13 12:58:29 +01:00
|
|
|
s->mouse_dz++;
|
|
|
|
}
|
|
|
|
} else {
|
2016-03-03 17:16:49 +01:00
|
|
|
s->mouse_buttons &= ~bmap[btn->button];
|
2014-03-13 12:58:29 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* keep gcc happy */
|
|
|
|
break;
|
2012-02-23 13:45:22 +01:00
|
|
|
}
|
2014-03-13 12:58:29 +01:00
|
|
|
}
|
2012-02-23 13:45:22 +01:00
|
|
|
|
2014-03-13 12:58:29 +01:00
|
|
|
static void ps2_mouse_sync(DeviceState *dev)
|
|
|
|
{
|
|
|
|
PS2MouseState *s = (PS2MouseState *)dev;
|
|
|
|
|
|
|
|
if (s->mouse_buttons) {
|
|
|
|
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
|
|
|
|
}
|
2014-04-24 14:06:19 +02:00
|
|
|
if (!(s->mouse_status & MOUSE_STATUS_REMOTE)) {
|
|
|
|
while (s->common.queue.count < PS2_QUEUE_SIZE - 4) {
|
2005-11-26 11:36:25 +01:00
|
|
|
/* if not remote, send event. Multiple events are sent if
|
|
|
|
too big deltas */
|
|
|
|
ps2_mouse_send_packet(s);
|
|
|
|
if (s->mouse_dx == 0 && s->mouse_dy == 0 && s->mouse_dz == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-03-20 17:45:27 +01:00
|
|
|
void ps2_mouse_fake_event(void *opaque)
|
|
|
|
{
|
2014-03-13 12:58:29 +01:00
|
|
|
PS2MouseState *s = opaque;
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_mouse_fake_event(opaque);
|
2014-03-13 12:58:29 +01:00
|
|
|
s->mouse_dx++;
|
|
|
|
ps2_mouse_sync(opaque);
|
2007-03-20 17:45:27 +01:00
|
|
|
}
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
void ps2_write_mouse(void *opaque, int val)
|
|
|
|
{
|
|
|
|
PS2MouseState *s = (PS2MouseState *)opaque;
|
2015-01-16 20:21:37 +01:00
|
|
|
|
|
|
|
trace_ps2_write_mouse(opaque, val);
|
2005-11-26 11:36:25 +01:00
|
|
|
#ifdef DEBUG_MOUSE
|
|
|
|
printf("kbd: write mouse 0x%02x\n", val);
|
|
|
|
#endif
|
|
|
|
switch(s->common.write_cmd) {
|
|
|
|
default:
|
|
|
|
case -1:
|
|
|
|
/* mouse command */
|
|
|
|
if (s->mouse_wrap) {
|
|
|
|
if (val == AUX_RESET_WRAP) {
|
|
|
|
s->mouse_wrap = 0;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
return;
|
|
|
|
} else if (val != AUX_RESET) {
|
|
|
|
ps2_queue(&s->common, val);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
switch(val) {
|
|
|
|
case AUX_SET_SCALE11:
|
|
|
|
s->mouse_status &= ~MOUSE_STATUS_SCALE21;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_SET_SCALE21:
|
|
|
|
s->mouse_status |= MOUSE_STATUS_SCALE21;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_SET_STREAM:
|
|
|
|
s->mouse_status &= ~MOUSE_STATUS_REMOTE;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_SET_WRAP:
|
|
|
|
s->mouse_wrap = 1;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_SET_REMOTE:
|
|
|
|
s->mouse_status |= MOUSE_STATUS_REMOTE;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_GET_TYPE:
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
ps2_queue(&s->common, s->mouse_type);
|
|
|
|
break;
|
|
|
|
case AUX_SET_RES:
|
|
|
|
case AUX_SET_SAMPLE:
|
|
|
|
s->common.write_cmd = val;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_GET_SCALE:
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
ps2_queue(&s->common, s->mouse_status);
|
|
|
|
ps2_queue(&s->common, s->mouse_resolution);
|
|
|
|
ps2_queue(&s->common, s->mouse_sample_rate);
|
|
|
|
break;
|
|
|
|
case AUX_POLL:
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
ps2_mouse_send_packet(s);
|
|
|
|
break;
|
|
|
|
case AUX_ENABLE_DEV:
|
|
|
|
s->mouse_status |= MOUSE_STATUS_ENABLED;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_DISABLE_DEV:
|
|
|
|
s->mouse_status &= ~MOUSE_STATUS_ENABLED;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_SET_DEFAULT:
|
|
|
|
s->mouse_sample_rate = 100;
|
|
|
|
s->mouse_resolution = 2;
|
|
|
|
s->mouse_status = 0;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
break;
|
|
|
|
case AUX_RESET:
|
|
|
|
s->mouse_sample_rate = 100;
|
|
|
|
s->mouse_resolution = 2;
|
|
|
|
s->mouse_status = 0;
|
|
|
|
s->mouse_type = 0;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
ps2_queue(&s->common, 0xaa);
|
|
|
|
ps2_queue(&s->common, s->mouse_type);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case AUX_SET_SAMPLE:
|
|
|
|
s->mouse_sample_rate = val;
|
|
|
|
/* detect IMPS/2 or IMEX */
|
|
|
|
switch(s->mouse_detect_state) {
|
|
|
|
default:
|
|
|
|
case 0:
|
|
|
|
if (val == 200)
|
|
|
|
s->mouse_detect_state = 1;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
if (val == 100)
|
|
|
|
s->mouse_detect_state = 2;
|
|
|
|
else if (val == 200)
|
|
|
|
s->mouse_detect_state = 3;
|
|
|
|
else
|
|
|
|
s->mouse_detect_state = 0;
|
|
|
|
break;
|
|
|
|
case 2:
|
2007-09-16 23:08:06 +02:00
|
|
|
if (val == 80)
|
2005-11-26 11:36:25 +01:00
|
|
|
s->mouse_type = 3; /* IMPS/2 */
|
|
|
|
s->mouse_detect_state = 0;
|
|
|
|
break;
|
|
|
|
case 3:
|
2007-09-16 23:08:06 +02:00
|
|
|
if (val == 80)
|
2005-11-26 11:36:25 +01:00
|
|
|
s->mouse_type = 4; /* IMEX */
|
|
|
|
s->mouse_detect_state = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
s->common.write_cmd = -1;
|
|
|
|
break;
|
|
|
|
case AUX_SET_RES:
|
|
|
|
s->mouse_resolution = val;
|
|
|
|
ps2_queue(&s->common, AUX_ACK);
|
|
|
|
s->common.write_cmd = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-15 03:30:53 +02:00
|
|
|
static void ps2_common_reset(PS2State *s)
|
2005-11-26 11:36:25 +01:00
|
|
|
{
|
|
|
|
s->write_cmd = -1;
|
2017-06-06 13:21:04 +02:00
|
|
|
ps2_reset_queue(s);
|
2009-01-26 16:57:52 +01:00
|
|
|
s->update_irq(s->update_arg, 0);
|
2005-11-26 11:36:25 +01:00
|
|
|
}
|
|
|
|
|
2014-04-24 14:06:19 +02:00
|
|
|
static void ps2_common_post_load(PS2State *s)
|
|
|
|
{
|
|
|
|
PS2Queue *q = &s->queue;
|
2017-11-16 08:51:55 +01:00
|
|
|
uint8_t i, size;
|
|
|
|
uint8_t tmp_data[PS2_QUEUE_SIZE];
|
2014-04-24 14:06:19 +02:00
|
|
|
|
|
|
|
/* set the useful data buffer queue size, < PS2_QUEUE_SIZE */
|
2017-11-16 08:51:55 +01:00
|
|
|
size = (q->count < 0 || q->count > PS2_QUEUE_SIZE) ? 0 : q->count;
|
2014-04-24 14:06:19 +02:00
|
|
|
|
|
|
|
/* move the queue elements to the start of data array */
|
2017-11-16 08:51:55 +01:00
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
if (q->rptr < 0 || q->rptr >= sizeof(q->data)) {
|
|
|
|
q->rptr = 0;
|
2014-04-24 14:06:19 +02:00
|
|
|
}
|
2017-11-16 08:51:55 +01:00
|
|
|
tmp_data[i] = q->data[q->rptr++];
|
2014-04-24 14:06:19 +02:00
|
|
|
}
|
2017-11-16 08:51:55 +01:00
|
|
|
memcpy(q->data, tmp_data, size);
|
|
|
|
|
2014-04-24 14:06:19 +02:00
|
|
|
/* reset rptr/wptr/count */
|
|
|
|
q->rptr = 0;
|
|
|
|
q->wptr = size;
|
|
|
|
q->count = size;
|
|
|
|
s->update_irq(s->update_arg, q->count != 0);
|
|
|
|
}
|
|
|
|
|
2009-07-15 03:30:53 +02:00
|
|
|
static void ps2_kbd_reset(void *opaque)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState *) opaque;
|
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_kbd_reset(opaque);
|
2009-07-15 03:30:53 +02:00
|
|
|
ps2_common_reset(&s->common);
|
|
|
|
s->scan_enabled = 0;
|
|
|
|
s->translate = 0;
|
2016-03-23 07:21:40 +01:00
|
|
|
s->scancode_set = 2;
|
ps2: fix scancodes sent for Alt-Print key combination (aka SysRq)
The 'Print' key is special in the AT set 1 / set 2 scancode definitions.
An unmodified 'Print' key is supposed to send
AT Set 1: e0 2a e0 37 (Down) e0 b7 e0 aa (Up)
AT Set 2: e0 12 e0 7c (Down) e0 f0 7c e0 f0 12 (Up)
which QEMU gets right. When pressed in combination with the 'Alt_L' or 'Alt_R'
keys (which signify SysRq), the scancodes are required to follow a different
scheme. With Alt_L, the expected sequences are
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
And with Alt_R
AT set 1: e0 38, 54 (Down) d4, e0 b8 (Up)
AT set 2: e0 11, 84 (Down) f0 84, f0 e0 11 (Up)
It is actually slightly more complicated than that, because (according results
of 'showkey -s', keyboards will in fact first release the currently pressed
modifier before sending the sequence above (which effectively re-presses &
then releases the modifier) and finally re-press the original modifier
afterwards. IOW, with Alt_L we need to send
AT set 1: b8, 38, 54 (Down) d4, b8, 38 (Up)
AT set 2: f0 11, 11, 84 (Down) f0 84, f0 11, 11 (Up)
And with Alt_R
AT set 1: e0 b8, e0 38, 54 (Down) d4, e0 b8, e0 38 (Up)
AT set 2: e0 f0 11, e0 11, 84 (Down) f0 84, e0 f0 11, e0 11 (Up)
The AT set 3 scancodes have no special handling for Alt-Print.
Rather than fixing the handling of the 'print' key in the ps2 driver to consider
the Alt modifiers, way back, a patch was commited that defined an extra 'sysrq'
key name:
commit f2289cb6924afc97b2a75d21bfc9217024d11741
Author: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed Jun 4 10:14:16 2008 +0000
Add sysrq to key names known by "sendkey".
Adding sysrq keycode to the table enabling running sysrq debugging in
the guest via the monitor sendkey command, like:
(qemu) sendkey alt-sysrq-t
Tested on x86-64 target and Linux guest.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
With this patch QEMU would send
AT set 1: 38, 54 (Down) d4, b8 (Up)
AT set 2: 11, 84 (Down) f0 84, f0 11 (Up)
but this doesn't match what actual real keyboards send, as it is not releasing
the original modifier & pressing it again afterwards. In addition the original
problem remains, and a new problem was added:
- The sequence 'alt-print-t' is still broken, acting as if 'print-t' was
requested
- The sequence 'sysrq-t' is broken, injecting an undefine scancode sequence
tot he guest os (bare 0x54)
To deal with this mess we make these changes to the ps2 code, so that we track
the state of modifier keys (Alt, Shift, Ctrl - both left & right). Then we can
vary what scancodes are sent for Q_KEY_CODE_PRINT according to the Alt key
modifier state
Interestingly, it appears that of operating systems I've checked (Linux, FreeBSD
and OpenSolaris), none of them actually bother to validate the full sequences
for a unmodified 'Print' key. They all just ignore the leading "e0 2a" and
trigger based off "e0 37" alone. The latter two byte sequence is what keyboards
send with 'Print' is combined with 'Shift' or 'Ctrl' modifiers.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20171019142848.572-5-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2017-10-19 16:28:43 +02:00
|
|
|
s->modifiers = 0;
|
2009-07-15 03:30:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ps2_mouse_reset(void *opaque)
|
|
|
|
{
|
|
|
|
PS2MouseState *s = (PS2MouseState *) opaque;
|
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_mouse_reset(opaque);
|
2009-07-15 03:30:53 +02:00
|
|
|
ps2_common_reset(&s->common);
|
|
|
|
s->mouse_status = 0;
|
|
|
|
s->mouse_resolution = 0;
|
|
|
|
s->mouse_sample_rate = 0;
|
|
|
|
s->mouse_wrap = 0;
|
|
|
|
s->mouse_type = 0;
|
|
|
|
s->mouse_detect_state = 0;
|
|
|
|
s->mouse_dx = 0;
|
|
|
|
s->mouse_dy = 0;
|
|
|
|
s->mouse_dz = 0;
|
|
|
|
s->mouse_buttons = 0;
|
|
|
|
}
|
|
|
|
|
2009-08-20 19:42:36 +02:00
|
|
|
static const VMStateDescription vmstate_ps2_common = {
|
|
|
|
.name = "PS2 Common State",
|
|
|
|
.version_id = 3,
|
|
|
|
.minimum_version_id = 2,
|
2014-04-16 15:32:32 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2009-08-20 19:42:36 +02:00
|
|
|
VMSTATE_INT32(write_cmd, PS2State),
|
|
|
|
VMSTATE_INT32(queue.rptr, PS2State),
|
|
|
|
VMSTATE_INT32(queue.wptr, PS2State),
|
|
|
|
VMSTATE_INT32(queue.count, PS2State),
|
|
|
|
VMSTATE_BUFFER(queue.data, PS2State),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
2005-11-26 11:36:25 +01:00
|
|
|
|
2011-10-17 13:37:34 +02:00
|
|
|
static bool ps2_keyboard_ledstate_needed(void *opaque)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = opaque;
|
|
|
|
|
|
|
|
return s->ledstate != 0; /* 0 is default state */
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ps2_kbd_ledstate_post_load(void *opaque, int version_id)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = opaque;
|
|
|
|
|
|
|
|
kbd_put_ledstate(s->ledstate);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const VMStateDescription vmstate_ps2_keyboard_ledstate = {
|
|
|
|
.name = "ps2kbd/ledstate",
|
|
|
|
.version_id = 3,
|
|
|
|
.minimum_version_id = 2,
|
|
|
|
.post_load = ps2_kbd_ledstate_post_load,
|
2014-09-23 14:09:54 +02:00
|
|
|
.needed = ps2_keyboard_ledstate_needed,
|
2014-04-16 15:32:32 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2011-10-17 13:37:34 +02:00
|
|
|
VMSTATE_INT32(ledstate, PS2KbdState),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-09-15 22:06:25 +02:00
|
|
|
static bool ps2_keyboard_need_high_bit_needed(void *opaque)
|
|
|
|
{
|
|
|
|
PS2KbdState *s = opaque;
|
|
|
|
return s->need_high_bit != 0; /* 0 is the usual state */
|
|
|
|
}
|
|
|
|
|
|
|
|
static const VMStateDescription vmstate_ps2_keyboard_need_high_bit = {
|
|
|
|
.name = "ps2kbd/need_high_bit",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
|
|
|
.needed = ps2_keyboard_need_high_bit_needed,
|
|
|
|
.fields = (VMStateField[]) {
|
|
|
|
VMSTATE_BOOL(need_high_bit, PS2KbdState),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2009-09-29 22:48:23 +02:00
|
|
|
static int ps2_kbd_post_load(void* opaque, int version_id)
|
2005-11-26 11:36:25 +01:00
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState*)opaque;
|
2014-04-24 14:06:19 +02:00
|
|
|
PS2State *ps2 = &s->common;
|
2006-04-08 16:12:31 +02:00
|
|
|
|
2009-09-29 22:48:23 +02:00
|
|
|
if (version_id == 2)
|
2008-03-18 07:54:34 +01:00
|
|
|
s->scancode_set=2;
|
2014-04-24 14:06:19 +02:00
|
|
|
|
|
|
|
ps2_common_post_load(ps2);
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-09-25 13:29:12 +02:00
|
|
|
static int ps2_kbd_pre_save(void *opaque)
|
2014-04-24 14:06:19 +02:00
|
|
|
{
|
|
|
|
PS2KbdState *s = (PS2KbdState *)opaque;
|
|
|
|
PS2State *ps2 = &s->common;
|
|
|
|
|
|
|
|
ps2_common_post_load(ps2);
|
2017-09-25 13:29:12 +02:00
|
|
|
|
|
|
|
return 0;
|
2014-04-24 14:06:19 +02:00
|
|
|
}
|
|
|
|
|
2009-08-20 19:42:36 +02:00
|
|
|
static const VMStateDescription vmstate_ps2_keyboard = {
|
|
|
|
.name = "ps2kbd",
|
|
|
|
.version_id = 3,
|
2009-09-29 22:48:23 +02:00
|
|
|
.minimum_version_id = 2,
|
|
|
|
.post_load = ps2_kbd_post_load,
|
2014-04-24 14:06:19 +02:00
|
|
|
.pre_save = ps2_kbd_pre_save,
|
2014-04-16 15:32:32 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2009-08-20 19:42:36 +02:00
|
|
|
VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State),
|
|
|
|
VMSTATE_INT32(scan_enabled, PS2KbdState),
|
|
|
|
VMSTATE_INT32(translate, PS2KbdState),
|
|
|
|
VMSTATE_INT32_V(scancode_set, PS2KbdState,3),
|
|
|
|
VMSTATE_END_OF_LIST()
|
2011-10-17 13:37:34 +02:00
|
|
|
},
|
2014-09-23 14:09:54 +02:00
|
|
|
.subsections = (const VMStateDescription*[]) {
|
|
|
|
&vmstate_ps2_keyboard_ledstate,
|
2016-09-15 22:06:25 +02:00
|
|
|
&vmstate_ps2_keyboard_need_high_bit,
|
2014-09-23 14:09:54 +02:00
|
|
|
NULL
|
2009-08-20 19:42:36 +02:00
|
|
|
}
|
|
|
|
};
|
2006-04-08 16:12:31 +02:00
|
|
|
|
2014-04-24 14:06:19 +02:00
|
|
|
static int ps2_mouse_post_load(void *opaque, int version_id)
|
|
|
|
{
|
|
|
|
PS2MouseState *s = (PS2MouseState *)opaque;
|
|
|
|
PS2State *ps2 = &s->common;
|
|
|
|
|
|
|
|
ps2_common_post_load(ps2);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-09-25 13:29:12 +02:00
|
|
|
static int ps2_mouse_pre_save(void *opaque)
|
2014-04-24 14:06:19 +02:00
|
|
|
{
|
|
|
|
PS2MouseState *s = (PS2MouseState *)opaque;
|
|
|
|
PS2State *ps2 = &s->common;
|
|
|
|
|
|
|
|
ps2_common_post_load(ps2);
|
2017-09-25 13:29:12 +02:00
|
|
|
|
|
|
|
return 0;
|
2014-04-24 14:06:19 +02:00
|
|
|
}
|
|
|
|
|
2009-08-20 19:42:36 +02:00
|
|
|
static const VMStateDescription vmstate_ps2_mouse = {
|
|
|
|
.name = "ps2mouse",
|
|
|
|
.version_id = 2,
|
|
|
|
.minimum_version_id = 2,
|
2014-04-24 14:06:19 +02:00
|
|
|
.post_load = ps2_mouse_post_load,
|
|
|
|
.pre_save = ps2_mouse_pre_save,
|
2014-04-16 15:32:32 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2009-08-20 19:42:36 +02:00
|
|
|
VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State),
|
|
|
|
VMSTATE_UINT8(mouse_status, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_resolution, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_sample_rate, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_wrap, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_type, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_detect_state, PS2MouseState),
|
|
|
|
VMSTATE_INT32(mouse_dx, PS2MouseState),
|
|
|
|
VMSTATE_INT32(mouse_dy, PS2MouseState),
|
|
|
|
VMSTATE_INT32(mouse_dz, PS2MouseState),
|
|
|
|
VMSTATE_UINT8(mouse_buttons, PS2MouseState),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
}
|
|
|
|
};
|
2005-11-26 11:36:25 +01:00
|
|
|
|
2014-03-13 12:39:38 +01:00
|
|
|
static QemuInputHandler ps2_keyboard_handler = {
|
|
|
|
.name = "QEMU PS/2 Keyboard",
|
|
|
|
.mask = INPUT_EVENT_MASK_KEY,
|
|
|
|
.event = ps2_keyboard_event,
|
|
|
|
};
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg)
|
|
|
|
{
|
2011-08-21 05:09:37 +02:00
|
|
|
PS2KbdState *s = (PS2KbdState *)g_malloc0(sizeof(PS2KbdState));
|
2005-11-26 11:36:25 +01:00
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_kbd_init(s);
|
2005-11-26 11:36:25 +01:00
|
|
|
s->common.update_irq = update_irq;
|
|
|
|
s->common.update_arg = update_arg;
|
2008-03-18 07:54:34 +01:00
|
|
|
s->scancode_set = 2;
|
2010-06-25 19:09:07 +02:00
|
|
|
vmstate_register(NULL, 0, &vmstate_ps2_keyboard, s);
|
2014-03-13 12:39:38 +01:00
|
|
|
qemu_input_handler_register((DeviceState *)s,
|
|
|
|
&ps2_keyboard_handler);
|
2009-07-15 03:30:53 +02:00
|
|
|
qemu_register_reset(ps2_kbd_reset, s);
|
2005-11-26 11:36:25 +01:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2014-03-13 12:58:29 +01:00
|
|
|
static QemuInputHandler ps2_mouse_handler = {
|
|
|
|
.name = "QEMU PS/2 Mouse",
|
|
|
|
.mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
|
|
|
|
.event = ps2_mouse_event,
|
|
|
|
.sync = ps2_mouse_sync,
|
|
|
|
};
|
|
|
|
|
2005-11-26 11:36:25 +01:00
|
|
|
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg)
|
|
|
|
{
|
2011-08-21 05:09:37 +02:00
|
|
|
PS2MouseState *s = (PS2MouseState *)g_malloc0(sizeof(PS2MouseState));
|
2005-11-26 11:36:25 +01:00
|
|
|
|
2015-01-16 20:21:37 +01:00
|
|
|
trace_ps2_mouse_init(s);
|
2005-11-26 11:36:25 +01:00
|
|
|
s->common.update_irq = update_irq;
|
|
|
|
s->common.update_arg = update_arg;
|
2010-06-25 19:09:07 +02:00
|
|
|
vmstate_register(NULL, 0, &vmstate_ps2_mouse, s);
|
2014-03-13 12:58:29 +01:00
|
|
|
qemu_input_handler_register((DeviceState *)s,
|
|
|
|
&ps2_mouse_handler);
|
2009-07-15 03:30:53 +02:00
|
|
|
qemu_register_reset(ps2_mouse_reset, s);
|
2005-11-26 11:36:25 +01:00
|
|
|
return s;
|
|
|
|
}
|