From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1J-0004SL-KF for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1A-0002fE-UJ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53445 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1A-0002f6-L4 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:04 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2F96FA5396 for ; Mon, 29 Jul 2013 21:22:04 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:16 +0200 Message-Id: <1375125630-24869-100-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 099/173] pl190: Rename pl190_state to PL190State 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/intc/pl190.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index fdb29d7..dfd6ebf 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -15,7 +15,7 @@ =20 #define PL190_NUM_PRIO 17 =20 -typedef struct { +typedef struct PL190State { SysBusDevice busdev; MemoryRegion iomem; uint32_t level; @@ -32,18 +32,18 @@ typedef struct { int prev_prio[PL190_NUM_PRIO]; qemu_irq irq; qemu_irq fiq; -} pl190_state; +} PL190State; =20 static const unsigned char pl190_id[] =3D { 0x90, 0x11, 0x04, 0x00, 0x0D, 0xf0, 0x05, 0xb1 }; =20 -static inline uint32_t pl190_irq_level(pl190_state *s) +static inline uint32_t pl190_irq_level(PL190State *s) { return (s->level | s->soft_level) & s->irq_enable & ~s->fiq_select; } =20 /* Update interrupts. */ -static void pl190_update(pl190_state *s) +static void pl190_update(PL190State *s) { uint32_t level =3D pl190_irq_level(s); int set; @@ -56,7 +56,7 @@ static void pl190_update(pl190_state *s) =20 static void pl190_set_irq(void *opaque, int irq, int level) { - pl190_state *s =3D (pl190_state *)opaque; + PL190State *s =3D (PL190State *)opaque; =20 if (level) s->level |=3D 1u << irq; @@ -65,7 +65,7 @@ static void pl190_set_irq(void *opaque, int irq, int le= vel) pl190_update(s); } =20 -static void pl190_update_vectors(pl190_state *s) +static void pl190_update_vectors(PL190State *s) { uint32_t mask; int i; @@ -88,7 +88,7 @@ static void pl190_update_vectors(pl190_state *s) static uint64_t pl190_read(void *opaque, hwaddr offset, unsigned size) { - pl190_state *s =3D (pl190_state *)opaque; + PL190State *s =3D (PL190State *)opaque; int i; =20 if (offset >=3D 0xfe0 && offset < 0x1000) { @@ -152,7 +152,7 @@ static uint64_t pl190_read(void *opaque, hwaddr offse= t, static void pl190_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) { - pl190_state *s =3D (pl190_state *)opaque; + PL190State *s =3D (PL190State *)opaque; =20 if (offset >=3D 0x100 && offset < 0x140) { s->vect_addr[(offset - 0x100) >> 2] =3D val; @@ -218,7 +218,7 @@ static const MemoryRegionOps pl190_ops =3D { =20 static void pl190_reset(DeviceState *d) { - pl190_state *s =3D DO_UPCAST(pl190_state, busdev.qdev, d); + PL190State *s =3D DO_UPCAST(PL190State, busdev.qdev, d); int i; =20 for (i =3D 0; i < 16; i++) @@ -234,7 +234,7 @@ static void pl190_reset(DeviceState *d) =20 static int pl190_init(SysBusDevice *dev) { - pl190_state *s =3D FROM_SYSBUS(pl190_state, dev); + PL190State *s =3D FROM_SYSBUS(PL190State, dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl190_ops, s, "pl190", = 0x1000); sysbus_init_mmio(dev, &s->iomem); @@ -249,16 +249,16 @@ static const VMStateDescription vmstate_pl190 =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(level, pl190_state), - VMSTATE_UINT32(soft_level, pl190_state), - VMSTATE_UINT32(irq_enable, pl190_state), - VMSTATE_UINT32(fiq_select, pl190_state), - VMSTATE_UINT8_ARRAY(vect_control, pl190_state, 16), - VMSTATE_UINT32_ARRAY(vect_addr, pl190_state, PL190_NUM_PRIO), - VMSTATE_UINT32_ARRAY(prio_mask, pl190_state, PL190_NUM_PRIO+1), - VMSTATE_INT32(protected, pl190_state), - VMSTATE_INT32(priority, pl190_state), - VMSTATE_INT32_ARRAY(prev_prio, pl190_state, PL190_NUM_PRIO), + VMSTATE_UINT32(level, PL190State), + VMSTATE_UINT32(soft_level, PL190State), + VMSTATE_UINT32(irq_enable, PL190State), + VMSTATE_UINT32(fiq_select, PL190State), + VMSTATE_UINT8_ARRAY(vect_control, PL190State, 16), + VMSTATE_UINT32_ARRAY(vect_addr, PL190State, PL190_NUM_PRIO), + VMSTATE_UINT32_ARRAY(prio_mask, PL190State, PL190_NUM_PRIO+1), + VMSTATE_INT32(protected, PL190State), + VMSTATE_INT32(priority, PL190State), + VMSTATE_INT32_ARRAY(prev_prio, PL190State, PL190_NUM_PRIO), VMSTATE_END_OF_LIST() } }; @@ -277,7 +277,7 @@ static void pl190_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl190_info =3D { .name =3D "pl190", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl190_state), + .instance_size =3D sizeof(PL190State), .class_init =3D pl190_class_init, }; =20 --=20 1.8.1.4