[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/12] pckbd: add function kbd_pending()
From: |
Volker Rümelin |
Subject: |
[PATCH v4 09/12] pckbd: add function kbd_pending() |
Date: |
Tue, 25 May 2021 20:14:38 +0200 |
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>
---
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 294b315901..e9905e1c6b 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.26.2
- [PATCH v4 00/12] PS/2 controller related fixes, Volker Rümelin, 2021/05/25
- [PATCH v4 02/12] ps2: don't raise an interrupt if queue is full, Volker Rümelin, 2021/05/25
- [PATCH v4 01/12] ps2: fix mouse stream corruption, Volker Rümelin, 2021/05/25
- [PATCH v4 03/12] ps2: don't deassert irq twice if queue is empty, Volker Rümelin, 2021/05/25
- [PATCH v4 04/12] pckbd: split out interrupt line changing code, Volker Rümelin, 2021/05/25
- [PATCH v4 07/12] pckbd: add state variable for interrupt source, Volker Rümelin, 2021/05/25
- [PATCH v4 09/12] pckbd: add function kbd_pending(),
Volker Rümelin <=
- [PATCH v4 08/12] pckbd: add controller response queue, Volker Rümelin, 2021/05/25
- [PATCH v4 06/12] pckbd: PS/2 keyboard throttle, Volker Rümelin, 2021/05/25
- [PATCH v4 05/12] pckbd: don't update OBF flags if KBD_STAT_OBF is set, Volker Rümelin, 2021/05/25
- [PATCH v4 12/12] pckbd: clear outport_present in outer pre_load(), Volker Rümelin, 2021/05/25
- [PATCH v4 10/12] pckbd: correctly disable PS/2 communication, Volker Rümelin, 2021/05/25
- [PATCH v4 11/12] pckbd: remove duplicated keyboard and mouse defines, Volker Rümelin, 2021/05/25