mirror of https://github.com/xemu-project/xemu.git
pckbd: move ISAKBDState from pckbd.c to i8042.h
This allows the QOM types in pckbd.c to be used elsewhere by simply including i8042.h. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: Helge Deller <deller@gmx.de> Message-Id: <20220624134109.881989-21-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
77adda52ef
commit
c9849a71b9
|
@ -686,16 +686,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
|
||||||
qemu_register_reset(kbd_reset, s);
|
qemu_register_reset(kbd_reset, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ISAKBDState {
|
|
||||||
ISADevice parent_obj;
|
|
||||||
|
|
||||||
KBDState kbd;
|
|
||||||
bool kbd_throttle;
|
|
||||||
MemoryRegion io[2];
|
|
||||||
uint8_t kbd_irq;
|
|
||||||
uint8_t mouse_irq;
|
|
||||||
};
|
|
||||||
|
|
||||||
void i8042_isa_mouse_fake_event(ISAKBDState *isa)
|
void i8042_isa_mouse_fake_event(ISAKBDState *isa)
|
||||||
{
|
{
|
||||||
KBDState *s = &isa->kbd;
|
KBDState *s = &isa->kbd;
|
||||||
|
|
|
@ -39,6 +39,16 @@ typedef struct KBDState {
|
||||||
#define TYPE_I8042 "i8042"
|
#define TYPE_I8042 "i8042"
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(ISAKBDState, I8042)
|
OBJECT_DECLARE_SIMPLE_TYPE(ISAKBDState, I8042)
|
||||||
|
|
||||||
|
struct ISAKBDState {
|
||||||
|
ISADevice parent_obj;
|
||||||
|
|
||||||
|
KBDState kbd;
|
||||||
|
bool kbd_throttle;
|
||||||
|
MemoryRegion io[2];
|
||||||
|
uint8_t kbd_irq;
|
||||||
|
uint8_t mouse_irq;
|
||||||
|
};
|
||||||
|
|
||||||
#define I8042_A20_LINE "a20"
|
#define I8042_A20_LINE "a20"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue