[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 05/14] hw/char/pl011: Allow use as an embedded-struct
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 05/14] hw/char/pl011: Allow use as an embedded-struct device |
Date: |
Thu, 14 Feb 2019 12:50:58 +0000 |
Create a new include file for the pl011's device struct,
type macros, etc, so that it can be instantiated using
the "embedded struct" coding style.
Signed-off-by: Peter Maydell <address@hidden>
---
include/hw/char/pl011.h | 34 ++++++++++++++++++++++++++++++++++
hw/char/pl011.c | 31 ++-----------------------------
2 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index 83649324b6a..1b52bfd5c90 100644
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -15,6 +15,40 @@
#ifndef HW_PL011_H
#define HW_PL011_H
+#include "hw/sysbus.h"
+#include "chardev/char-fe.h"
+
+#define TYPE_PL011 "pl011"
+#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011)
+
+/* This shares the same struct (and cast macro) as the base pl011 device */
+#define TYPE_PL011_LUMINARY "pl011_luminary"
+
+typedef struct PL011State {
+ SysBusDevice parent_obj;
+
+ MemoryRegion iomem;
+ uint32_t readbuff;
+ uint32_t flags;
+ uint32_t lcr;
+ uint32_t rsr;
+ uint32_t cr;
+ uint32_t dmacr;
+ uint32_t int_enabled;
+ uint32_t int_level;
+ uint32_t read_fifo[16];
+ uint32_t ilpr;
+ uint32_t ibrd;
+ uint32_t fbrd;
+ uint32_t ifl;
+ int read_pos;
+ int read_count;
+ int read_trigger;
+ CharBackend chr;
+ qemu_irq irq;
+ const unsigned char *id;
+} PL011State;
+
static inline DeviceState *pl011_create(hwaddr addr,
qemu_irq irq,
Chardev *chr)
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 2aa277fc4f2..0c4711e4027 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -8,39 +8,12 @@
*/
#include "qemu/osdep.h"
+#include "hw/char/pl011.h"
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
#include "qemu/log.h"
#include "trace.h"
-#define TYPE_PL011 "pl011"
-#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011)
-
-typedef struct PL011State {
- SysBusDevice parent_obj;
-
- MemoryRegion iomem;
- uint32_t readbuff;
- uint32_t flags;
- uint32_t lcr;
- uint32_t rsr;
- uint32_t cr;
- uint32_t dmacr;
- uint32_t int_enabled;
- uint32_t int_level;
- uint32_t read_fifo[16];
- uint32_t ilpr;
- uint32_t ibrd;
- uint32_t fbrd;
- uint32_t ifl;
- int read_pos;
- int read_count;
- int read_trigger;
- CharBackend chr;
- qemu_irq irq;
- const unsigned char *id;
-} PL011State;
-
#define PL011_INT_TX 0x20
#define PL011_INT_RX 0x10
@@ -357,7 +330,7 @@ static void pl011_luminary_init(Object *obj)
}
static const TypeInfo pl011_luminary_info = {
- .name = "pl011_luminary",
+ .name = TYPE_PL011_LUMINARY,
.parent = TYPE_PL011,
.instance_init = pl011_luminary_init,
};
--
2.20.1
- [Qemu-arm] [PATCH 11/14] hw/arm/musca: Add PPCs, (continued)
- [Qemu-arm] [PATCH 11/14] hw/arm/musca: Add PPCs, Peter Maydell, 2019/02/14
- [Qemu-arm] [PATCH 07/14] hw/char/pl011: Use '0x' prefix when logging hex numbers, Peter Maydell, 2019/02/14
- [Qemu-arm] [PATCH 01/14] hw/arm/armsse: Fix miswiring of expansion IRQs, Peter Maydell, 2019/02/14
- [Qemu-arm] [PATCH 06/14] hw/char/pl011: Support all interrupt lines, Peter Maydell, 2019/02/14
- [Qemu-arm] [PATCH 05/14] hw/char/pl011: Allow use as an embedded-struct device,
Peter Maydell <=
- [Qemu-arm] [PATCH 03/14] hw/timer/pl031: Allow use as an embedded-struct device, Peter Maydell, 2019/02/14
- [Qemu-arm] [PATCH 08/14] hw/arm/armsse: Document SRAM_ADDR_WIDTH property in header comment, Peter Maydell, 2019/02/14