From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t14-0003zL-5g for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0w-0002Z9-9U for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53404 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0v-0002Yz-V4 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:50 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7C0C0A531D for ; Mon, 29 Jul 2013 21:21:49 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:58 +0200 Message-Id: <1375125630-24869-82-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 081/173] pl061: Rename pl061_state to PL061State 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/gpio/pl061.c | 62 ++++++++++++++++++++++++++++-----------------------= ------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index a0bbf08..e97ad8a 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -28,7 +28,7 @@ static const uint8_t pl061_id[12] =3D static const uint8_t pl061_id_luminary[12] =3D { 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x18, 0x01, 0x0d, 0xf0, 0x05, 0x= b1 }; =20 -typedef struct { +typedef struct PL061State { SysBusDevice busdev; MemoryRegion iomem; uint32_t locked; @@ -55,39 +55,39 @@ typedef struct { qemu_irq irq; qemu_irq out[8]; const unsigned char *id; -} pl061_state; +} PL061State; =20 static const VMStateDescription vmstate_pl061 =3D { .name =3D "pl061", .version_id =3D 2, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(locked, pl061_state), - VMSTATE_UINT32(data, pl061_state), - VMSTATE_UINT32(old_data, pl061_state), - VMSTATE_UINT32(dir, pl061_state), - VMSTATE_UINT32(isense, pl061_state), - VMSTATE_UINT32(ibe, pl061_state), - VMSTATE_UINT32(iev, pl061_state), - VMSTATE_UINT32(im, pl061_state), - VMSTATE_UINT32(istate, pl061_state), - VMSTATE_UINT32(afsel, pl061_state), - VMSTATE_UINT32(dr2r, pl061_state), - VMSTATE_UINT32(dr4r, pl061_state), - VMSTATE_UINT32(dr8r, pl061_state), - VMSTATE_UINT32(odr, pl061_state), - VMSTATE_UINT32(pur, pl061_state), - VMSTATE_UINT32(pdr, pl061_state), - VMSTATE_UINT32(slr, pl061_state), - VMSTATE_UINT32(den, pl061_state), - VMSTATE_UINT32(cr, pl061_state), - VMSTATE_UINT32(float_high, pl061_state), - VMSTATE_UINT32_V(amsel, pl061_state, 2), + VMSTATE_UINT32(locked, PL061State), + VMSTATE_UINT32(data, PL061State), + VMSTATE_UINT32(old_data, PL061State), + VMSTATE_UINT32(dir, PL061State), + VMSTATE_UINT32(isense, PL061State), + VMSTATE_UINT32(ibe, PL061State), + VMSTATE_UINT32(iev, PL061State), + VMSTATE_UINT32(im, PL061State), + VMSTATE_UINT32(istate, PL061State), + VMSTATE_UINT32(afsel, PL061State), + VMSTATE_UINT32(dr2r, PL061State), + VMSTATE_UINT32(dr4r, PL061State), + VMSTATE_UINT32(dr8r, PL061State), + VMSTATE_UINT32(odr, PL061State), + VMSTATE_UINT32(pur, PL061State), + VMSTATE_UINT32(pdr, PL061State), + VMSTATE_UINT32(slr, PL061State), + VMSTATE_UINT32(den, PL061State), + VMSTATE_UINT32(cr, PL061State), + VMSTATE_UINT32(float_high, PL061State), + VMSTATE_UINT32_V(amsel, PL061State, 2), VMSTATE_END_OF_LIST() } }; =20 -static void pl061_update(pl061_state *s) +static void pl061_update(PL061State *s) { uint8_t changed; uint8_t mask; @@ -116,7 +116,7 @@ static void pl061_update(pl061_state *s) static uint64_t pl061_read(void *opaque, hwaddr offset, unsigned size) { - pl061_state *s =3D (pl061_state *)opaque; + PL061State *s =3D (PL061State *)opaque; =20 if (offset >=3D 0xfd0 && offset < 0x1000) { return s->id[(offset - 0xfd0) >> 2]; @@ -173,7 +173,7 @@ static uint64_t pl061_read(void *opaque, hwaddr offse= t, static void pl061_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - pl061_state *s =3D (pl061_state *)opaque; + PL061State *s =3D (PL061State *)opaque; uint8_t mask; =20 if (offset < 0x400) { @@ -246,7 +246,7 @@ static void pl061_write(void *opaque, hwaddr offset, pl061_update(s); } =20 -static void pl061_reset(pl061_state *s) +static void pl061_reset(PL061State *s) { s->locked =3D 1; s->cr =3D 0xff; @@ -254,7 +254,7 @@ static void pl061_reset(pl061_state *s) =20 static void pl061_set_irq(void * opaque, int irq, int level) { - pl061_state *s =3D (pl061_state *)opaque; + PL061State *s =3D (PL061State *)opaque; uint8_t mask; =20 mask =3D 1 << irq; @@ -274,7 +274,7 @@ static const MemoryRegionOps pl061_ops =3D { =20 static int pl061_init(SysBusDevice *dev, const unsigned char *id) { - pl061_state *s =3D FROM_SYSBUS(pl061_state, dev); + PL061State *s =3D FROM_SYSBUS(PL061State, dev); s->id =3D id; memory_region_init_io(&s->iomem, OBJECT(s), &pl061_ops, s, "pl061", = 0x1000); sysbus_init_mmio(dev, &s->iomem); @@ -307,7 +307,7 @@ static void pl061_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl061_info =3D { .name =3D "pl061", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl061_state), + .instance_size =3D sizeof(PL061State), .class_init =3D pl061_class_init, }; =20 @@ -323,7 +323,7 @@ static void pl061_luminary_class_init(ObjectClass *kl= ass, void *data) static const TypeInfo pl061_luminary_info =3D { .name =3D "pl061_luminary", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl061_state), + .instance_size =3D sizeof(PL061State), .class_init =3D pl061_luminary_class_init, }; =20 --=20 1.8.1.4