SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lasips2: QOMify LASIPS2State

Browse Source 
Currently lasip2_init() creates a new LASIPS2State directly which is used by the HPPA
machine. Introduce a new LASIPS2 QOM type that will soon be used to allow the HPPA
machine to be wired up using standard qdev GPIOs.

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-39-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-06-24 14:40:53 +01:00
parent 1d9d4b072d
commit 653b388c39
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/input/lasips2.c
View File

@ -24,6 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "hw/input/ps2.h" #include "hw/input/ps2.h"
#include "hw/input/lasips2.h" #include "hw/input/lasips2.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
@ -31,6 +32,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "qapi/error.h"
struct LASIPS2State; struct LASIPS2State;
@ -45,11 +47,16 @@ typedef struct LASIPS2Port {
bool irq; bool irq;
} LASIPS2Port; } LASIPS2Port;
typedef struct LASIPS2State { struct LASIPS2State {
SysBusDevice parent_obj;
LASIPS2Port kbd; LASIPS2Port kbd;
LASIPS2Port mouse; LASIPS2Port mouse;
qemu_irq irq; qemu_irq irq;
} LASIPS2State; };
#define TYPE_LASIPS2 "lasips2"
OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2)
static const VMStateDescription vmstate_lasips2 = { static const VMStateDescription vmstate_lasips2 = {
.name = "lasips2", .name = "lasips2",
@ -265,8 +272,11 @@ void lasips2_init(MemoryRegion *address_space,
hwaddr base, qemu_irq irq) hwaddr base, qemu_irq irq)
{ {
LASIPS2State *s; LASIPS2State *s;
DeviceState *dev;
s = g_new0(LASIPS2State, 1); dev = qdev_new(TYPE_LASIPS2);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
s = LASIPS2(dev);
s->irq = irq; s->irq = irq;
s->mouse.id = 1; s->mouse.id = 1;
@ -286,3 +296,16 @@ void lasips2_init(MemoryRegion *address_space,
"lasips2-mouse", 0x100); "lasips2-mouse", 0x100);
memory_region_add_subregion(address_space, base + 0x100, &s->mouse.reg); memory_region_add_subregion(address_space, base + 0x100, &s->mouse.reg);
} }
static const TypeInfo lasips2_info = {
.name = TYPE_LASIPS2,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LASIPS2State)
};
static void lasips2_register_types(void)
{
type_register_static(&lasips2_info);
}
type_init(lasips2_register_types)