jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

adb: use adb_device prefix for ADB device trace events

This is to allow us to distinguish between ADB device events and ADB
bus events separately.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200623204936.24064-22-mark.cave-ayland@ilande.co.uk>

Mark Cave-Ayland fa6c9539 913f47ef

+22 -22
+6 -6
hw/input/adb-kbd.c
··· 243 243 olen = 0; 244 244 switch (cmd) { 245 245 case ADB_WRITEREG: 246 - trace_adb_kbd_writereg(reg, buf[1]); 246 + trace_adb_device_kbd_writereg(reg, buf[1]); 247 247 switch (reg) { 248 248 case 2: 249 249 /* LED status */ ··· 256 256 case ADB_CMD_CHANGE_ID_AND_ACT: 257 257 case ADB_CMD_CHANGE_ID_AND_ENABLE: 258 258 d->devaddr = buf[1] & 0xf; 259 - trace_adb_kbd_request_change_addr(d->devaddr); 259 + trace_adb_device_kbd_request_change_addr(d->devaddr); 260 260 break; 261 261 default: 262 262 d->devaddr = buf[1] & 0xf; ··· 270 270 d->handler = buf[2]; 271 271 } 272 272 273 - trace_adb_kbd_request_change_addr_and_handler(d->devaddr, 274 - d->handler); 273 + trace_adb_device_kbd_request_change_addr_and_handler( 274 + d->devaddr, d->handler); 275 275 break; 276 276 } 277 277 } ··· 294 294 olen = 2; 295 295 break; 296 296 } 297 - trace_adb_kbd_readreg(reg, obuf[0], obuf[1]); 297 + trace_adb_device_kbd_readreg(reg, obuf[0], obuf[1]); 298 298 break; 299 299 } 300 300 return olen; ··· 321 321 /* FIXME: take handler into account when translating qcode */ 322 322 keycode = qcode_to_adb_keycode[qcode]; 323 323 if (keycode == NO_KEY) { /* We don't want to send this to the guest */ 324 - trace_adb_kbd_no_key(); 324 + trace_adb_device_kbd_no_key(); 325 325 return; 326 326 } 327 327 if (evt->u.key.data->down == false) { /* if key release event */
+6 -6
hw/input/adb-mouse.c
··· 121 121 s->dx = 0; 122 122 s->dy = 0; 123 123 s->dz = 0; 124 - trace_adb_mouse_flush(); 124 + trace_adb_device_mouse_flush(); 125 125 return 0; 126 126 } 127 127 ··· 130 130 olen = 0; 131 131 switch (cmd) { 132 132 case ADB_WRITEREG: 133 - trace_adb_mouse_writereg(reg, buf[1]); 133 + trace_adb_device_mouse_writereg(reg, buf[1]); 134 134 switch (reg) { 135 135 case 2: 136 136 break; ··· 152 152 case ADB_CMD_CHANGE_ID_AND_ACT: 153 153 case ADB_CMD_CHANGE_ID_AND_ENABLE: 154 154 d->devaddr = buf[1] & 0xf; 155 - trace_adb_mouse_request_change_addr(d->devaddr); 155 + trace_adb_device_mouse_request_change_addr(d->devaddr); 156 156 break; 157 157 default: 158 158 d->devaddr = buf[1] & 0xf; ··· 172 172 d->handler = buf[2]; 173 173 } 174 174 175 - trace_adb_mouse_request_change_addr_and_handler(d->devaddr, 176 - d->handler); 175 + trace_adb_device_mouse_request_change_addr_and_handler( 176 + d->devaddr, d->handler); 177 177 break; 178 178 } 179 179 } ··· 191 191 olen = 2; 192 192 break; 193 193 } 194 - trace_adb_mouse_readreg(reg, obuf[0], obuf[1]); 194 + trace_adb_device_mouse_readreg(reg, obuf[0], obuf[1]); 195 195 break; 196 196 } 197 197 return olen;
+10 -10
hw/input/trace-events
··· 1 1 # See docs/devel/tracing.txt for syntax documentation. 2 2 3 3 # adb-kbd.c 4 - adb_kbd_no_key(void) "Ignoring NO_KEY" 5 - adb_kbd_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x" 6 - adb_kbd_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x" 7 - adb_kbd_request_change_addr(int devaddr) "change addr to 0x%x" 8 - adb_kbd_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x" 4 + adb_device_kbd_no_key(void) "Ignoring NO_KEY" 5 + adb_device_kbd_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x" 6 + adb_device_kbd_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x" 7 + adb_device_kbd_request_change_addr(int devaddr) "change addr to 0x%x" 8 + adb_device_kbd_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x" 9 9 10 10 # adb-mouse.c 11 - adb_mouse_flush(void) "flush" 12 - adb_mouse_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x" 13 - adb_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x" 14 - adb_mouse_request_change_addr(int devaddr) "change addr to 0x%x" 15 - adb_mouse_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x" 11 + adb_device_mouse_flush(void) "flush" 12 + adb_device_mouse_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x" 13 + adb_device_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x" 14 + adb_device_mouse_request_change_addr(int devaddr) "change addr to 0x%x" 15 + adb_device_mouse_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x" 16 16 17 17 # pckbd.c 18 18 pckbd_kbd_read_data(uint32_t val) "0x%02x"