haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

adb: keep track of devices with pending data

Browse source 
Add a new pending variable to ADBBusState which is a bitmask indicating which
ADB devices have data to send. Update the bitmask every time that an ADB
request is executed.

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-13-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2020-06-23 21:49:26 +01:00
parent 969ca2f7a1
commit 244a0ee965
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
hw/input/adb.c
View file

@ -41,6 +41,7 @@ static void adb_device_reset(ADBDevice *d)
int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
{
ADBDevice *d;
ADBDeviceClass *adc;
int devaddr, cmd, i;
cmd = buf[0] & 0xf;
@ -51,14 +52,27 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
}
return 0;
}
s->pending = 0;
for (i = 0; i < s->nb_devices; i++) {
d = s->devices[i];
adc = ADB_DEVICE_GET_CLASS(d);
if (adc->devhasdata(d)) {
s->pending |= (1 << d->devaddr);
}
}
devaddr = buf[0] >> 4;
for (i = 0; i < s->nb_devices; i++) {
d = s->devices[i];
adc = ADB_DEVICE_GET_CLASS(d);
if (d->devaddr == devaddr) {
ADBDeviceClass *adc = ADB_DEVICE_GET_CLASS(d);
return adc->devreq(d, obuf, buf, len);
}
}
return ADB_RET_NOTPRESENT;
}

1
include/hw/input/adb.h
View file

@ -76,6 +76,7 @@ struct ADBBusState {
/*< public >*/
ADBDevice *devices[MAX_ADB_DEVICES];
uint16_t pending;
int nb_devices;
int poll_index;