From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1r-0004xt-1r for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1e-0002re-Er for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53514 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1e-0002rQ-66 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:58 +0200 Message-Id: <1375125630-24869-142-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 141/173] pl022: Rename pl022_state to PL022State List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/ssi/pl022.c | 72 +++++++++++++++++++++++++++++-----------------------= ------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 711a0c1..d33534e 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -39,7 +39,7 @@ do { fprintf(stderr, "pl022: error: " fmt , ## __VA_ARG= S__);} while (0) #define PL022_INT_RX 0x04 #define PL022_INT_TX 0x08 =20 -typedef struct { +typedef struct PL022State { SysBusDevice busdev; MemoryRegion iomem; uint32_t cr0; @@ -58,12 +58,12 @@ typedef struct { uint16_t rx_fifo[8]; qemu_irq irq; SSIBus *ssi; -} pl022_state; +} PL022State; =20 static const unsigned char pl022_id[8] =3D { 0x22, 0x10, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 }; =20 -static void pl022_update(pl022_state *s) +static void pl022_update(PL022State *s) { s->sr =3D 0; if (s->tx_fifo_len =3D=3D 0) @@ -85,7 +85,7 @@ static void pl022_update(pl022_state *s) qemu_set_irq(s->irq, (s->is & s->im) !=3D 0); } =20 -static void pl022_xfer(pl022_state *s) +static void pl022_xfer(PL022State *s) { int i; int o; @@ -133,7 +133,7 @@ static void pl022_xfer(pl022_state *s) static uint64_t pl022_read(void *opaque, hwaddr offset, unsigned size) { - pl022_state *s =3D (pl022_state *)opaque; + PL022State *s =3D (PL022State *)opaque; int val; =20 if (offset >=3D 0xfe0 && offset < 0x1000) { @@ -177,7 +177,7 @@ static uint64_t pl022_read(void *opaque, hwaddr offse= t, static void pl022_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - pl022_state *s =3D (pl022_state *)opaque; + PL022State *s =3D (PL022State *)opaque; =20 switch (offset) { case 0x00: /* CR0 */ @@ -221,7 +221,7 @@ static void pl022_write(void *opaque, hwaddr offset, } } =20 -static void pl022_reset(pl022_state *s) +static void pl022_reset(PL022State *s) { s->rx_fifo_len =3D 0; s->tx_fifo_len =3D 0; @@ -242,40 +242,40 @@ static const VMStateDescription vmstate_pl022 =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(cr0, pl022_state), - VMSTATE_UINT32(cr1, pl022_state), - VMSTATE_UINT32(bitmask, pl022_state), - VMSTATE_UINT32(sr, pl022_state), - VMSTATE_UINT32(cpsr, pl022_state), - VMSTATE_UINT32(is, pl022_state), - VMSTATE_UINT32(im, pl022_state), - VMSTATE_INT32(tx_fifo_head, pl022_state), - VMSTATE_INT32(rx_fifo_head, pl022_state), - VMSTATE_INT32(tx_fifo_len, pl022_state), - VMSTATE_INT32(rx_fifo_len, pl022_state), - VMSTATE_UINT16(tx_fifo[0], pl022_state), - VMSTATE_UINT16(rx_fifo[0], pl022_state), - VMSTATE_UINT16(tx_fifo[1], pl022_state), - VMSTATE_UINT16(rx_fifo[1], pl022_state), - VMSTATE_UINT16(tx_fifo[2], pl022_state), - VMSTATE_UINT16(rx_fifo[2], pl022_state), - VMSTATE_UINT16(tx_fifo[3], pl022_state), - VMSTATE_UINT16(rx_fifo[3], pl022_state), - VMSTATE_UINT16(tx_fifo[4], pl022_state), - VMSTATE_UINT16(rx_fifo[4], pl022_state), - VMSTATE_UINT16(tx_fifo[5], pl022_state), - VMSTATE_UINT16(rx_fifo[5], pl022_state), - VMSTATE_UINT16(tx_fifo[6], pl022_state), - VMSTATE_UINT16(rx_fifo[6], pl022_state), - VMSTATE_UINT16(tx_fifo[7], pl022_state), - VMSTATE_UINT16(rx_fifo[7], pl022_state), + VMSTATE_UINT32(cr0, PL022State), + VMSTATE_UINT32(cr1, PL022State), + VMSTATE_UINT32(bitmask, PL022State), + VMSTATE_UINT32(sr, PL022State), + VMSTATE_UINT32(cpsr, PL022State), + VMSTATE_UINT32(is, PL022State), + VMSTATE_UINT32(im, PL022State), + VMSTATE_INT32(tx_fifo_head, PL022State), + VMSTATE_INT32(rx_fifo_head, PL022State), + VMSTATE_INT32(tx_fifo_len, PL022State), + VMSTATE_INT32(rx_fifo_len, PL022State), + VMSTATE_UINT16(tx_fifo[0], PL022State), + VMSTATE_UINT16(rx_fifo[0], PL022State), + VMSTATE_UINT16(tx_fifo[1], PL022State), + VMSTATE_UINT16(rx_fifo[1], PL022State), + VMSTATE_UINT16(tx_fifo[2], PL022State), + VMSTATE_UINT16(rx_fifo[2], PL022State), + VMSTATE_UINT16(tx_fifo[3], PL022State), + VMSTATE_UINT16(rx_fifo[3], PL022State), + VMSTATE_UINT16(tx_fifo[4], PL022State), + VMSTATE_UINT16(rx_fifo[4], PL022State), + VMSTATE_UINT16(tx_fifo[5], PL022State), + VMSTATE_UINT16(rx_fifo[5], PL022State), + VMSTATE_UINT16(tx_fifo[6], PL022State), + VMSTATE_UINT16(rx_fifo[6], PL022State), + VMSTATE_UINT16(tx_fifo[7], PL022State), + VMSTATE_UINT16(rx_fifo[7], PL022State), VMSTATE_END_OF_LIST() } }; =20 static int pl022_init(SysBusDevice *dev) { - pl022_state *s =3D FROM_SYSBUS(pl022_state, dev); + PL022State *s =3D FROM_SYSBUS(PL022State, dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl022_ops, s, "pl022", = 0x1000); sysbus_init_mmio(dev, &s->iomem); @@ -296,7 +296,7 @@ static void pl022_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl022_info =3D { .name =3D "pl022", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl022_state), + .instance_size =3D sizeof(PL022State), .class_init =3D pl022_class_init, }; =20 --=20 1.8.1.4