aboutsummaryrefslogtreecommitdiff
path: root/hw/ssi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-08-24 13:17:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-24 13:17:44 +0100
commit1d52866f5a53feef036c2e8f9b3a6a30209d48a7 (patch)
treefe584946cfc469d566caa22b5b1bdd450177ae6e /hw/ssi
parent28e56f05fc688917cf35c39c0ba97afb7f1ab0f3 (diff)
downloadqemu-1d52866f5a53feef036c2e8f9b3a6a30209d48a7.zip
qemu-1d52866f5a53feef036c2e8f9b3a6a30209d48a7.tar.gz
qemu-1d52866f5a53feef036c2e8f9b3a6a30209d48a7.tar.bz2
hw/ssi/pl022: Allow use as embedded-struct device
Create a new include file for the pl022's device struct, type macros, etc, so that it can be instantiated using the "embedded struct" coding style. While we're adding the new file to MAINTAINERS, add also the .c file, which was missing an entry. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20180820141116.9118-16-peter.maydell@linaro.org Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/ssi')
-rw-r--r--hw/ssi/pl022.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index c136801..379d309 100644
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
+#include "hw/ssi/pl022.h"
#include "hw/ssi/ssi.h"
#include "qemu/log.h"
@@ -41,31 +42,6 @@ do { fprintf(stderr, "pl022: error: " fmt , ## __VA_ARGS__);} while (0)
#define PL022_INT_RX 0x04
#define PL022_INT_TX 0x08
-#define TYPE_PL022 "pl022"
-#define PL022(obj) OBJECT_CHECK(PL022State, (obj), TYPE_PL022)
-
-typedef struct PL022State {
- SysBusDevice parent_obj;
-
- MemoryRegion iomem;
- uint32_t cr0;
- uint32_t cr1;
- uint32_t bitmask;
- uint32_t sr;
- uint32_t cpsr;
- uint32_t is;
- uint32_t im;
- /* The FIFO head points to the next empty entry. */
- int tx_fifo_head;
- int rx_fifo_head;
- int tx_fifo_len;
- int rx_fifo_len;
- uint16_t tx_fifo[8];
- uint16_t rx_fifo[8];
- qemu_irq irq;
- SSIBus *ssi;
-} PL022State;
-
static const unsigned char pl022_id[8] =
{ 0x22, 0x10, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 };