aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-07-12 22:52:47 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-07-18 19:28:46 +0100
commit652fbff4200afe1fc8da2ee1f5019c360580fce2 (patch)
tree958fe4b239594ed9795965a2f201fbce500c1a91 /include
parentabcacb20f79b07da5f1fc1f74960b8bd028c3f67 (diff)
downloadqemu-652fbff4200afe1fc8da2ee1f5019c360580fce2.zip
qemu-652fbff4200afe1fc8da2ee1f5019c360580fce2.tar.gz
qemu-652fbff4200afe1fc8da2ee1f5019c360580fce2.tar.bz2
pckbd: don't use legacy ps2_kbd_init() function
Instantiate the PS2 keyboard device within KBDState using object_initialize_child() in i8042_initfn() and i8042_mmio_init() and realize it in i8042_realizefn() and i8042_mmio_realize() accordingly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Tested-by: Helge Deller <deller@gmx.de> Acked-by: Helge Deller <deller@gmx.de> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20220712215251.7944-37-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'include')
-rw-r--r--include/hw/input/i8042.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index ca933d8..8beb0ac 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -10,6 +10,7 @@
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
+#include "hw/input/ps2.h"
#include "qom/object.h"
#define I8042_KBD_IRQ 0
@@ -30,7 +31,7 @@ typedef struct KBDState {
uint8_t obdata;
uint8_t cbdata;
uint8_t pending_tmp;
- void *kbd;
+ PS2KbdState ps2kbd;
void *mouse;
QEMUTimer *throttle_timer;