diff options
| author | Mark Cave-Ayland | 2020-06-23 22:49:34 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2020-06-26 11:13:52 +0200 |
| commit | 913f47ef96990fc72135ec604b6bb1fe2d1e389a (patch) | |
| tree | 4f1179ad28c0d891952e4d343595cfbe0f5e3207 /hw/misc | |
| parent | mac_via: rework ADB state machine to be compatible with both MacOS and Linux (diff) | |
| download | qemu-913f47ef96990fc72135ec604b6bb1fe2d1e389a.tar.gz qemu-913f47ef96990fc72135ec604b6bb1fe2d1e389a.tar.xz qemu-913f47ef96990fc72135ec604b6bb1fe2d1e389a.zip | |
adb: only call autopoll callbacks when autopoll is not blocked
Handle this at the ADB bus level so that individual implementations do not need
to handle this themselves.
Finally add an assert() into adb_request() to prevent developers from accidentally
making an explicit ADB request without blocking autopoll.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200623204936.24064-21-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/mac_via.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 71b6f92645..d76d7b28d3 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -615,11 +615,7 @@ static void adb_via_poll(void *opaque) * received, however we must block autopoll until the point where * the entire reply has been read back to the host */ - if (adb_bus->autopoll_blocked) { - return; - } else { - adb_autopoll_block(adb_bus); - } + adb_autopoll_block(adb_bus); m->adb_data_in_index = 0; m->adb_data_out_index = 0; |