OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pckbd: remove legacy i8042_mm_init() function

Browse Source 
This legacy function is only used during the initialisation of the MIPS magnum
machine, so inline its functionality directly into mips_jazz_init() and then
remove it.

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-41-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2022-07-12 22:52:51 +01:00
parent 46e9783fbe
commit b704d63d09
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/input/pckbd.c
View File

@ -762,22 +762,6 @@ static void i8042_mmio_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
ram_addr_t size, hwaddr mask)
{
DeviceState *dev;
dev = qdev_new(TYPE_I8042_MMIO);
qdev_prop_set_uint64(dev, "mask", mask);
qdev_prop_set_uint32(dev, "size", size);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
qdev_connect_gpio_out(dev, I8042_KBD_IRQ, kbd_irq);
qdev_connect_gpio_out(dev, I8042_MOUSE_IRQ, mouse_irq);
return I8042_MMIO(dev);
}
static const TypeInfo i8042_mmio_info = {
.name = TYPE_I8042_MMIO,
.parent = TYPE_SYS_BUS_DEVICE,

13
hw/mips/jazz.c
View File

@ -361,9 +361,16 @@ static void mips_jazz_init(MachineState *machine,
memory_region_add_subregion(address_space, 0x80004000, rtc);
/* Keyboard (i8042) */
i8042 = i8042_mm_init(qdev_get_gpio_in(rc4030, 6),
qdev_get_gpio_in(rc4030, 7),
0x1000, 0x1);
i8042 = I8042_MMIO(qdev_new(TYPE_I8042_MMIO));
qdev_prop_set_uint64(DEVICE(i8042), "mask", 1);
qdev_prop_set_uint32(DEVICE(i8042), "size", 0x1000);
sysbus_realize_and_unref(SYS_BUS_DEVICE(i8042), &error_fatal);
qdev_connect_gpio_out(DEVICE(i8042), I8042_KBD_IRQ,
qdev_get_gpio_in(rc4030, 6));
qdev_connect_gpio_out(DEVICE(i8042), I8042_MOUSE_IRQ,
qdev_get_gpio_in(rc4030, 7));
memory_region_add_subregion(address_space, 0x80005000,
sysbus_mmio_get_region(SYS_BUS_DEVICE(i8042),
0));

2
include/hw/input/i8042.h
View File

@ -88,8 +88,6 @@ struct MMIOKBDState {
#define I8042_A20_LINE "a20"
MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
ram_addr_t size, hwaddr mask);
void i8042_isa_mouse_fake_event(ISAKBDState *isa);
void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);