ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pckbd: Convert DPRINTF->trace 

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20181016112232.23241-1-dgilbert@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Dr. David Alan Gilbert 2018-10-16 12:22:32 +01:00 committed by Laurent Vivier
parent 2911b3d3ab
commit 65b182c379
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/input/pckbd.c
View File

@ -30,14 +30,7 @@
#include "hw/input/i8042.h" #include "hw/input/i8042.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
/* debug PC keyboard */ #include "trace.h"
//#define DEBUG_KBD
#ifdef DEBUG_KBD
#define DPRINTF(fmt, ...) \
do { printf("KBD: " fmt , ## __VA_ARGS__); } while (0)
#else
#define DPRINTF(fmt, ...)
#endif
/* Keyboard Controller Commands */ /* Keyboard Controller Commands */
#define KBD_CCMD_READ_MODE 0x20 /* Read mode bits */ #define KBD_CCMD_READ_MODE 0x20 /* Read mode bits */
@ -210,7 +203,7 @@ static uint64_t kbd_read_status(void *opaque, hwaddr addr,
KBDState *s = opaque; KBDState *s = opaque;
int val; int val;
val = s->status; val = s->status;
DPRINTF("kbd: read status=0x%02x\n", val); trace_pckbd_kbd_read_status(val);
return val; return val;
} }
@ -224,7 +217,7 @@ static void kbd_queue(KBDState *s, int b, int aux)
static void outport_write(KBDState *s, uint32_t val) static void outport_write(KBDState *s, uint32_t val)
{ {
DPRINTF("kbd: write outport=0x%02x\n", val); trace_pckbd_outport_write(val);
s->outport = val; s->outport = val;
qemu_set_irq(s->a20_out, (val >> 1) & 1); qemu_set_irq(s->a20_out, (val >> 1) & 1);
if (!(val & 1)) { if (!(val & 1)) {
@ -237,7 +230,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,
{ {
KBDState *s = opaque; KBDState *s = opaque;
DPRINTF("kbd: write cmd=0x%02" PRIx64 "\n", val); trace_pckbd_kbd_write_command(val);
/* Bits 3-0 of the output port P2 of the keyboard controller may be pulsed /* Bits 3-0 of the output port P2 of the keyboard controller may be pulsed
* low for approximately 6 micro seconds. Bits 3-0 of the KBD_CCMD_PULSE * low for approximately 6 micro seconds. Bits 3-0 of the KBD_CCMD_PULSE
@ -326,7 +319,7 @@ static uint64_t kbd_read_data(void *opaque, hwaddr addr,
else else
val = ps2_read_data(s->kbd); val = ps2_read_data(s->kbd);
DPRINTF("kbd: read data=0x%02x\n", val); trace_pckbd_kbd_read_data(val);
return val; return val;
} }
@ -335,7 +328,7 @@ static void kbd_write_data(void *opaque, hwaddr addr,
{ {
KBDState *s = opaque; KBDState *s = opaque;
DPRINTF("kbd: write data=0x%02" PRIx64 "\n", val); trace_pckbd_kbd_write_data(val);
switch(s->write_cmd) { switch(s->write_cmd) {
case 0: case 0:

7
hw/input/trace-events
View File

@ -14,6 +14,13 @@ adb_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x o
adb_mouse_request_change_addr(int devaddr) "change addr to 0x%x" adb_mouse_request_change_addr(int devaddr) "change addr to 0x%x"
adb_mouse_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x" adb_mouse_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x"
# hw/input/pckbd.c
pckbd_kbd_read_data(uint32_t val) "0x%02x"
pckbd_kbd_read_status(int status) "0x%02x"
pckbd_outport_write(uint32_t val) "0x%02x"
pckbd_kbd_write_command(uint64_t val) "0x%02"PRIx64
pckbd_kbd_write_data(uint64_t val) "0x%02"PRIx64
# hw/input/ps2.c # hw/input/ps2.c
ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x" ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x"
ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifier, unsigned int modifiers) "%p qcode %d down %d modifier 0x%x modifiers 0x%x" ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifier, unsigned int modifiers) "%p qcode %d down %d modifier 0x%x modifiers 0x%x"