Commit e590e7f0 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

adb: add ADB bus trace events 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20200623204936.24064-23-mark.cave-ayland@ilande.co.uk>
parent fa6c9539

hw/input/adb.c

+20 −1
Original line number Diff line number Diff line
@@ -29,10 +29,18 @@ 
#include "qemu/module.h"

#include "qemu/timer.h"

#include "adb-internal.h"

#include "trace.h"



/* error codes */

#define ADB_RET_NOTPRESENT (-2)



static const char *adb_commands[] = {

    "RESET", "FLUSH", "(Reserved 0x2)", "(Reserved 0x3)",

    "Reserved (0x4)", "(Reserved 0x5)", "(Reserved 0x6)", "(Reserved 0x7)",

    "LISTEN r0", "LISTEN r1", "LISTEN r2", "LISTEN r3",

    "TALK r0", "TALK r1", "TALK r2", "TALK r3",

};



static void adb_device_reset(ADBDevice *d)

{

    qdev_reset_all(DEVICE(d));
@@ -86,9 +94,16 @@ static int do_adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, 


int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)

{

    int ret;



    trace_adb_bus_request(buf[0] >> 4, adb_commands[buf[0] & 0xf], len);



    assert(s->autopoll_blocked);



    return do_adb_request(s, obuf, buf, len);

    ret = do_adb_request(s, obuf, buf, len);



    trace_adb_bus_request_done(buf[0] >> 4, adb_commands[buf[0] & 0xf], ret);

    return ret;

}



int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t poll_mask)
@@ -161,6 +176,7 @@ void adb_set_autopoll_mask(ADBBusState *s, uint16_t mask) 
void adb_autopoll_block(ADBBusState *s)

{

    s->autopoll_blocked = true;

    trace_adb_bus_autopoll_block(s->autopoll_blocked);



    if (s->autopoll_enabled) {

        timer_del(s->autopoll_timer);
@@ -170,6 +186,7 @@ void adb_autopoll_block(ADBBusState *s) 
void adb_autopoll_unblock(ADBBusState *s)

{

    s->autopoll_blocked = false;

    trace_adb_bus_autopoll_block(s->autopoll_blocked);



    if (s->autopoll_enabled) {

        timer_mod(s->autopoll_timer,
@@ -183,7 +200,9 @@ static void adb_autopoll(void *opaque) 
    ADBBusState *s = opaque;



    if (!s->autopoll_blocked) {

        trace_adb_bus_autopoll_cb(s->autopoll_mask);

        s->autopoll_cb(s->autopoll_cb_opaque);

        trace_adb_bus_autopoll_cb_done(s->autopoll_mask);

    }



    timer_mod(s->autopoll_timer,

hw/input/trace-events

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ adb_device_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x 
adb_device_mouse_request_change_addr(int devaddr) "change addr to 0x%x"

adb_device_mouse_request_change_addr_and_handler(int devaddr, int handler) "change addr and handler to 0x%x, 0x%x"



# adb.c

adb_bus_request(uint8_t addr, const char *cmd, int size) "device 0x%x %s cmdsize=%d"

adb_bus_request_done(uint8_t addr, const char *cmd, int size) "device 0x%x %s replysize=%d"

adb_bus_autopoll_block(bool blocked) "blocked: %d"

adb_bus_autopoll_cb(uint16_t mask) "executing autopoll_cb with autopoll mask 0x%x"

adb_bus_autopoll_cb_done(uint16_t mask) "done executing autopoll_cb with autopoll mask 0x%x"



# pckbd.c

pckbd_kbd_read_data(uint32_t val) "0x%02x"

pckbd_kbd_read_status(int status) "0x%02x"