From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gT-00037H-Mb for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gO-0008H8-TW for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36070 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gO-0008Go-HO for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:16 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 00D41A3B99 for ; Sat, 27 Jul 2013 15:37:16 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:36:57 +0200 Message-Id: <1374932223-7490-15-git-send-email-afaerber@suse.de> In-Reply-To: <1374932223-7490-1-git-send-email-afaerber@suse.de> References: <1374932223-7490-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] [PATCH qom-next for-1.6 14/20] pl031: Rename pl031_state to PL031State 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/timer/pl031.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 3ce6ed8..e705a69 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -33,7 +33,7 @@ do { printf("pl031: " fmt , ## __VA_ARGS__); } while (0= ) #define RTC_MIS 0x18 /* Masked interrupt status register */ #define RTC_ICR 0x1c /* Interrupt clear register */ =20 -typedef struct { +typedef struct PL031State { SysBusDevice busdev; MemoryRegion iomem; QEMUTimer *timer; @@ -51,34 +51,34 @@ typedef struct { uint32_t cr; uint32_t im; uint32_t is; -} pl031_state; +} PL031State; =20 static const unsigned char pl031_id[] =3D { 0x31, 0x10, 0x14, 0x00, /* Device ID */ 0x0d, 0xf0, 0x05, 0xb1 /* Cell ID */ }; =20 -static void pl031_update(pl031_state *s) +static void pl031_update(PL031State *s) { qemu_set_irq(s->irq, s->is & s->im); } =20 static void pl031_interrupt(void * opaque) { - pl031_state *s =3D (pl031_state *)opaque; + PL031State *s =3D (PL031State *)opaque; =20 s->is =3D 1; DPRINTF("Alarm raised\n"); pl031_update(s); } =20 -static uint32_t pl031_get_count(pl031_state *s) +static uint32_t pl031_get_count(PL031State *s) { int64_t now =3D qemu_get_clock_ns(rtc_clock); return s->tick_offset + now / get_ticks_per_sec(); } =20 -static void pl031_set_alarm(pl031_state *s) +static void pl031_set_alarm(PL031State *s) { uint32_t ticks; =20 @@ -98,7 +98,7 @@ static void pl031_set_alarm(pl031_state *s) static uint64_t pl031_read(void *opaque, hwaddr offset, unsigned size) { - pl031_state *s =3D (pl031_state *)opaque; + PL031State *s =3D (PL031State *)opaque; =20 if (offset >=3D 0xfe0 && offset < 0x1000) return pl031_id[(offset - 0xfe0) >> 2]; @@ -136,7 +136,7 @@ static uint64_t pl031_read(void *opaque, hwaddr offse= t, static void pl031_write(void * opaque, hwaddr offset, uint64_t value, unsigned size) { - pl031_state *s =3D (pl031_state *)opaque; + PL031State *s =3D (PL031State *)opaque; =20 =20 switch (offset) { @@ -189,7 +189,7 @@ static const MemoryRegionOps pl031_ops =3D { =20 static int pl031_init(SysBusDevice *dev) { - pl031_state *s =3D FROM_SYSBUS(pl031_state, dev); + PL031State *s =3D FROM_SYSBUS(PL031State, dev); struct tm tm; =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl031_ops, s, "pl031", = 0x1000); @@ -205,7 +205,7 @@ static int pl031_init(SysBusDevice *dev) =20 static void pl031_pre_save(void *opaque) { - pl031_state *s =3D opaque; + PL031State *s =3D opaque; =20 /* tick_offset is base_time - rtc_clock base time. Instead, we want= to * store the base time relative to the vm_clock for backwards-compat= ibility. */ @@ -215,7 +215,7 @@ static void pl031_pre_save(void *opaque) =20 static int pl031_post_load(void *opaque, int version_id) { - pl031_state *s =3D opaque; + PL031State *s =3D opaque; =20 int64_t delta =3D qemu_get_clock_ns(rtc_clock) - qemu_get_clock_ns(v= m_clock); s->tick_offset =3D s->tick_offset_vmstate - delta / get_ticks_per_se= c(); @@ -230,12 +230,12 @@ static const VMStateDescription vmstate_pl031 =3D { .pre_save =3D pl031_pre_save, .post_load =3D pl031_post_load, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(tick_offset_vmstate, pl031_state), - VMSTATE_UINT32(mr, pl031_state), - VMSTATE_UINT32(lr, pl031_state), - VMSTATE_UINT32(cr, pl031_state), - VMSTATE_UINT32(im, pl031_state), - VMSTATE_UINT32(is, pl031_state), + VMSTATE_UINT32(tick_offset_vmstate, PL031State), + VMSTATE_UINT32(mr, PL031State), + VMSTATE_UINT32(lr, PL031State), + VMSTATE_UINT32(cr, PL031State), + VMSTATE_UINT32(im, PL031State), + VMSTATE_UINT32(is, PL031State), VMSTATE_END_OF_LIST() } }; @@ -253,7 +253,7 @@ static void pl031_class_init(ObjectClass *klass, void= *data) static const TypeInfo pl031_info =3D { .name =3D "pl031", .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(pl031_state), + .instance_size =3D sizeof(PL031State), .class_init =3D pl031_class_init, }; =20 --=20 1.8.1.4