On Sat, Jan 23, 2016 at 09:40:00PM +0100, Hervé Poussineau wrote: > Signed-off-by: Hervé Poussineau <hpous...@reactos.org>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/misc/macio/cuda.c | 40 +++++++++++++++++++++++++---------------
> 1 file changed, 25 insertions(+), 15 deletions(-)
>
> diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
> index f27dd19..37406fc 100644
> --- a/hw/misc/macio/cuda.c
> +++ b/hw/misc/macio/cuda.c
> @@ -543,14 +543,38 @@ typedef struct CudaCommand {
> uint8_t *out_args, int *out_len);
> } CudaCommand;
>
> +static bool cuda_cmd_autopoll(CUDAState *s,
> + const uint8_t *in_data, int in_len,
> + uint8_t *out_data, int *out_len)
> +{
> + int autopoll;
> +
> + if (in_len != 1) {
> + return false;
> + }
> +
> + autopoll = (in_data[0] != 0);
> + if (autopoll != s->autopoll) {
> + s->autopoll = autopoll;
> + if (autopoll) {
> + timer_mod(s->adb_poll_timer,
> + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
> + (get_ticks_per_sec() / CUDA_ADB_POLL_FREQ));
> + } else {
> + timer_del(s->adb_poll_timer);
> + }
> + }
> + return true;
> +}
> +
> static const CudaCommand handlers[] = {
> + { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll },
> };
>
> static void cuda_receive_packet(CUDAState *s,
> const uint8_t *data, int len)
> {
> uint8_t obuf[16] = { CUDA_PACKET, 0, data[0] };
> - int autopoll;
> int i, out_len = 0;
> uint32_t ti;
>
> @@ -576,20 +600,6 @@ static void cuda_receive_packet(CUDAState *s,
> }
>
> switch(data[0]) {
> - case CUDA_AUTOPOLL:
> - autopoll = (data[1] != 0);
> - if (autopoll != s->autopoll) {
> - s->autopoll = autopoll;
> - if (autopoll) {
> - timer_mod(s->adb_poll_timer,
> - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
> - (get_ticks_per_sec() / CUDA_ADB_POLL_FREQ));
> - } else {
> - timer_del(s->adb_poll_timer);
> - }
> - }
> - cuda_send_packet_to_host(s, obuf, 3);
> - return;
> case CUDA_GET_6805_ADDR:
> cuda_send_packet_to_host(s, obuf, 3);
> return;
--
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
