From 3df043a258686a4d7c72a24146726e4958cb4ab2 Mon Sep 17 00:00:00 2001
From: Andrew Baumann <Andrew.Baumann@microsoft.com>
Date: Wed, 25 Nov 2015 13:34:04 -0800
Subject: [PATCH] bcm2835_aux: s/Bcm2835AuxState/BCM2835AuxState/ for
 consistency

---
 hw/char/bcm2835_aux.c                | 22 +++++++++++-----------
 include/hw/arm/bcm2835_peripherals.h |  2 +-
 include/hw/char/bcm2835_aux.h        |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
index 88ae04ef2b..3c27a7b0df 100644
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -17,7 +17,7 @@
 
 #include "hw/char/bcm2835_aux.h"
 
-static void bcm2835_aux_update(Bcm2835AuxState *s)
+static void bcm2835_aux_update(BCM2835AuxState *s)
 {
     bool status = (s->rx_int_enable && s->read_count != 0) || s->tx_int_enable;
     qemu_set_irq(s->irq, status);
@@ -26,7 +26,7 @@ static void bcm2835_aux_update(Bcm2835AuxState *s)
 static uint64_t bcm2835_aux_read(void *opaque, hwaddr offset,
                            unsigned size)
 {
-    Bcm2835AuxState *s = (Bcm2835AuxState *)opaque;
+    BCM2835AuxState *s = (BCM2835AuxState *)opaque;
     uint32_t c, res;
 
     switch (offset >> 2) {
@@ -92,7 +92,7 @@ static uint64_t bcm2835_aux_read(void *opaque, hwaddr offset,
 static void bcm2835_aux_write(void *opaque, hwaddr offset,
                               uint64_t value, unsigned size)
 {
-    Bcm2835AuxState *s = (Bcm2835AuxState *)opaque;
+    BCM2835AuxState *s = (BCM2835AuxState *)opaque;
     unsigned char ch;
 
     switch (offset >> 2) {
@@ -132,14 +132,14 @@ static void bcm2835_aux_write(void *opaque, hwaddr offset,
 
 static int bcm2835_aux_can_receive(void *opaque)
 {
-    Bcm2835AuxState *s = (Bcm2835AuxState *)opaque;
+    BCM2835AuxState *s = (BCM2835AuxState *)opaque;
 
     return s->read_count < 8;
 }
 
 static void bcm2835_aux_put_fifo(void *opaque, uint32_t value)
 {
-    Bcm2835AuxState *s = (Bcm2835AuxState *)opaque;
+    BCM2835AuxState *s = (BCM2835AuxState *)opaque;
     int slot;
 
     slot = s->read_pos + s->read_count;
@@ -177,9 +177,9 @@ static const VMStateDescription vmstate_bcm2835_aux = {
     .version_id = 2,
     .minimum_version_id = 2,
     .fields = (VMStateField[]) {
-        VMSTATE_UINT32_ARRAY(read_fifo, Bcm2835AuxState, 8),
-        VMSTATE_INT32(read_pos, Bcm2835AuxState),
-        VMSTATE_INT32(read_count, Bcm2835AuxState),
+        VMSTATE_UINT32_ARRAY(read_fifo, BCM2835AuxState, 8),
+        VMSTATE_INT32(read_pos, BCM2835AuxState),
+        VMSTATE_INT32(read_count, BCM2835AuxState),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -187,7 +187,7 @@ static const VMStateDescription vmstate_bcm2835_aux = {
 static void bcm2835_aux_init(Object *obj)
 {
     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
-    Bcm2835AuxState *s = BCM2835_AUX(obj);
+    BCM2835AuxState *s = BCM2835_AUX(obj);
 
     memory_region_init_io(&s->iomem, OBJECT(s), &bcm2835_aux_ops, s,
                           "bcm2835_aux", 0x100);
@@ -197,7 +197,7 @@ static void bcm2835_aux_init(Object *obj)
 
 static void bcm2835_aux_realize(DeviceState *dev, Error **errp)
 {
-    Bcm2835AuxState *s = BCM2835_AUX(dev);
+    BCM2835AuxState *s = BCM2835_AUX(dev);
 
     /* FIXME use a qdev chardev prop instead of qemu_char_get_next_serial() */
     s->chr = qemu_char_get_next_serial();
@@ -221,7 +221,7 @@ static void bcm2835_aux_class_init(ObjectClass *oc, void *data)
 static const TypeInfo bcm2835_aux_info = {
     .name          = TYPE_BCM2835_AUX,
     .parent        = TYPE_SYS_BUS_DEVICE,
-    .instance_size = sizeof(Bcm2835AuxState),
+    .instance_size = sizeof(BCM2835AuxState),
     .instance_init = bcm2835_aux_init,
     .class_init    = bcm2835_aux_class_init,
 };
diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h
index fc78f7a260..f83460d48f 100644
--- a/include/hw/arm/bcm2835_peripherals.h
+++ b/include/hw/arm/bcm2835_peripherals.h
@@ -31,7 +31,7 @@ typedef struct BCM2835PeripheralState {
     MemoryRegion ram_alias[4];
     qemu_irq irq, fiq;
 
-    Bcm2835AuxState aux;
+    BCM2835AuxState aux;
     BCM2835FbState fb;
     BCM2835DmaState dma;
     SysBusDevice *ic, *uart0, *systimer, *armtimer, *usb, *mphi, *sbm,
diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/char/bcm2835_aux.h
index 76e15f8cc4..bddb45a9d2 100644
--- a/include/hw/char/bcm2835_aux.h
+++ b/include/hw/char/bcm2835_aux.h
@@ -12,7 +12,7 @@
 #include "sysemu/char.h"
 
 #define TYPE_BCM2835_AUX "bcm2835_aux"
-#define BCM2835_AUX(obj) OBJECT_CHECK(Bcm2835AuxState, (obj), TYPE_BCM2835_AUX)
+#define BCM2835_AUX(obj) OBJECT_CHECK(BCM2835AuxState, (obj), TYPE_BCM2835_AUX)
 
 typedef struct {
     SysBusDevice parent_obj;
@@ -25,6 +25,6 @@ typedef struct {
     CharDriverState *chr;
     qemu_irq irq;
     const unsigned char *id;
-} Bcm2835AuxState;
+} BCM2835AuxState;
 
 #endif
-- 
2.11.4.GIT