From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2K-000084-Eb for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWG2H-0008LC-Ns for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:52 -0500 From: David Gibson Date: Thu, 18 Feb 2016 15:18:35 +1100 Message-Id: <1455769127-26005-15-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> References: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/26] cuda: port AUTOPOLL command to new framework List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson From: Herv=C3=A9 Poussineau Reviewed-by: David Gibson Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Mark Cave-Ayland Signed-off-by: David Gibson --- 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 81e34e7..ea4237a 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -544,14 +544,38 @@ typedef struct CudaCommand { uint8_t *out_args, int *out_len); } CudaCommand; =20 +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 !=3D 1) { + return false; + } + + autopoll =3D (in_data[0] !=3D 0); + if (autopoll !=3D s->autopoll) { + s->autopoll =3D 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[] =3D { + { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll }, }; =20 static void cuda_receive_packet(CUDAState *s, const uint8_t *data, int len) { uint8_t obuf[16] =3D { CUDA_PACKET, 0, data[0] }; - int autopoll; int i, out_len =3D 0; uint32_t ti; =20 @@ -577,20 +601,6 @@ static void cuda_receive_packet(CUDAState *s, } =20 switch(data[0]) { - case CUDA_AUTOPOLL: - autopoll =3D (data[1] !=3D 0); - if (autopoll !=3D s->autopoll) { - s->autopoll =3D 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; --=20 2.5.0