SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ps2: add gpio for output IRQ and optionally use it in ps2_raise_irq() and ps2_lower_irq()

Browse Source 
Define the gpio for the PS2 output IRQ in ps2_init() and add logic to optionally
use it in ps2_raise_irq() and ps2_lower_irq() if the gpio is connected. If the
gpio is not connected then call the legacy update_irq() function as before.

This allows the incremental conversion of devices from the legacy update_irq()
function to use gpios instead.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220624134109.881989-35-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-06-24 14:40:49 +01:00
parent 5cb6e55622
commit 6beb79e11a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/input/ps2.c
View File

@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "hw/input/ps2.h"
#include "migration/vmstate.h"
@ -174,12 +175,20 @@ void ps2_queue_noirq(PS2State *s, int b)
static void ps2_raise_irq(PS2State *s)
{
s->update_irq(s->update_arg, 1);
if (qemu_irq_is_connected(s->irq)) {
qemu_set_irq(s->irq, 1);
} else {
s->update_irq(s->update_arg, 1);
}
}
static void ps2_lower_irq(PS2State *s)
{
s->update_irq(s->update_arg, 0);
if (qemu_irq_is_connected(s->irq)) {
qemu_set_irq(s->irq, 0);
} else {
s->update_irq(s->update_arg, 0);
}
}
void ps2_queue(PS2State *s, int b)
@ -1305,6 +1314,13 @@ static const TypeInfo ps2_mouse_info = {
.class_init = ps2_mouse_class_init
};
static void ps2_init(Object *obj)
{
PS2State *s = PS2_DEVICE(obj);
qdev_init_gpio_out(DEVICE(obj), &s->irq, 1);
}
static void ps2_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@ -1316,6 +1332,7 @@ static void ps2_class_init(ObjectClass *klass, void *data)
static const TypeInfo ps2_info = {
.name = TYPE_PS2_DEVICE,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_init = ps2_init,
.instance_size = sizeof(PS2State),
.class_init = ps2_class_init,
.class_size = sizeof(PS2DeviceClass),

4
include/hw/input/ps2.h
View File

@ -50,11 +50,15 @@ typedef struct {
int rptr, wptr, cwptr, count;
} PS2Queue;
/* Output IRQ */
#define PS2_DEVICE_IRQ 0
struct PS2State {
SysBusDevice parent_obj;
PS2Queue queue;
int32_t write_cmd;
qemu_irq irq;
void (*update_irq)(void *, int);
void *update_arg;
};