qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, "Alyssa Milburn" <fuzzie@fuzzie.org>,
	"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Alexander Graf" <agraf@suse.de>,
	"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH v2 11/13] cuda: port SET_TIME command to new framework
Date: Sun,  7 Feb 2016 21:34:14 +0100	[thread overview]
Message-ID: <1454877256-22138-12-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1454877256-22138-1-git-send-email-hpoussin@reactos.org>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 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;
-- 
2.1.4

  parent reply	other threads:[~2016-02-07 20:34 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-07 20:34 [Qemu-devel] [PATCH v2 00/13] cuda: misc fixes and cleanups Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 01/13] cuda: add a framework to handle commands Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 02/13] cuda: move unknown commands reject out of switch Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 03/13] cuda: port AUTOPOLL command to new framework Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 04/13] cuda: port SET_AUTO_RATE " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 05/13] cuda: port SET_DEVICE_LIST " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 06/13] cuda: port POWERDOWN " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 07/13] cuda: port RESET_SYSTEM " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 08/13] cuda: port FILE_SERVER_FLAG " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 09/13] cuda: port SET_POWER_MESSAGES " Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 10/13] cuda: port GET_TIME " Hervé Poussineau
2016-02-07 20:34 ` Hervé Poussineau [this message]
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 12/13] cuda: remove GET_6805_ADDR command Hervé Poussineau
2016-02-07 20:34 ` [Qemu-devel] [PATCH v2 13/13] cuda: remove CUDA_GET_SET_IIC/CUDA_COMBINED_FORMAT_IIC commands Hervé Poussineau
2016-02-14 19:01 ` [Qemu-devel] [PATCH v2 00/13] cuda: misc fixes and cleanups Mark Cave-Ayland
2016-02-14 20:07   ` Hervé Poussineau
2016-02-15  0:25   ` David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454877256-22138-12-git-send-email-hpoussin@reactos.org \
    --to=hpoussin@reactos.org \
    --cc=agraf@suse.de \
    --cc=fuzzie@fuzzie.org \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).