From patchwork Thu Feb 18 04:18:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8345481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2EB1C9FC6A for ; Thu, 18 Feb 2016 04:25:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8248C20254 for ; Thu, 18 Feb 2016 04:25:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D683B20221 for ; Thu, 18 Feb 2016 04:25:42 +0000 (UTC) Received: from localhost ([::1]:36600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG9u-0006Dv-7A for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 23:25:42 -0500 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 Received: from ozlabs.org ([2401:3900:2:1::2]:48672) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2H-0008IP-CQ; Wed, 17 Feb 2016 23:17:49 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id AFEED140B00; Thu, 18 Feb 2016 15:17:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1455769067; bh=7o65okpyXqzCYE+/1aU2QM8d1zxx1+KD8oAl8Cx712o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zl2KkQyJ+Wz9wHbaLSp4SfMixyi/kcCeqhxhvw2igffW+D47IabPHrkSWB7HFBl89 X+atG0+D+RDA2EYFip4zVwU6Xni3fNYb2BTTWPaJbdiDuyv8Lg37ShcxET6SIkiXpF iTsEGlhcBU5IRdoVLs5Hz7Rmk8LeMFwbdAG20KXg= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 18 Feb 2016 15:18:35 +1100 Message-Id: <1455769127-26005-15-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2401:3900:2:1::2 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 Subject: [Qemu-devel] [PULL 14/26] cuda: port AUTOPOLL command to new framework X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hervé Poussineau Reviewed-by: David Gibson Signed-off-by: Hervé 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; +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; @@ -577,20 +601,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;