Re: [Qemu-devel] [PATCH 04/13] cuda.c: fix CUDA ADB error packet format

[David Gibson]

On Fri, Oct 23, 2015 at 02:56:29PM +0100, Mark Cave-Ayland wrote:
> ADB error packets should be of the form (type, status, cmd) rather than just
> (type, status). This fixes ADB device detection under MacOS 9.

Hmm.. are there any public doc on these ADB / CUDA things that we can
look up to compare to?

> 
> 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 5d7043e..9ec19af 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);

Using 'olen + 3' seems confusing here, rather than just '3', since you
just set olen = 0.

>              }
> -            cuda_send_packet_to_host(s, obuf, olen + 2);
>          }
>          break;
>      case CUDA_PACKET:

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature