OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

-----BEGIN PGP SIGNATURE----- 

Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJZTO/aAAoJEEy22O7T6HE4vm8P/0/ktwyKKzjMFQDT34rw5FO7
 Mdpn36zHvzWjDxxH7N6AnXsevSb/1D8Zv7r2q8/5RtirGm8obNy/bt8rs2BR9VZp
 AmuobuBmotISlExhfWycR4lzUw1w5FUj/43A2lrhGlBFnRk6WaF8lIuqbyL7cQRC
 nCIibkW6d6Y82qVmuQ5KnXUIX0oxAjzgFx6Jz79nFQQNtjmlau1qxagdWEa6wNOE
 Ya/c/pdK7R+XapaNdf6OnXTUc9P8+vmuTLLIAlzCfE/2mDaPIVlU1ZUkhgwqCmLW
 WZBE3pLxV77WMT03DIEVGzqI5wUrEe+KJ4c9+Vi9BMJsQ6bERTH5npMBoky1a54p
 GRquNmfl4wHYki5ePfTZnF0xVi7S1LHylHroxKrGTElXDgxU9AGBhhz4nSCmzHgO
 mJhBIdEfOTHqFvtXnDKD8A7NEAZ7rX68HiHE7MZoPJsrojhwTFQ6OoYBbMviVOhG
 7UlNNhyjHmHZs+8gM1WW1A/gFi8o2iHKJ2ZCr/uKWEWXUK39Opz/aZNdcSoh96k8
 scoC0JFRNvec+8A/lmIVAp0awyDYZc9El5ed8Ec9TkLGwEzPo8zoLIyQu1yLtgAa
 i1fq6RrthG4I8SsUwqQIsW8+jVn+9b/j1c6FfzI8CrEn0Zy8Fg5ur271v8ux8aVS
 gF/qoX91cTrmCHUe+E2+
 =9XLk
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/ui-and-input-20170623-pull-request' into staging

# gpg: Signature made Fri 23 Jun 2017 11:39:22 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-and-input-20170623-pull-request:
  ps2: reset queue in ps2_reset_keyboard
  ps2: add ps2_reset_queue
  ps2: add and use PS2State typedef
  sdl2: add assert to make coverity happy
  hid: Reset kbd modifiers on reset
  input: Decrement queue count on kbd delay
  keymaps: add tracing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-06-23 12:00:21 +01:00
parent 4c8c1cc544 6e24ee0c1e
commit 40b06f5230
8 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/input/hid.c
View File

@ -487,6 +487,7 @@ void hid_reset(HIDState *hs)
memset(hs->kbd.keycodes, 0, sizeof(hs->kbd.keycodes));
memset(hs->kbd.key, 0, sizeof(hs->kbd.key));
hs->kbd.keys = 0;
hs->kbd.modifiers = 0;
break;
case HID_MOUSE:
case HID_TABLET:

28
hw/input/ps2.c
View File

