mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pckbd: add state variable for interrupt source

Browse Source 
Currently there is only one flag to distinguish between two
interrupt sources and there are no available flags for more
sources. Add an internal state variable to store the interrupt
source. The next patch will introduce an additional interrupt
source. There is no functional change.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20210525181441.27768-7-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2021-05-25 20:14:36 +02:00 committed by Gerd Hoffmann
parent d1e45668d2
commit ac9192bd0a
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/input/pckbd.c
View File

@ -136,14 +136,19 @@
#define KBD_MIGR_TIMER_PENDING 0x1 #define KBD_MIGR_TIMER_PENDING 0x1
#define KBD_OBSRC_KBD 0x01
#define KBD_OBSRC_MOUSE 0x02
typedef struct KBDState { typedef struct KBDState {
uint8_t write_cmd; /* if non zero, write data to port 60 is expected */ uint8_t write_cmd; /* if non zero, write data to port 60 is expected */
uint8_t status; uint8_t status;
uint8_t mode; uint8_t mode;
uint8_t outport; uint8_t outport;
uint32_t migration_flags; uint32_t migration_flags;
uint32_t obsrc;
bool outport_present; bool outport_present;
bool extended_state; bool extended_state;
bool extended_state_loaded;
/* Bitmask of devices with data available. */ /* Bitmask of devices with data available. */
uint8_t pending; uint8_t pending;
uint8_t obdata; uint8_t obdata;
@ -200,6 +205,9 @@ static void kbd_update_irq(KBDState *s)
if (s->pending == KBD_PENDING_AUX) { if (s->pending == KBD_PENDING_AUX) {
s->status |= KBD_STAT_MOUSE_OBF; s->status |= KBD_STAT_MOUSE_OBF;
s->outport |= KBD_OUT_MOUSE_OBF; s->outport |= KBD_OUT_MOUSE_OBF;
s->obsrc = KBD_OBSRC_MOUSE;
} else {
s->obsrc = KBD_OBSRC_KBD;
} }
} }
kbd_update_irq_lines(s); kbd_update_irq_lines(s);
@ -370,18 +378,17 @@ static uint64_t kbd_read_data(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
KBDState *s = opaque; KBDState *s = opaque;
uint8_t status = s->status;
if (status & KBD_STAT_OBF) { if (s->status & KBD_STAT_OBF) {
kbd_deassert_irq(s); kbd_deassert_irq(s);
if (status & KBD_STAT_MOUSE_OBF) { if (s->obsrc & KBD_OBSRC_KBD) {
s->obdata = ps2_read_data(s->mouse);
} else {
if (s->throttle_timer) { if (s->throttle_timer) {
timer_mod(s->throttle_timer, timer_mod(s->throttle_timer,
qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + 1000); qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + 1000);
} }
s->obdata = ps2_read_data(s->kbd); s->obdata = ps2_read_data(s->kbd);
} else if (s->obsrc & KBD_OBSRC_MOUSE) {
s->obdata = ps2_read_data(s->mouse);
} }
} }
@ -498,6 +505,7 @@ static int kbd_extended_state_post_load(void *opaque, int version_id)
if (s->migration_flags & KBD_MIGR_TIMER_PENDING) { if (s->migration_flags & KBD_MIGR_TIMER_PENDING) {
kbd_throttle_timeout(s); kbd_throttle_timeout(s);
} }
s->extended_state_loaded = true;
return 0; return 0;
} }
@ -516,11 +524,20 @@ static const VMStateDescription vmstate_kbd_extended_state = {
.needed = kbd_extended_state_needed, .needed = kbd_extended_state_needed,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(migration_flags, KBDState), VMSTATE_UINT32(migration_flags, KBDState),
VMSTATE_UINT32(obsrc, KBDState),
VMSTATE_UINT8(obdata, KBDState), VMSTATE_UINT8(obdata, KBDState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
static int kbd_pre_load(void *opaque)
{
KBDState *s = opaque;
s->extended_state_loaded = false;
return 0;
}
static int kbd_post_load(void *opaque, int version_id) static int kbd_post_load(void *opaque, int version_id)
{ {
KBDState *s = opaque; KBDState *s = opaque;
@ -528,6 +545,11 @@ static int kbd_post_load(void *opaque, int version_id)
s->outport = kbd_outport_default(s); s->outport = kbd_outport_default(s);
} }
s->outport_present = false; s->outport_present = false;
if (!s->extended_state_loaded) {
s->obsrc = s->status & KBD_STAT_OBF ?
(s->status & KBD_STAT_MOUSE_OBF ? KBD_OBSRC_MOUSE : KBD_OBSRC_KBD) :
0;
}
return 0; return 0;
} }
@ -535,6 +557,7 @@ static const VMStateDescription vmstate_kbd = {
.name = "pckbd", .name = "pckbd",
.version_id = 3, .version_id = 3,
.minimum_version_id = 3, .minimum_version_id = 3,
.pre_load = kbd_pre_load,
.post_load = kbd_post_load, .post_load = kbd_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT8(write_cmd, KBDState), VMSTATE_UINT8(write_cmd, KBDState),