Commit 9d9769c2 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

adb: add trace-events for monitoring keyboard/mouse during bus enumeration 



This is useful to help diagnose problems related to address clashes during
MacOS 9 boot.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8d622594

hw/input/adb-kbd.c

+4 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf, 
            case ADB_CMD_CHANGE_ID_AND_ACT:

            case ADB_CMD_CHANGE_ID_AND_ENABLE:

                d->devaddr = buf[1] & 0xf;

                trace_adb_kbd_request_change_addr(d->devaddr);

                break;

            default:

                d->devaddr = buf[1] & 0xf;
@@ -269,6 +270,9 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf, 
                if (buf[2] == 1 || buf[2] == 2 || buf[2] == 3) {

                    d->handler = buf[2];

                }



                trace_adb_kbd_request_change_addr_and_handler(d->devaddr,

                                                              d->handler);

                break;

            }

        }

hw/input/adb-mouse.c

+5 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf, 
        s->dx = 0;

        s->dy = 0;

        s->dz = 0;

        trace_adb_mouse_flush();

        return 0;

    }
@@ -138,6 +139,7 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf, 
            case ADB_CMD_CHANGE_ID_AND_ACT:

            case ADB_CMD_CHANGE_ID_AND_ENABLE:

                d->devaddr = buf[1] & 0xf;

                trace_adb_mouse_request_change_addr(d->devaddr);

                break;

            default:

                d->devaddr = buf[1] & 0xf;
@@ -155,6 +157,9 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf, 
                if (buf[2] == 1 || buf[2] == 2) {

                    d->handler = buf[2];

                }



                trace_adb_mouse_request_change_addr_and_handler(d->devaddr,

                                                                d->handler);

                break;

            }

        }

hw/input/trace-events

+5 −0
Original line number Diff line number Diff line
@@ -4,10 +4,15 @@ 
adb_kbd_no_key(void) "Ignoring NO_KEY"

adb_kbd_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x"

adb_kbd_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x"

adb_kbd_request_change_addr(int devaddr) "change addr to 0x%x"

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



# hw/input/adb-mouse.c

adb_mouse_flush(void) "flush"

adb_mouse_writereg(int reg, uint8_t val) "reg %d val 0x%2.2x"

adb_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x"

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/ps2.c

ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x"