From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0w-0003md-Mi for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0p-0002WJ-TI for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53390 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0p-0002W3-Ki for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:43 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 10291A52BF for ; Mon, 29 Jul 2013 21:21:43 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:50 +0200 Message-Id: <1375125630-24869-74-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 073/173] pl080: Rename pl080_state to PL080State 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/dma/pl080.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 7937c3e..189a922 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -35,7 +35,7 @@ typedef struct { uint32_t conf; } pl080_channel; =20 -typedef struct { +typedef struct PL080State { SysBusDevice busdev; MemoryRegion iomem; uint8_t tc_int; @@ -51,7 +51,7 @@ typedef struct { /* Flag to avoid recursive DMA invocations. */ int running; qemu_irq irq; -} pl080_state; +} PL080State; =20 static const VMStateDescription vmstate_pl080_channel =3D { .name =3D "pl080_channel", @@ -72,20 +72,20 @@ static const VMStateDescription vmstate_pl080 =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT8(tc_int, pl080_state), - VMSTATE_UINT8(tc_mask, pl080_state), - VMSTATE_UINT8(err_int, pl080_state), - VMSTATE_UINT8(err_mask, pl080_state), - VMSTATE_UINT32(conf, pl080_state), - VMSTATE_UINT32(sync, pl080_state), - VMSTATE_UINT32(req_single, pl080_state), - VMSTATE_UINT32(req_burst, pl080_state), - VMSTATE_UINT8(tc_int, pl080_state), - VMSTATE_UINT8(tc_int, pl080_state), - VMSTATE_UINT8(tc_int, pl080_state), - VMSTATE_STRUCT_ARRAY(chan, pl080_state, PL080_MAX_CHANNELS, + VMSTATE_UINT8(tc_int, PL080State), + VMSTATE_UINT8(tc_mask, PL080State), + VMSTATE_UINT8(err_int, PL080State), + VMSTATE_UINT8(err_mask, PL080State), + VMSTATE_UINT32(conf, PL080State), + VMSTATE_UINT32(sync, PL080State), + VMSTATE_UINT32(req_single, PL080State), + VMSTATE_UINT32(req_burst, PL080State), + VMSTATE_UINT8(tc_int, PL080State), + VMSTATE_UINT8(tc_int, PL080State), + VMSTATE_UINT8(tc_int, PL080State), + VMSTATE_STRUCT_ARRAY(chan, PL080State, PL080_MAX_CHANNELS, 1, vmstate_pl080_channel, pl080_channel), - VMSTATE_INT32(running, pl080_state), + VMSTATE_INT32(running, PL080State), VMSTATE_END_OF_LIST() } }; @@ -96,7 +96,7 @@ static const unsigned char pl080_id[] =3D static const unsigned char pl081_id[] =3D { 0x81, 0x10, 0x04, 0x0a, 0x0d, 0xf0, 0x05, 0xb1 }; =20 -static void pl080_update(pl080_state *s) +static void pl080_update(PL080State *s) { if ((s->tc_int & s->tc_mask) || (s->err_int & s->err_mask)) @@ -105,7 +105,7 @@ static void pl080_update(pl080_state *s) qemu_irq_lower(s->irq); } =20 -static void pl080_run(pl080_state *s) +static void pl080_run(PL080State *s) { int c; int flow; @@ -221,7 +221,7 @@ again: static uint64_t pl080_read(void *opaque, hwaddr offset, unsigned size) { - pl080_state *s =3D (pl080_state *)opaque; + PL080State *s =3D (PL080State *)opaque; uint32_t i; uint32_t mask; =20 @@ -290,7 +290,7 @@ static uint64_t pl080_read(void *opaque, hwaddr offse= t, static void pl080_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - pl080_state *s =3D (pl080_state *)opaque; + PL080State *s =3D (PL080State *)opaque; int i; =20 if (offset >=3D 0x100 && offset < 0x200) { @@ -357,7 +357,7 @@ static const MemoryRegionOps pl080_ops =3D { =20 static int pl08x_init(SysBusDevice *dev, int nchannels) { - pl080_state *s =3D FROM_SYSBUS(pl080_state, dev); + PL080State *s =3D FROM_SYSBUS(PL080State, dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl080_ops, s, "pl080", = 0x1000); sysbus_init_mmio(dev, &s->iomem); @@ -389,7 +389,7 @@ static void pl080_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl080_info =3D { .name =3D "pl080", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl080_state), + .instance_size =3D sizeof(PL080State), .class_init =3D pl080_class_init, }; =20 @@ -406,7 +406,7 @@ static void pl081_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl081_info =3D { .name =3D "pl081", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl080_state), + .instance_size =3D sizeof(PL080State), .class_init =3D pl081_class_init, }; =20 --=20 1.8.1.4