[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 5/8] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create() |
Date: |
Mon, 20 Feb 2023 12:51:11 +0100 |
Open-code the single use of xilinx_uartlite_create().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 +++++--
include/hw/char/xilinx_uartlite.h | 20 --------------------
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 9d959d1ad8..505639c298 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -100,8 +100,11 @@ petalogix_s3adsp1800_init(MachineState *machine)
irq[i] = qdev_get_gpio_in(dev, i);
}
- xilinx_uartlite_create(UARTLITE_BASEADDR, irq[UARTLITE_IRQ],
- serial_hd(0));
+ dev = qdev_new(TYPE_XILINX_UARTLITE);
+ qdev_prop_set_chr(dev, "chardev", serial_hd(0));
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, UARTLITE_BASEADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[UARTLITE_IRQ]);
/* 2 timers at irq 2 @ 62 Mhz. */
dev = qdev_new("xlnx.xps-timer");
diff --git a/include/hw/char/xilinx_uartlite.h
b/include/hw/char/xilinx_uartlite.h
index 753d3a453e..36d4e8444d 100644
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -15,29 +15,9 @@
#ifndef XILINX_UARTLITE_H
#define XILINX_UARTLITE_H
-#include "hw/qdev-properties.h"
-#include "hw/sysbus.h"
-#include "qapi/error.h"
#include "qom/object.h"
#define TYPE_XILINX_UARTLITE "xlnx.xps-uartlite"
OBJECT_DECLARE_SIMPLE_TYPE(XilinxUARTLite, XILINX_UARTLITE)
-static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
- qemu_irq irq,
- Chardev *chr)
-{
- DeviceState *dev;
- SysBusDevice *s;
-
- dev = qdev_new(TYPE_XILINX_UARTLITE);
- s = SYS_BUS_DEVICE(dev);
- qdev_prop_set_chr(dev, "chardev", chr);
- sysbus_realize_and_unref(s, &error_fatal);
- sysbus_mmio_map(s, 0, addr);
- sysbus_connect_irq(s, 0, irq);
-
- return dev;
-}
-
#endif
--
2.38.1
- Re: [PATCH 1/8] hw/gpio/max7310: Simplify max7310_realize(), (continued)
- [PATCH 2/8] hw/char/pl011: Un-inline pl011_create(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 3/8] hw/char/pl011: Open-code pl011_luminary_create(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 4/8] hw/char/xilinx_uartlite: Expose XILINX_UARTLITE QOM type, Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 5/8] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create(),
Philippe Mathieu-Daudé <=
- [PATCH 6/8] hw/char/cmsdk-apb-uart: Open-code cmsdk_apb_uart_create(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 8/8] hw/intc/armv7m_nvic: Use QOM cast CPU() macro, Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 7/8] hw/timer/cmsdk-apb-timer: Remove unused 'qdev-properties.h' header, Philippe Mathieu-Daudé, 2023/02/20
- Re: [PATCH 0/8] hw/arm: Cleanups around QOM style, Peter Maydell, 2023/02/21