ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pckbd: replace irq_kbd and irq_mouse with qemu_irq array in KBDState 

This allows both IRQs to be declared as a single qdev gpio array.

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-36-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-06-24 14:40:50 +01:00
parent 6beb79e11a
commit c2b1747973
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/input/pckbd.c
View File

@ -170,8 +170,8 @@ static void kbd_update_irq_lines(KBDState *s)
} }
} }
} }
qemu_set_irq(s->irq_kbd, irq_kbd_level); qemu_set_irq(s->irqs[I8042_KBD_IRQ], irq_kbd_level);
qemu_set_irq(s->irq_mouse, irq_mouse_level); qemu_set_irq(s->irqs[I8042_MOUSE_IRQ], irq_mouse_level);
} }
static void kbd_deassert_irq(KBDState *s) static void kbd_deassert_irq(KBDState *s)
@ -726,8 +726,8 @@ MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s = &I8042_MMIO(dev)->kbd; s = &I8042_MMIO(dev)->kbd;
s->irq_kbd = kbd_irq; s->irqs[I8042_KBD_IRQ] = kbd_irq;
s->irq_mouse = mouse_irq; s->irqs[I8042_MOUSE_IRQ] = mouse_irq;
return I8042_MMIO(dev); return I8042_MMIO(dev);
} }
@ -813,8 +813,8 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
return; return;
} }
s->irq_kbd = isa_get_irq(isadev, isa_s->kbd_irq); s->irqs[I8042_KBD_IRQ] = isa_get_irq(isadev, isa_s->kbd_irq);
s->irq_mouse = isa_get_irq(isadev, isa_s->mouse_irq); s->irqs[I8042_MOUSE_IRQ] = isa_get_irq(isadev, isa_s->mouse_irq);
isa_register_ioport(isadev, isa_s->io + 0, 0x60); isa_register_ioport(isadev, isa_s->io + 0, 0x60);
isa_register_ioport(isadev, isa_s->io + 1, 0x64); isa_register_ioport(isadev, isa_s->io + 1, 0x64);

6
include/hw/input/i8042.h
View File

@ -12,6 +12,9 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qom/object.h" #include "qom/object.h"
#define I8042_KBD_IRQ 0
#define I8042_MOUSE_IRQ 1
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;
@ -31,8 +34,7 @@ typedef struct KBDState {
void *mouse; void *mouse;
QEMUTimer *throttle_timer; QEMUTimer *throttle_timer;
qemu_irq irq_kbd; qemu_irq irqs[2];
qemu_irq irq_mouse;
qemu_irq a20_out; qemu_irq a20_out;
hwaddr mask; hwaddr mask;
} KBDState; } KBDState;