aboutsummaryrefslogtreecommitdiff
path: root/hw/hppa
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-05-04 10:25:46 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-05-08 18:52:37 +0100
commitd26c575c44379d9df7843677c7d59729ffe18764 (patch)
tree003275f69835724ae33fbe1eeb370546ec2c9d52 /hw/hppa
parent2da547b81968f601ca870ace0a1e1528c4402d09 (diff)
downloadqemu-d26c575c44379d9df7843677c7d59729ffe18764.zip
qemu-d26c575c44379d9df7843677c7d59729ffe18764.tar.gz
qemu-d26c575c44379d9df7843677c7d59729ffe18764.tar.bz2
lasi: move PS2 initialisation to machine.c
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Helge Deller <deller@gmx.de> Message-Id: <20220504092600.10048-37-mark.cave-ayland@ilande.co.uk> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/hppa')
-rw-r--r--hw/hppa/lasi.c5
-rw-r--r--hw/hppa/machine.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 753a08d..9d8c9e3 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -18,7 +18,6 @@
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
#include "hppa_sys.h"
-#include "hw/input/lasips2.h"
#include "migration/vmstate.h"
#include "qom/object.h"
#include "lasi.h"
@@ -235,10 +234,6 @@ LasiState *lasi_initfn(MemoryRegion *address_space)
dev = qdev_new(TYPE_LASI_CHIP);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- /* PS/2 Keyboard/Mouse */
- lasips2_init(address_space, LASI_PS2KBD_HPA,
- qdev_get_gpio_in(dev, LASI_IRQ_PS2KBD_HPA));
-
return LASI_CHIP(dev);
}
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 5b43ae2..1d48ec3 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -16,6 +16,7 @@
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
+#include "hw/input/lasips2.h"
#include "hw/net/lasi_82596.h"
#include "hw/nmi.h"
#include "hw/pci-host/dino.h"
@@ -245,6 +246,10 @@ static void machine_hppa_init(MachineState *machine)
}
}
+ /* PS/2 Keyboard/Mouse */
+ lasips2_init(addr_space, LASI_PS2KBD_HPA,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA));
+
/* register power switch emulation */
qemu_register_powerdown_notifier(&hppa_system_powerdown_notifier);