@ -85,12 +85,12 @@ typedef struct {
int rptr, wptr, count;
} PS2Queue;
typedef struct {
struct PS2State {
PS2Queue queue;
int32_t write_cmd;
void (*update_irq)(void *, int);
void *update_arg;
} PS2State;
};
typedef struct {
PS2State common;
@ -551,9 +551,17 @@ static uint8_t translate_table[256] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
};
void ps2_queue(void *opaque, int b)
static void ps2_reset_queue(PS2State *s)
{
PS2Queue *q = &s->queue;
q->rptr = 0;
q->wptr = 0;
q->count = 0;
}
void ps2_queue(PS2State *s, int b)
{
PS2State *s = (PS2State *)opaque;
PS2Queue *q = &s->queue;
if (q->count >= PS2_QUEUE_SIZE - 1)
@ -692,13 +700,12 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
}
}
uint32_t ps2_read_data(void *opaque)
uint32_t ps2_read_data(PS2State *s)
{
PS2State *s = (PS2State *)opaque;
PS2Queue *q;
int val, index;
trace_ps2_read_data(opaque);
trace_ps2_read_data(s);
q = &s->queue;
if (q->count == 0) {
/* NOTE: if no data left, we return the last keyboard one
@ -733,6 +740,7 @@ static void ps2_reset_keyboard(PS2KbdState *s)
trace_ps2_reset_keyboard(s);
s->scan_enabled = 1;
s->scancode_set = 2;
ps2_reset_queue(&s->common);
ps2_set_ledstate(s, 0);
}
@ -1081,12 +1089,8 @@ void ps2_write_mouse(void *opaque, int val)
static void ps2_common_reset(PS2State *s)
{
PS2Queue *q;
s->write_cmd = -1;
q = &s->queue;
q->rptr = 0;
q->wptr = 0;
q->count = 0;
ps2_reset_queue(s);
s->update_irq(s->update_arg, 0);
}

4
include/hw/input/ps2.h
View File

@ -36,8 +36,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
void ps2_write_mouse(void *, int val);
void ps2_write_keyboard(void *, int val);
uint32_t ps2_read_data(void *);
void ps2_queue(void *, int b);
uint32_t ps2_read_data(PS2State *s);
void ps2_queue(PS2State *s, int b);
void ps2_keyboard_set_translation(void *opaque, int mode);
void ps2_mouse_fake_event(void *opaque);

1
include/qemu/typedefs.h
View File

@ -76,6 +76,7 @@ typedef struct PixelFormat PixelFormat;
typedef struct PostcopyDiscardState PostcopyDiscardState;
typedef struct Property Property;
typedef struct PropertyInfo PropertyInfo;
typedef struct PS2State PS2State;
typedef struct QEMUBH QEMUBH;
typedef struct QemuConsole QemuConsole;
typedef struct QEMUFile QEMUFile;

1
ui/input.c
View File

@ -256,6 +256,7 @@ static void qemu_input_queue_process(void *opaque)
item = QTAILQ_FIRST(queue);
g_assert(item->type == QEMU_INPUT_QUEUE_DELAY);
QTAILQ_REMOVE(queue, item, node);
queue_count--;
g_free(item);
while (!QTAILQ_EMPTY(queue)) {

33
ui/keymaps.c
View File

@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "keymaps.h"
#include "sysemu/sysemu.h"
#include "trace.h"
static int get_keysym(const name2keysym_t *table,
const char *name)
@ -71,18 +72,14 @@ static void add_to_key_range(struct key_range **krp, int code) {
static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) {
if (keysym < MAX_NORMAL_KEYCODE) {
/* fprintf(stderr,"Setting keysym %s (%d) to %d\n",
line, keysym, keycode); */
trace_keymap_add("normal", keysym, keycode, line);
k->keysym2keycode[keysym] = keycode;
} else {
if (k->extra_count >= MAX_EXTRA_COUNT) {
fprintf(stderr, "Warning: Could not assign keysym %s (0x%x)"
" because of memory constraints.\n", line, keysym);
} else {
#if 0
fprintf(stderr, "Setting %d: %d,%d\n",
k->extra_count, keysym, keycode);
#endif
trace_keymap_add("extra", keysym, keycode, line);
k->keysym2keycode_extra[k->extra_count].
keysym = keysym;
k->keysym2keycode_extra[k->extra_count].
@ -99,9 +96,11 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
FILE *f;
char * filename;
char line[1024];
char keyname[64];
int len;
filename = qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language);
trace_keymap_parse(filename);
f = filename ? fopen(filename, "r") : NULL;
g_free(filename);
if (!f) {
@ -130,18 +129,21 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
if (!strncmp(line, "include ", 8)) {
parse_keyboard_layout(table, line + 8, k);
} else {
char *end_of_keysym = line;
while (*end_of_keysym != 0 && *end_of_keysym != ' ') {
end_of_keysym++;
int offset = 0;
while (line[offset] != 0 &&
line[offset] != ' ' &&
offset < sizeof(keyname) - 1) {
keyname[offset] = line[offset];
offset++;
}
if (*end_of_keysym) {
keyname[offset] = 0;
if (strlen(keyname)) {
int keysym;
*end_of_keysym = 0;
keysym = get_keysym(table, line);
keysym = get_keysym(table, keyname);
if (keysym == 0) {
/* fprintf(stderr, "Warning: unknown keysym %s\n", line);*/
} else {
const char *rest = end_of_keysym + 1;
const char *rest = line + offset + 1;
int keycode = strtol(rest, NULL, 0);
if (strstr(rest, "numlock")) {
@ -165,10 +167,10 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
if (strstr(rest, "addupper")) {
char *c;
for (c = line; *c; c++) {
for (c = keyname; *c; c++) {
*c = qemu_toupper(*c);
}
keysym = get_keysym(table, line);
keysym = get_keysym(table, keyname);
if (keysym) {
add_keysym(line, keysym,
keycode | SCANCODE_SHIFT, k);
@ -194,6 +196,7 @@ int keysym2scancode(void *kbd_layout, int keysym)
kbd_layout_t *k = kbd_layout;
if (keysym < MAX_NORMAL_KEYCODE) {
if (k->keysym2keycode[keysym] == 0) {
trace_keymap_unmapped(keysym);
fprintf(stderr, "Warning: no scancode found for keysym %d\n",
keysym);
}

1
ui/sdl2.c
View File

@ -804,6 +804,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs);
for (i = 0; i < sdl2_num_outputs; i++) {
QemuConsole *con = qemu_console_lookup_by_index(i);
assert(con != NULL);
if (!qemu_console_is_graphic(con)) {
sdl2_console[i].hidden = true;
}

5
ui/trace-events
View File

@ -46,3 +46,8 @@ qemu_spice_create_primary_surface(int qid, uint32_t sid, void *surface, int asyn
qemu_spice_destroy_primary_surface(int qid, uint32_t sid, int async) "%d sid=%u async=%d"
qemu_spice_wakeup(uint32_t qid) "%d"
qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "lr %d -> %d, tb -> %d -> %d"
# ui/keymaps.c
keymap_parse(const char *file) "file %s"
keymap_add(const char *type, int sym, int code, const char *line) "%-6s sym=0x%04x code=0x%04x (line: %s)"
keymap_unmapped(int sym) "sym=0x%04x"