pckbd: Convert DPRINTF->trace
PATCH 1/1 pckbd: Convert DPRINTF->trace
From: "Dr. David Alan Gilbert" <[email protected]>
Signed-off-by Dr. David Alan Gilbert <[email protected]>
--- hw/input/pckbd.c | 19 ++++++------------- hw/input/trace-events | 7 +++++++ 2 files changed, 13 insertions(+), 13 deletions(-)
hw/input/pckbd.c +6 -13
@@ -30,14 +30,7 @@#include "hw/input/i8042.h" #include "sysemu/sysemu.h" -/* debug PC keyboard */ -//#define DEBUG_KBD -#ifdef DEBUG_KBD -#define DPRINTF (fmt, ...) \ - do { printf("KBD: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF (fmt, ...) -#endif +#include "trace.h" /* Keyboard Controller Commands */ #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;int val; val = s->status; -DPRINTF ("kbd: read status=0x%02x\n" , val); +trace_pckbd_kbd_read_status (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) { -DPRINTF ("kbd: write outport=0x%02x\n" , val); +trace_pckbd_outport_write (val); s->outport = val;qemu_set_irq (s->a20_out, (val >>1 ) &1 );if (!(val &1 )) {
@@ -237,7 +230,7 @@ static void kbd_write_command(void *opaque, hwaddr addr, {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 * 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 val =ps2_read_data (s->kbd); -DPRINTF ("kbd: read data=0x%02x\n" , val); +trace_pckbd_kbd_read_data (val);return val; }
@@ -335,7 +328,7 @@ static void kbd_write_data(void *opaque, hwaddr addr, {KBDState *s = opaque; -DPRINTF ("kbd: write data=0x%02" PRIx64"\n" , val); +trace_pckbd_kbd_write_data (val);switch (s->write_cmd) {case 0 :
hw/input/trace-events +7 -0
@@ -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_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 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"
Signature · 1 line
2.19.1
Quoted 78 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/input/pckbd.c | 19 ++++++------------- hw/input/trace-events | 7 +++++++ 2 files changed, 13 insertions(+), 13 deletions(-)hw/input/pckbd.c +6
-13@@ -30,14 +30,7 @@#include "hw/input/i8042.h" #include "sysemu/sysemu.h" -/* debug PC keyboard */ -//#define DEBUG_KBD -#ifdef DEBUG_KBD -#define DPRINTF (fmt, ...) \ - do { printf("KBD: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF (fmt, ...) -#endif +#include "trace.h" /* Keyboard Controller Commands */ #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;int val; val = s->status; -DPRINTF ("kbd: read status=0x%02x\n" , val); +trace_pckbd_kbd_read_status (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) { -DPRINTF ("kbd: write outport=0x%02x\n" , val); +trace_pckbd_outport_write (val); s->outport = val;qemu_set_irq (s->a20_out, (val >>1 ) &1 );if (!(val &1 )) {@@ -237,7 +230,7 @@ static void kbd_write_command(void *opaque, hwaddr addr, {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 * 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 val =ps2_read_data (s->kbd); -DPRINTF ("kbd: read data=0x%02x\n" , val); +trace_pckbd_kbd_read_data (val);return val; }@@ -335,7 +328,7 @@ static void kbd_write_data(void *opaque, hwaddr addr, {KBDState *s = opaque; -DPRINTF ("kbd: write data=0x%02" PRIx64"\n" , val); +trace_pckbd_kbd_write_data (val);switch (s->write_cmd) {case 0 :hw/input/trace-events +0
-0
hw/input/trace-events adb_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x o · line 18
Quoted 5 lines
hw/input/trace-events +2
-0@@ -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_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"
I usually prefer same read/write pairs, but that doesn't matter here.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 9 lines
hw/input/trace-events +5
-0+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 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"
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/input/pckbd.c | 19 ++++++------------- hw/input/trace-events | 7 +++++++ 2 files changed, 13 insertions(+), 13 deletions(-)
Reviewed-by Stefan Hajnoczi <[email protected]>