From patchwork Sat Jan 23 20:40:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 8097971 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD8A4BEEE5 for ; Sat, 23 Jan 2016 20:41:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A26F2034E for ; Sat, 23 Jan 2016 20:41:27 +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 F16892034C for ; Sat, 23 Jan 2016 20:41:24 +0000 (UTC) Received: from localhost ([::1]:58437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zr-000696-Se for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Jan 2016 15:41:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zc-00067x-QX for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aN4zZ-0005Rs-N0 for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:08 -0500 Received: from smtp5-g21.free.fr ([2a01:e0c:1:1599::14]:57279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zZ-0005Rn-H1; Sat, 23 Jan 2016 15:41:05 -0500 Received: from localhost.localdomain (unknown [78.230.185.200]) by smtp5-g21.free.fr (Postfix) with ESMTP id ED212D4813A; Sat, 23 Jan 2016 21:39:20 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sat, 23 Jan 2016 21:40:00 +0100 Message-Id: <1453581610-23179-4-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> References: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 2a01:e0c:1:1599::14 Cc: Mark Cave-Ayland , Alexander Graf , Alyssa Milburn , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 03/13] 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Hervé Poussineau Reviewed-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 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;