Re: [Qemu-devel] [PATCH 05/13] cuda: port SET_DEVICE_LIST command to new framework

[Mark Cave-Ayland]

On 23/01/16 20:40, Hervé Poussineau wrote:
> Take device list mask into account when polling ADB devices.
> 
> Signed-off-by: Hervé Poussineau <address@hidden>
> ---
>  hw/input/adb.c         | 18 ++++++++++--------
>  hw/misc/macio/cuda.c   | 17 +++++++++++++++--
>  hw/ppc/mac.h           |  1 +
>  include/hw/input/adb.h |  2 +-
>  roms/SLOF              |  2 +-
>  roms/openbios          |  2 +-
>  6 files changed, 29 insertions(+), 13 deletions(-)
> 
> diff --git a/hw/input/adb.c b/hw/input/adb.c
> index 09eead9..d05fdfd 100644
> --- a/hw/input/adb.c
> +++ b/hw/input/adb.c
> @@ -88,7 +88,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const 
> uint8_t *buf, int len)
>  }
>  
>  /* XXX: move that to cuda ? */
> -int adb_poll(ADBBusState *s, uint8_t *obuf)
> +int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t poll_mask)
>  {
>      ADBDevice *d;
>      int olen, i;
> @@ -99,13 +99,15 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
>          if (s->poll_index >= s->nb_devices)
>              s->poll_index = 0;
>          d = s->devices[s->poll_index];
> -        buf[0] = ADB_READREG | (d->devaddr << 4);
> -        olen = adb_request(s, obuf + 1, buf, 1);
> -        /* if there is data, we poll again the same device */
> -        if (olen > 0) {
> -            obuf[0] = buf[0];
> -            olen++;
> -            break;
> +        if ((1 << d->devaddr) & poll_mask) {
> +            buf[0] = ADB_READREG | (d->devaddr << 4);
> +            olen = adb_request(s, obuf + 1, buf, 1);
> +            /* if there is data, we poll again the same device */
> +            if (olen > 0) {
> +                obuf[0] = buf[0];
> +                olen++;
> +                break;
> +            }
>          }
>          s->poll_index++;
>      }
> diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
> index 9ec642f..9af8e1d 100644
> --- a/hw/misc/macio/cuda.c
> +++ b/hw/misc/macio/cuda.c
> @@ -522,7 +522,7 @@ static void cuda_adb_poll(void *opaque)
>      uint8_t obuf[ADB_MAX_OUT_LEN + 2];
>      int olen;
>  
> -    olen = adb_poll(&s->adb_bus, obuf + 2);
> +    olen = adb_poll(&s->adb_bus, obuf + 2, s->poll_mask);
>      if (olen > 0) {
>          obuf[0] = ADB_PACKET;
>          obuf[1] = 0x40; /* polled data */
> @@ -589,9 +589,22 @@ static bool cuda_cmd_set_autorate(CUDAState *s,
>      return true;
>  }
>  
> +static bool cuda_cmd_set_device_list(CUDAState *s,
> +                                     const uint8_t *in_data, int in_len,
> +                                     uint8_t *out_data, int *out_len)
> +{
> +    if (in_len != 2) {
> +        return false;
> +    }
> +
> +    s->poll_mask = (((uint16_t)in_data[0]) << 8) | in_data[1];
> +    return true;
> +}
> +
>  static const CudaCommand handlers[] = {
>      { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll },
>      { CUDA_SET_AUTO_RATE, "SET_AUTO_RATE",  cuda_cmd_set_autorate },
> +    { CUDA_SET_DEVICE_LIST, "SET_DEVICE_LIST", cuda_cmd_set_device_list },
>  };
>  
>  static void cuda_receive_packet(CUDAState *s,
> @@ -640,7 +653,6 @@ static void cuda_receive_packet(CUDAState *s,
>          cuda_send_packet_to_host(s, obuf, 7);
>          return;
>      case CUDA_FILE_SERVER_FLAG:
> -    case CUDA_SET_DEVICE_LIST:
>      case CUDA_SET_POWER_MESSAGES:
>          cuda_send_packet_to_host(s, obuf, 3);
>          return;
> @@ -847,6 +859,7 @@ static void cuda_realizefn(DeviceState *dev, Error **errp)
>  
>      s->adb_poll_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_adb_poll, s);
>      s->auto_rate_ms = 20;
> +    s->poll_mask = 0xffff;

How about calling this s->adb_poll_mask to both match adb_poll_timer and
also indicate that this is related to ADB?

>  }
>  
>  static void cuda_initfn(Object *obj)
> diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
> index 90fcb69..506f7a8 100644
> --- a/hw/ppc/mac.h
> +++ b/hw/ppc/mac.h
> @@ -111,6 +111,7 @@ typedef struct CUDAState {
>      int data_out_index;
>  
>      qemu_irq irq;
> +    uint16_t poll_mask;

Again, with this you'll need a VMStateDescription update.

>      uint8_t auto_rate_ms;
>      uint8_t autopoll;
>      uint8_t data_in[128];
> diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h
> index bdfccd4..db51d03 100644
> --- a/include/hw/input/adb.h
> +++ b/include/hw/input/adb.h
> @@ -79,7 +79,7 @@ struct ADBBusState {
>  
>  int adb_request(ADBBusState *s, uint8_t *buf_out,
>                  const uint8_t *buf, int len);
> -int adb_poll(ADBBusState *s, uint8_t *buf_out);
> +int adb_poll(ADBBusState *s, uint8_t *buf_out, uint16_t poll_mask);
>  
>  #define TYPE_ADB_KEYBOARD "adb-keyboard"
>  #define TYPE_ADB_MOUSE "adb-mouse"
> diff --git a/roms/SLOF b/roms/SLOF
> index b4c9380..811277a 160000
> --- a/roms/SLOF
> +++ b/roms/SLOF
> @@ -1 +1 @@
> -Subproject commit b4c93802a5b2c72f096649c497ec9ff5708e4456
> +Subproject commit 811277ac91f674a9273e2b529791e9b75350f3e8
> diff --git a/roms/openbios b/roms/openbios
> index 3caee17..18f02b1 160000
> --- a/roms/openbios
> +++ b/roms/openbios
> @@ -1 +1 @@
> -Subproject commit 3caee1794ac3f742315823d8447d21f33ce019e9
> +Subproject commit 18f02b14de795c1aab4fe23c1810bfd0944da6aa

And these ROM changes shouldn't be included here either.


ATB,

Mark.