From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1l-0004wv-1n for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1Y-0002pc-Cu for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:40 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53500 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1Y-0002pU-3U for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:28 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A6C76A52BF for ; Mon, 29 Jul 2013 21:22:27 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:50 +0200 Message-Id: <1375125630-24869-134-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 133/173] pl181: Rename pl181_state to PL181State List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/sd/pl181.c | 56 ++++++++++++++++++++++++++++-------------------------= --- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index f5eb1e4..dc08595 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -22,7 +22,7 @@ do { printf("pl181: " fmt , ## __VA_ARGS__); } while (0= ) =20 #define PL181_FIFO_LEN 16 =20 -typedef struct { +typedef struct PL181State { SysBusDevice busdev; MemoryRegion iomem; SDState *card; @@ -50,29 +50,29 @@ typedef struct { qemu_irq irq[2]; /* GPIO outputs for 'card is readonly' and 'card inserted' */ qemu_irq cardstatus[2]; -} pl181_state; +} PL181State; =20 static const VMStateDescription vmstate_pl181 =3D { .name =3D "pl181", .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(clock, pl181_state), - VMSTATE_UINT32(power, pl181_state), - VMSTATE_UINT32(cmdarg, pl181_state), - VMSTATE_UINT32(cmd, pl181_state), - VMSTATE_UINT32(datatimer, pl181_state), - VMSTATE_UINT32(datalength, pl181_state), - VMSTATE_UINT32(respcmd, pl181_state), - VMSTATE_UINT32_ARRAY(response, pl181_state, 4), - VMSTATE_UINT32(datactrl, pl181_state), - VMSTATE_UINT32(datacnt, pl181_state), - VMSTATE_UINT32(status, pl181_state), - VMSTATE_UINT32_ARRAY(mask, pl181_state, 2), - VMSTATE_INT32(fifo_pos, pl181_state), - VMSTATE_INT32(fifo_len, pl181_state), - VMSTATE_INT32(linux_hack, pl181_state), - VMSTATE_UINT32_ARRAY(fifo, pl181_state, PL181_FIFO_LEN), + VMSTATE_UINT32(clock, PL181State), + VMSTATE_UINT32(power, PL181State), + VMSTATE_UINT32(cmdarg, PL181State), + VMSTATE_UINT32(cmd, PL181State), + VMSTATE_UINT32(datatimer, PL181State), + VMSTATE_UINT32(datalength, PL181State), + VMSTATE_UINT32(respcmd, PL181State), + VMSTATE_UINT32_ARRAY(response, PL181State, 4), + VMSTATE_UINT32(datactrl, PL181State), + VMSTATE_UINT32(datacnt, PL181State), + VMSTATE_UINT32(status, PL181State), + VMSTATE_UINT32_ARRAY(mask, PL181State, 2), + VMSTATE_INT32(fifo_pos, PL181State), + VMSTATE_INT32(fifo_len, PL181State), + VMSTATE_INT32(linux_hack, PL181State), + VMSTATE_UINT32_ARRAY(fifo, PL181State, PL181_FIFO_LEN), VMSTATE_END_OF_LIST() } }; @@ -125,7 +125,7 @@ static const VMStateDescription vmstate_pl181 =3D { static const unsigned char pl181_id[] =3D { 0x81, 0x11, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 }; =20 -static void pl181_update(pl181_state *s) +static void pl181_update(PL181State *s) { int i; for (i =3D 0; i < 2; i++) { @@ -133,7 +133,7 @@ static void pl181_update(pl181_state *s) } } =20 -static void pl181_fifo_push(pl181_state *s, uint32_t value) +static void pl181_fifo_push(PL181State *s, uint32_t value) { int n; =20 @@ -147,7 +147,7 @@ static void pl181_fifo_push(pl181_state *s, uint32_t = value) DPRINTF("FIFO push %08x\n", (int)value); } =20 -static uint32_t pl181_fifo_pop(pl181_state *s) +static uint32_t pl181_fifo_pop(PL181State *s) { uint32_t value; =20 @@ -162,7 +162,7 @@ static uint32_t pl181_fifo_pop(pl181_state *s) return value; } =20 -static void pl181_send_command(pl181_state *s) +static void pl181_send_command(PL181State *s) { SDRequest request; uint8_t response[16]; @@ -207,7 +207,7 @@ error: the FIFO holding 32-bit words and the card taking data in single byte chunks. FIFO bytes are transferred in little-endian order. */ =20 -static void pl181_fifo_run(pl181_state *s) +static void pl181_fifo_run(PL181State *s) { uint32_t bits; uint32_t value =3D 0; @@ -288,7 +288,7 @@ static void pl181_fifo_run(pl181_state *s) static uint64_t pl181_read(void *opaque, hwaddr offset, unsigned size) { - pl181_state *s =3D (pl181_state *)opaque; + PL181State *s =3D (PL181State *)opaque; uint32_t tmp; =20 if (offset >=3D 0xfe0 && offset < 0x1000) { @@ -372,7 +372,7 @@ static uint64_t pl181_read(void *opaque, hwaddr offse= t, static void pl181_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - pl181_state *s =3D (pl181_state *)opaque; + PL181State *s =3D (PL181State *)opaque; =20 switch (offset) { case 0x00: /* Power */ @@ -449,7 +449,7 @@ static const MemoryRegionOps pl181_ops =3D { =20 static void pl181_reset(DeviceState *d) { - pl181_state *s =3D DO_UPCAST(pl181_state, busdev.qdev, d); + PL181State *s =3D DO_UPCAST(PL181State, busdev.qdev, d); =20 s->power =3D 0; s->cmdarg =3D 0; @@ -476,7 +476,7 @@ static void pl181_reset(DeviceState *d) =20 static int pl181_init(SysBusDevice *dev) { - pl181_state *s =3D FROM_SYSBUS(pl181_state, dev); + PL181State *s =3D FROM_SYSBUS(PL181State, dev); DriveInfo *dinfo; =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl181_ops, s, "pl181", = 0x1000); @@ -503,7 +503,7 @@ static void pl181_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl181_info =3D { .name =3D "pl181", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl181_state), + .instance_size =3D sizeof(PL181State), .class_init =3D pl181_class_init, }; =20 --=20 1.8.1.4