[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/13] cuda.c: fix CUDA ADB error packet format
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCH v2 04/13] cuda.c: fix CUDA ADB error packet format |
Date: |
Wed, 11 Nov 2015 22:49:42 +0000 |
According to MOL, ADB error packets should be of the form (type, status, cmd)
rather than just (type, status). This fixes ADB device detection under MacOS 9.
Signed-off-by: Mark Cave-Ayland <address@hidden>
---
hw/misc/macio/cuda.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 0fd75b3..bfcdcae 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -560,19 +560,21 @@ static void cuda_receive_packet_from_host(CUDAState *s,
switch(data[0]) {
case ADB_PACKET:
{
- uint8_t obuf[ADB_MAX_OUT_LEN + 2];
+ uint8_t obuf[ADB_MAX_OUT_LEN + 3];
int olen;
olen = adb_request(&s->adb_bus, obuf + 2, data + 1, len - 1);
if (olen > 0) {
obuf[0] = ADB_PACKET;
obuf[1] = 0x00;
+ cuda_send_packet_to_host(s, obuf, olen + 2);
} else {
/* error */
obuf[0] = ADB_PACKET;
obuf[1] = -olen;
+ obuf[2] = data[1];
olen = 0;
+ cuda_send_packet_to_host(s, obuf, olen + 3);
}
- cuda_send_packet_to_host(s, obuf, olen + 2);
}
break;
case CUDA_PACKET:
--
1.7.10.4
- [Qemu-devel] [PATCH v2 00/13] Mac OS 9 compatibility improvements (upstream rework), Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 01/13] PPC: Allow Rc bit to be set on mtspr, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 02/13] PPC: Fix lswx bounds checks, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 03/13] PPC: mac99: Always add USB controller, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 04/13] cuda.c: fix CUDA ADB error packet format,
Mark Cave-Ayland <=
- [Qemu-devel] [PATCH v2 05/13] cuda.c: fix CUDA_PACKET response packet format, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 06/13] cuda.c: implement simple CUDA_GET_6805_ADDR command, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 07/13] cuda.c: implement dummy IIC access commands, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 08/13] cuda.c: fix CUDA SR interrupt clearing, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 09/13] cuda.c: add defines for CUDA registers, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 13/13] cuda.c: add delay to setting of SR_INT bit, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 10/13] cuda.c: refactor get_tb() so that the time can be passed in, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 11/13] cuda.c: rename get_counter() state variable from s to ti for consistency, Mark Cave-Ayland, 2015/11/11
- [Qemu-devel] [PATCH v2 12/13] cuda.c: fix T2 timer and enable its interrupt, Mark Cave-Ayland, 2015/11/11
- Re: [Qemu-devel] [PATCH v2 00/13] Mac OS 9 compatibility improvements (upstream rework), David Gibson, 2015/11/11