From patchwork Sun Feb 7 20:34:14 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: 8245231 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 E2C55BEEE5 for ; Sun, 7 Feb 2016 20:37:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D874201C8 for ; Sun, 7 Feb 2016 20:37:09 +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 7EDD6201C7 for ; Sun, 7 Feb 2016 20:37:08 +0000 (UTC) Received: from localhost ([::1]:37923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW4x-0007WF-QA for patchwork-qemu-devel@patchwork.kernel.org; Sun, 07 Feb 2016 15:37:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW2l-0003rJ-6m for qemu-devel@nongnu.org; Sun, 07 Feb 2016 15:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSW2i-00078b-M8 for qemu-devel@nongnu.org; Sun, 07 Feb 2016 15:34:51 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:38904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSW2i-00077s-E5; Sun, 07 Feb 2016 15:34:48 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 9065A4B01C5; Sun, 7 Feb 2016 21:32:19 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 7 Feb 2016 21:34:14 +0100 Message-Id: <1454877256-22138-12-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454877256-22138-1-git-send-email-hpoussin@reactos.org> References: <1454877256-22138-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: 212.27.42.2 Cc: qemu-ppc@nongnu.org, Alyssa Milburn , Mark Cave-Ayland , Alexander Graf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v2 11/13] cuda: port SET_TIME 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 Reviewed-by: David Gibson Signed-off-by: Hervé Poussineau --- hw/misc/macio/cuda.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 8ee1414..611b414 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -674,6 +674,23 @@ static bool cuda_cmd_get_time(CUDAState *s, return true; } +static bool cuda_cmd_set_time(CUDAState *s, + const uint8_t *in_data, int in_len, + uint8_t *out_data, int *out_len) +{ + uint32_t ti; + + if (in_len != 4) { + return false; + } + + ti = (((uint32_t)in_data[1]) << 24) + (((uint32_t)in_data[2]) << 16) + + (((uint32_t)in_data[3]) << 8) + in_data[4]; + s->tick_offset = ti - (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + / get_ticks_per_sec()); + return true; +} + static const CudaCommand handlers[] = { { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll }, { CUDA_SET_AUTO_RATE, "SET_AUTO_RATE", cuda_cmd_set_autorate }, @@ -685,6 +702,7 @@ static const CudaCommand handlers[] = { { CUDA_SET_POWER_MESSAGES, "SET_POWER_MESSAGES", cuda_cmd_set_power_message }, { CUDA_GET_TIME, "GET_TIME", cuda_cmd_get_time }, + { CUDA_SET_TIME, "SET_TIME", cuda_cmd_set_time }, }; static void cuda_receive_packet(CUDAState *s, @@ -692,7 +710,6 @@ static void cuda_receive_packet(CUDAState *s, { uint8_t obuf[16] = { CUDA_PACKET, 0, data[0] }; int i, out_len = 0; - uint32_t ti; for (i = 0; i < ARRAY_SIZE(handlers); i++) { const CudaCommand *desc = &handlers[i]; @@ -719,11 +736,6 @@ static void cuda_receive_packet(CUDAState *s, case CUDA_GET_6805_ADDR: cuda_send_packet_to_host(s, obuf, 3); return; - case CUDA_SET_TIME: - ti = (((uint32_t)data[1]) << 24) + (((uint32_t)data[2]) << 16) + (((uint32_t)data[3]) << 8) + data[4]; - s->tick_offset = ti - (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) / get_ticks_per_sec()); - cuda_send_packet_to_host(s, obuf, 3); - return; case CUDA_COMBINED_FORMAT_IIC: obuf[0] = ERROR_PACKET; obuf[1] = 0x5;