[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 17/37] mips: inline serial_init()
From: |
Marc-André Lureau |
Subject: |
[PATCH v5 17/37] mips: inline serial_init() |
Date: |
Fri, 20 Dec 2019 17:45:41 +0400 |
The function is specific to mipssim, let's inline it.
(when inlining, we use a DeviceState variable instead of SerialIO, as
it is the most common type used, and avoids having too many casts)
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
---
hw/char/serial.c | 16 ----------------
hw/mips/mips_mipssim.c | 15 ++++++++++++---
include/hw/char/serial.h | 2 --
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 84b4267ce6..f0f81b34ec 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -1028,22 +1028,6 @@ static const TypeInfo serial_io_info = {
.class_init = serial_io_class_init,
};
-SerialIO *serial_init(int base, qemu_irq irq, int baudbase,
- Chardev *chr, MemoryRegion *system_io)
-{
- SerialIO *sio = SERIAL_IO(qdev_create(NULL, TYPE_SERIAL_IO));
-
- qdev_prop_set_uint32(DEVICE(sio), "baudbase", baudbase);
- qdev_prop_set_chr(DEVICE(sio), "chardev", chr);
- qdev_set_legacy_instance_id(DEVICE(sio), base, 2);
- qdev_init_nofail(DEVICE(sio));
-
- sysbus_connect_irq(SYS_BUS_DEVICE(sio), 0, irq);
- memory_region_add_subregion(system_io, base, &sio->serial.io);
-
- return sio;
-}
-
static Property serial_properties[] = {
DEFINE_PROP_CHR("chardev", SerialState, chr),
DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200),
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 282bbecb24..5ee26108f5 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -40,6 +40,7 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
+#include "hw/qdev-properties.h"
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
@@ -219,9 +220,17 @@ mips_mipssim_init(MachineState *machine)
* A single 16450 sits at offset 0x3f8. It is attached to
* MIPS CPU INT2, which is interrupt 4.
*/
- if (serial_hd(0))
- serial_init(0x3f8, env->irq[4], 115200, serial_hd(0),
- get_system_io());
+ if (serial_hd(0)) {
+ DeviceState *dev = qdev_create(NULL, TYPE_SERIAL_IO);
+
+ qdev_prop_set_uint32(dev, "baudbase", 115200);
+ qdev_prop_set_chr(dev, "chardev", serial_hd(0));
+ qdev_set_legacy_instance_id(dev, 0x3f8, 2);
+ qdev_init_nofail(dev);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]);
+ memory_region_add_subregion(get_system_io(), 0x3f8,
+ &SERIAL_IO(dev)->serial.io);
+ }
if (nd_table[0].used)
/* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index d356ba838c..535fa23a2b 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -108,8 +108,6 @@ void serial_set_frequency(SerialState *s, uint32_t
frequency);
#define TYPE_SERIAL_IO "serial-io"
#define SERIAL_IO(s) OBJECT_CHECK(SerialIO, (s), TYPE_SERIAL_IO)
-SerialIO *serial_init(int base, qemu_irq irq, int baudbase,
- Chardev *chr, MemoryRegion *system_io);
SerialMM *serial_mm_init(MemoryRegion *address_space,
hwaddr base, int regshift,
qemu_irq irq, int baudbase,
--
2.24.0.308.g228f53135a
- [PATCH v5 06/37] serial: initial qom-ification, (continued)
- [PATCH v5 06/37] serial: initial qom-ification, Marc-André Lureau, 2019/12/20
- [PATCH v5 07/37] serial: register vmsd with DeviceClass, Marc-André Lureau, 2019/12/20
- [PATCH v5 08/37] serial: add "chardev" property, Marc-André Lureau, 2019/12/20
- [PATCH v5 09/37] serial: add "baudbase" property, Marc-André Lureau, 2019/12/20
- [PATCH v5 10/37] serial: realize the serial device, Marc-André Lureau, 2019/12/20
- [PATCH v5 11/37] serial: replace serial_exit_core() with unrealize, Marc-André Lureau, 2019/12/20
- [PATCH v5 12/37] serial: start making SerialMM a sysbus device, Marc-André Lureau, 2019/12/20
- [PATCH v5 14/37] serial-mm: add endianness property, Marc-André Lureau, 2019/12/20
- [PATCH v5 15/37] serial-mm: use sysbus facilities, Marc-André Lureau, 2019/12/20
- [PATCH v5 16/37] serial: make SerialIO a sysbus device, Marc-André Lureau, 2019/12/20
- [PATCH v5 17/37] mips: inline serial_init(),
Marc-André Lureau <=
- [PATCH v5 13/37] serial-mm: add "regshift" property, Marc-André Lureau, 2019/12/20
- [PATCH v5 18/37] mips: baudbase is 115200 by default, Marc-André Lureau, 2019/12/20
- [PATCH v5 19/37] mips: use sysbus_add_io(), Marc-André Lureau, 2019/12/20
- [PATCH v5 20/37] mips: use sysbus_mmio_get_region() instead of internal fields, Marc-André Lureau, 2019/12/20
- [PATCH v5 21/37] sm501: make SerialMM a child, export chardev property, Marc-André Lureau, 2019/12/20
- [PATCH v5 22/37] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 23/37] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 24/37] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/12/20
- [PATCH v5 25/37] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 26/37] leon3: use qemu_irq framework instead of callback as property, Marc-André Lureau, 2019/12/20