[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/28] serial: factor out serial_mm_connect
From: |
Marc-André Lureau |
Subject: |
[PATCH v2 13/28] serial: factor out serial_mm_connect |
Date: |
Tue, 22 Oct 2019 18:21:22 +0200 |
Split IRQ and memory region initialization in a different function to
be reused by callers that realize the serial device themself, and
connect irq/mem after.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial.c | 20 +++++++++++++-------
include/hw/char/serial.h | 3 +++
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 72d48b5cd8..41548e159c 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -1078,27 +1078,33 @@ static const MemoryRegionOps serial_mm_ops[3] = {
},
};
+void serial_mm_connect(SerialMMState *self, enum device_endian end,
+ MemoryRegion *address_space, qemu_irq irq)
+{
+ SerialState *s = SERIAL(self);
+
+ qdev_connect_gpio_out_named(DEVICE(self), "serial-irq", 0, irq);
+ memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], self,
+ "serial", 8 << self->regshift);
+ memory_region_add_subregion(address_space, s->base, &s->io);
+}
+
SerialState *serial_mm_init(MemoryRegion *address_space,
hwaddr base, int regshift,
qemu_irq irq, int baudbase,
Chardev *chr, enum device_endian end)
{
DeviceState *dev = DEVICE(object_new(TYPE_SERIAL_MM));
- SerialMMState *m = SERIAL_MM(dev);
- SerialState *s = SERIAL(dev);
- qdev_connect_gpio_out_named(dev, "serial-irq", 0, irq);
qdev_prop_set_uint32(dev, "baudbase", baudbase);
qdev_prop_set_chr(dev, "chardev", chr);
qdev_prop_set_uint8(dev, "regshift", regshift);
qdev_prop_set_uint64(dev, "base", base);
qdev_init_nofail(dev);
- memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], s,
- "serial", 8 << m->regshift);
- memory_region_add_subregion(address_space, base, &s->io);
+ serial_mm_connect(SERIAL_MM(dev), end, address_space, irq);
- return s;
+ return SERIAL(dev);
}
static Property serial_mm_properties[] = {
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 5e657d8ade..84ef8f01f0 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -104,6 +104,9 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
qemu_irq irq, int baudbase,
Chardev *chr, enum device_endian end);
+void serial_mm_connect(SerialMMState *self, enum device_endian end,
+ MemoryRegion *address_space, qemu_irq irq);
+
/* serial-isa.c */
#define MAX_ISA_SERIAL_PORTS 4
--
2.23.0.606.g08da6496b6
- [PATCH v2 06/28] serial: make SerialMMState actually a different type, (continued)
- [PATCH v2 06/28] serial: make SerialMMState actually a different type, Marc-André Lureau, 2019/10/22
- [PATCH v2 07/28] serial: add and set "regshift" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 08/28] serial: convert irq to qdev gpio properties, Marc-André Lureau, 2019/10/22
- [PATCH v2 09/28] serial: add "baudbase" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 10/28] serial: add "base" property, Marc-André Lureau, 2019/10/22
- [PATCH v2 11/28] serial: realize the serial device, Marc-André Lureau, 2019/10/22
- [PATCH v2 12/28] serial: replace serial_exit_core() with unrealize, Marc-André Lureau, 2019/10/22
- [PATCH v2 13/28] serial: factor out serial_mm_connect,
Marc-André Lureau <=
- [PATCH v2 14/28] sm501: embed the serial device, Marc-André Lureau, 2019/10/22
- [PATCH v2 15/28] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 17/28] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/10/22
- [PATCH v2 16/28] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 18/28] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/22
- [PATCH v2 19/28] leon3: use qemu_irq framework instead of callback as property, Marc-André Lureau, 2019/10/22
- [PATCH v2 20/28] sparc: move PIL irq handling to cpu.c, Marc-André Lureau, 2019/10/22
- [PATCH v2 21/28] RFC: mips/cps: fix setting saar property, Marc-André Lureau, 2019/10/22
- [PATCH v2 22/28] cris: improve passing PIC interrupt vector to the CPU, Marc-André Lureau, 2019/10/22