[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 013/173] etraxfs_ser: QOM cast cleanups
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 013/173] etraxfs_ser: QOM cast cleanups |
Date: |
Mon, 29 Jul 2013 21:17:50 +0200 |
Rename etrax_serial to ETRAXSerial, introduce type constant and use QOM
casts.
Acked-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/etraxfs_ser.c | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index d19af00..460094e 100644
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -44,9 +44,13 @@
#define STAT_TR_IDLE 22
#define STAT_TR_RDY 24
-struct etrax_serial
-{
- SysBusDevice busdev;
+#define TYPE_ETRAX_FS_SERIAL "etraxfs,serial"
+#define ETRAX_SERIAL(obj) \
+ OBJECT_CHECK(ETRAXSerial, (obj), TYPE_ETRAX_FS_SERIAL)
+
+typedef struct ETRAXSerial {
+ SysBusDevice parent_obj;
+
MemoryRegion mmio;
CharDriverState *chr;
qemu_irq irq;
@@ -59,9 +63,9 @@ struct etrax_serial
/* Control registers. */
uint32_t regs[R_MAX];
-};
+} ETRAXSerial;
-static void ser_update_irq(struct etrax_serial *s)
+static void ser_update_irq(ETRAXSerial *s)
{
if (s->rx_fifo_len) {
@@ -77,7 +81,7 @@ static void ser_update_irq(struct etrax_serial *s)
static uint64_t
ser_read(void *opaque, hwaddr addr, unsigned int size)
{
- struct etrax_serial *s = opaque;
+ ETRAXSerial *s = opaque;
uint32_t r = 0;
addr >>= 2;
@@ -112,7 +116,7 @@ static void
ser_write(void *opaque, hwaddr addr,
uint64_t val64, unsigned int size)
{
- struct etrax_serial *s = opaque;
+ ETRAXSerial *s = opaque;
uint32_t value = val64;
unsigned char ch = val64;
@@ -156,7 +160,7 @@ static const MemoryRegionOps ser_ops = {
static void serial_receive(void *opaque, const uint8_t *buf, int size)
{
- struct etrax_serial *s = opaque;
+ ETRAXSerial *s = opaque;
int i;
/* Got a byte. */
@@ -177,7 +181,7 @@ static void serial_receive(void *opaque, const uint8_t
*buf, int size)
static int serial_can_receive(void *opaque)
{
- struct etrax_serial *s = opaque;
+ ETRAXSerial *s = opaque;
int r;
/* Is the receiver enabled? */
@@ -196,7 +200,7 @@ static void serial_event(void *opaque, int event)
static void etraxfs_ser_reset(DeviceState *d)
{
- struct etrax_serial *s = container_of(d, typeof(*s), busdev.qdev);
+ ETRAXSerial *s = ETRAX_SERIAL(d);
/* transmitter begins ready and idle. */
s->regs[RS_STAT_DIN] |= (1 << STAT_TR_RDY);
@@ -208,7 +212,7 @@ static void etraxfs_ser_reset(DeviceState *d)
static int etraxfs_ser_init(SysBusDevice *dev)
{
- struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev);
+ ETRAXSerial *s = ETRAX_SERIAL(dev);
sysbus_init_irq(dev, &s->irq);
memory_region_init_io(&s->mmio, OBJECT(s), &ser_ops, s,
@@ -216,10 +220,11 @@ static int etraxfs_ser_init(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->mmio);
s->chr = qemu_char_get_next_serial();
- if (s->chr)
+ if (s->chr) {
qemu_chr_add_handlers(s->chr,
- serial_can_receive, serial_receive,
- serial_event, s);
+ serial_can_receive, serial_receive,
+ serial_event, s);
+ }
return 0;
}
@@ -233,9 +238,9 @@ static void etraxfs_ser_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo etraxfs_ser_info = {
- .name = "etraxfs,serial",
+ .name = TYPE_ETRAX_FS_SERIAL,
.parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(struct etrax_serial),
+ .instance_size = sizeof(ETRAXSerial),
.class_init = etraxfs_ser_class_init,
};
--
1.8.1.4
- [Qemu-devel] [PULL 004/173] cpu/a9mpcore: QOM casting cleanup, (continued)
- [Qemu-devel] [PULL 004/173] cpu/a9mpcore: QOM casting cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 005/173] timer/arm_mptimer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 003/173] ide: Introduce abstract QOM type for PCIIDEState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 007/173] arm11mpcore: QOM cast cleanups for ARM11MPCorePriveState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 008/173] arm11mpcore: QOM cast cleanups for mpcore_rirq_state, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 009/173] pci-bridge: Turn PCIBridge into abstract QOM type, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 006/173] cpu/a15mpcore: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 010/173] pci-bridge-dev: QOM parent field cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 011/173] pci-bridge/i82801b11: Rename parent field, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 012/173] pcie_port: Turn PCIEPort and PCIESlot into abstract QOM types, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 013/173] etraxfs_ser: QOM cast cleanups,
Andreas Färber <=
- [Qemu-devel] [PULL 016/173] cs4231: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 014/173] xilinx_uartlite: Rename xlx_uartlite to XilinxUARTLite, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 015/173] xilinx_uartlite: QOM cast cleanups, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 017/173] audio/marvell_88w8618: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 018/173] milkymist-ac97: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 019/173] pl041: Rename pl041_state to PL041State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 020/173] pl041: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 021/173] onenand: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 022/173] exynos4210_fimd: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 023/173] g364fb: QOM cast cleanup, Andreas Färber, 2013/07/29