[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] ps2: add ps2_reset_queue
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/7] ps2: add ps2_reset_queue |
Date: |
Fri, 23 Jun 2017 12:39:44 +0200 |
Factor out ps2 queue reset to a separate function.
No functional change.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 0/7] Ui and input 20170623 patches, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 6/7] ps2: add ps2_reset_queue,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/7] hid: Reset kbd modifiers on reset, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 5/7] ps2: add and use PS2State typedef, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 4/7] sdl2: add assert to make coverity happy, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 2/7] input: Decrement queue count on kbd delay, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 7/7] ps2: reset queue in ps2_reset_keyboard, Gerd Hoffmann, 2017/06/23
- [Qemu-devel] [PULL 1/7] keymaps: add tracing, Gerd Hoffmann, 2017/06/23
- Re: [Qemu-devel] [PULL 0/7] Ui and input 20170623 patches, Peter Maydell, 2017/06/23