[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/14] pckbd: add function kbd_pending()
From: |
Gerd Hoffmann |
Subject: |
[PULL 10/14] pckbd: add function kbd_pending() |
Date: |
Wed, 26 May 2021 16:06:23 +0200 |
From: Volker Rümelin <vr_qemu@t-online.de>
Replace reads of the variable s->pending with a call to a new
function kbd_pending() to ease the review of the next patch.
There is no functional change.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20210525181441.27768-9-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/input/pckbd.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 294b31590196..e9905e1c6b8c 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -198,21 +198,28 @@ static void kbd_deassert_irq(KBDState *s)
kbd_update_irq_lines(s);
}
+static uint8_t kbd_pending(KBDState *s)
+{
+ return s->pending;
+}
+
/* update irq and KBD_STAT_[MOUSE_]OBF */
static void kbd_update_irq(KBDState *s)
{
+ uint8_t pending = kbd_pending(s);
+
s->status &= ~(KBD_STAT_OBF | KBD_STAT_MOUSE_OBF);
s->outport &= ~(KBD_OUT_OBF | KBD_OUT_MOUSE_OBF);
- if (s->pending) {
+ if (pending) {
s->status |= KBD_STAT_OBF;
s->outport |= KBD_OUT_OBF;
- if (s->pending & KBD_PENDING_CTRL_KBD) {
+ if (pending & KBD_PENDING_CTRL_KBD) {
s->obsrc = KBD_OBSRC_CTRL;
- } else if (s->pending & KBD_PENDING_CTRL_AUX) {
+ } else if (pending & KBD_PENDING_CTRL_AUX) {
s->status |= KBD_STAT_MOUSE_OBF;
s->outport |= KBD_OUT_MOUSE_OBF;
s->obsrc = KBD_OBSRC_CTRL;
- } else if (s->pending & KBD_PENDING_KBD) {
+ } else if (pending & KBD_PENDING_KBD) {
s->obsrc = KBD_OBSRC_KBD;
} else {
s->status |= KBD_STAT_MOUSE_OBF;
@@ -236,7 +243,7 @@ static void kbd_safe_update_irq(KBDState *s)
if (s->throttle_timer && timer_pending(s->throttle_timer)) {
return;
}
- if (s->pending) {
+ if (kbd_pending(s)) {
kbd_update_irq(s);
}
}
@@ -269,7 +276,7 @@ static void kbd_throttle_timeout(void *opaque)
{
KBDState *s = opaque;
- if (s->pending) {
+ if (kbd_pending(s)) {
kbd_update_irq(s);
}
}
@@ -301,7 +308,7 @@ static uint8_t kbd_dequeue(KBDState *s)
uint8_t b = s->cbdata;
s->pending &= ~KBD_PENDING_CTRL_KBD & ~KBD_PENDING_CTRL_AUX;
- if (s->pending) {
+ if (kbd_pending(s)) {
kbd_update_irq(s);
}
return b;
--
2.31.1
- [PULL 01/14] hw/input: expand trace info reported for ps2 device, (continued)
- [PULL 01/14] hw/input: expand trace info reported for ps2 device, Gerd Hoffmann, 2021/05/26
- [PULL 02/14] ps2: fix mouse stream corruption, Gerd Hoffmann, 2021/05/26
- [PULL 03/14] ps2: don't raise an interrupt if queue is full, Gerd Hoffmann, 2021/05/26
- [PULL 05/14] pckbd: split out interrupt line changing code, Gerd Hoffmann, 2021/05/26
- [PULL 04/14] ps2: don't deassert irq twice if queue is empty, Gerd Hoffmann, 2021/05/26
- [PULL 06/14] pckbd: don't update OBF flags if KBD_STAT_OBF is set, Gerd Hoffmann, 2021/05/26
- [PULL 07/14] pckbd: PS/2 keyboard throttle, Gerd Hoffmann, 2021/05/26
- [PULL 09/14] pckbd: add controller response queue, Gerd Hoffmann, 2021/05/26
- [PULL 08/14] pckbd: add state variable for interrupt source, Gerd Hoffmann, 2021/05/26
- [PULL 11/14] pckbd: correctly disable PS/2 communication, Gerd Hoffmann, 2021/05/26
- [PULL 10/14] pckbd: add function kbd_pending(),
Gerd Hoffmann <=
- [PULL 13/14] pckbd: clear outport_present in outer pre_load(), Gerd Hoffmann, 2021/05/26
- [PULL 12/14] pckbd: remove duplicated keyboard and mouse defines, Gerd Hoffmann, 2021/05/26
- [PULL 14/14] hw/input/ps2: Use ps2_raise_irq() instead of open coding it, Gerd Hoffmann, 2021/05/26
- Re: [PULL 00/14] Input 20210526 patches, Peter Maydell, 2021/05/26