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

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: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20200623204936.24064-21-mark.cave-ayland@ilande.co.uk>
parent 975fcedd

hw/input/adb.c

+5 −2
Original line number Diff line number Diff line
@@ -86,10 +86,11 @@ 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)

{

    assert(s->autopoll_blocked);



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

}



/* XXX: move that to cuda ? */

int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t poll_mask)

{

    ADBDevice *d;
@@ -181,7 +182,9 @@ static void adb_autopoll(void *opaque) 
{

    ADBBusState *s = opaque;



    if (!s->autopoll_blocked) {

        s->autopoll_cb(s->autopoll_cb_opaque);

    }



    timer_mod(s->autopoll_timer,

              qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +

hw/misc/mac_via.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

    }



    m->adb_data_in_index = 0;

    m->adb_data_out_index = 0;