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

adb: add status field for holding information about the last ADB request

Browse source 
Currently only 2 bits are defined: one to indicate if the request timed out (no
reply) and another to indicate whether the request was the result of an autopoll
operation.

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

14
hw/input/adb.c
View file

@ -42,7 +42,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
{
ADBDevice *d;
ADBDeviceClass *adc;
int devaddr, cmd, i;
int devaddr, cmd, olen, i;
cmd = buf[0] & 0xf;
if (cmd == ADB_BUSRESET) {
@ -50,6 +50,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
d = s->devices[i];
adb_device_reset(d);
}
s->status = 0;
return 0;
}
@ -63,16 +64,22 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
}
}
s->status = 0;
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) {
return adc->devreq(d, obuf, buf, len);
olen = adc->devreq(d, obuf, buf, len);
if (!olen) {
s->status |= ADB_STATUS_BUSTIMEOUT;
}
return olen;
}
}
s->status |= ADB_STATUS_BUSTIMEOUT;
return ADB_RET_NOTPRESENT;
}
@ -94,9 +101,10 @@ int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t poll_mask)
olen = adb_request(s, obuf + 1, buf, 1);
/* if there is data, we poll again the same device */
if (olen > 0) {
s->status |= ADB_STATUS_POLLREPLY;
obuf[0] = buf[0];
olen++;
break;
return olen;
}
}
s->poll_index++;

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

@ -70,6 +70,9 @@ typedef struct ADBDeviceClass {
#define TYPE_ADB_BUS "apple-desktop-bus"
#define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS)
#define ADB_STATUS_BUSTIMEOUT 0x1
#define ADB_STATUS_POLLREPLY 0x2
struct ADBBusState {
/*< private >*/
BusState parent_obj;
@ -79,6 +82,7 @@ struct ADBBusState {
uint16_t pending;
int nb_devices;
int poll_index;
uint8_t status;
QEMUTimer *autopoll_timer;
bool autopoll_enabled;