[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 36/50] lasi: move PS2 initialisation to machine.c
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 36/50] lasi: move PS2 initialisation to machine.c |
Date: |
Wed, 4 May 2022 10:25:46 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/lasi.c | 5 -----
hw/hppa/machine.c | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 753a08d454..9d8c9e3936 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 5b43ae2960..1d48ec341d 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);
--
2.20.1
- Re: [PATCH v2 31/50] lasi: fix serial port initialisation, (continued)
- [PATCH v2 29/50] lasi: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 32/50] lasi: update lasi_initfn() to return LASIState, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 33/50] lasi: move LAN initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 35/50] lasi: move second serial port initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 36/50] lasi: move PS2 initialisation to machine.c,
Mark Cave-Ayland <=
- [PATCH v2 34/50] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 37/50] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 38/50] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 39/50] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/05/04