diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2018-06-12 17:44:00 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-06-16 16:32:33 +1000 |
| commit | fb6649f172d6ea1a8d8980b7f93d31808eb06ff8 (patch) | |
| tree | 8f729386dc912acf16ced60ebeb07046e3752ea4 /hw/input | |
| parent | 8f55ac13049f3c737373d9de8598a2a03e6a03f9 (diff) | |
| download | qemu-fb6649f172d6ea1a8d8980b7f93d31808eb06ff8.zip qemu-fb6649f172d6ea1a8d8980b7f93d31808eb06ff8.tar.gz qemu-fb6649f172d6ea1a8d8980b7f93d31808eb06ff8.tar.bz2 | |
adb: fix read reg 3 byte ordering
According to the Apple ADB documentation, register 3 is a 2-byte register
with the device address in the first byte, and the handler ID in the second
byte.
This is currently the opposite away to which QEMU returns them so switch the
order around.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/adb-kbd.c | 4 | ||||
| -rw-r--r-- | hw/input/adb-mouse.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index 50b6271..0ad384d 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.c @@ -290,8 +290,8 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf, olen = 2; break; case 3: - obuf[0] = d->handler; - obuf[1] = d->devaddr; + obuf[0] = d->devaddr; + obuf[1] = d->handler; olen = 2; break; } diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c index 3ba6027..473045f 100644 --- a/hw/input/adb-mouse.c +++ b/hw/input/adb-mouse.c @@ -172,8 +172,8 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf, case 1: break; case 3: - obuf[0] = d->handler; - obuf[1] = d->devaddr; + obuf[0] = d->devaddr; + obuf[1] = d->handler; olen = 2; break; } |