qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 6/7] ps2: add ps2_reset_queue
Date: Fri, 23 Jun 2017 12:39:44 +0200	[thread overview]
Message-ID: <20170623103945.7014-7-kraxel@redhat.com> (raw)
In-Reply-To: <20170623103945.7014-1-kraxel@redhat.com>

Factor out ps2 queue reset to a separate function.
No functional change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170606112105.13331-3-kraxel@redhat.com
---
 hw/input/ps2.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 37f8cb842e..2416b58cc0 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -551,6 +551,15 @@ static uint8_t translate_table[256] = {
     0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
 };
 
+static void ps2_reset_queue(PS2State *s)
+{
+    PS2Queue *q = &s->queue;
+
+    q->rptr = 0;
+    q->wptr = 0;
+    q->count = 0;
+}
+
 void ps2_queue(PS2State *s, int b)
 {
     PS2Queue *q = &s->queue;
@@ -1079,12 +1088,8 @@ void ps2_write_mouse(void *opaque, int val)
 
 static void ps2_common_reset(PS2State *s)
 {
-    PS2Queue *q;
     s->write_cmd = -1;
-    q = &s->queue;
-    q->rptr = 0;
-    q->wptr = 0;
-    q->count = 0;
+    ps2_reset_queue(s);
     s->update_irq(s->update_arg, 0);
 }
 
-- 
2.9.3

  parent reply	other threads:[~2017-06-23 10:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-23 10:39 [Qemu-devel] [PULL 0/7] Ui and input 20170623 patches Gerd Hoffmann
2017-06-23 10:39 ` [Qemu-devel] [PULL 1/7] keymaps: add tracing Gerd Hoffmann
2017-06-23 10:39 ` [Qemu-devel] [PULL 2/7] input: Decrement queue count on kbd delay Gerd Hoffmann
2017-06-23 10:39 ` [Qemu-devel] [PULL 3/7] hid: Reset kbd modifiers on reset Gerd Hoffmann
2017-06-23 10:39 ` [Qemu-devel] [PULL 4/7] sdl2: add assert to make coverity happy Gerd Hoffmann
2017-06-23 10:39 ` [Qemu-devel] [PULL 5/7] ps2: add and use PS2State typedef Gerd Hoffmann
2017-06-23 10:39 ` Gerd Hoffmann [this message]
2017-06-23 10:39 ` [Qemu-devel] [PULL 7/7] ps2: reset queue in ps2_reset_keyboard Gerd Hoffmann
2017-06-23 12:33 ` [Qemu-devel] [PULL 0/7] Ui and input 20170623 patches Peter Maydell

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=20170623103945.7014-7-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@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).