From patchwork Thu Nov 1 13:04:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [28/29] hpet: qidl_declare HPETState + HPETTimer Date: Thu, 01 Nov 2012 03:04:30 -0000 From: Michael Roth X-Patchwork-Id: 196251 Message-Id: <1351775071-7644-29-git-send-email-mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Signed-off-by: Michael Roth --- hw/hpet.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index 50ac067..3beb61e 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -32,6 +32,7 @@ #include "sysbus.h" #include "mc146818rtc.h" #include "i8254.h" +#include "qidl.h" //#define HPET_DEBUG #ifdef HPET_DEBUG @@ -42,11 +43,13 @@ #define HPET_MSI_SUPPORT 0 -struct HPETState; -typedef struct HPETTimer { /* timers */ +typedef struct HPETTimer HPETTimer; +typedef struct HPETState HPETState; + +QIDL_DECLARE(HPETTimer) { /* timers */ uint8_t tn; /*timer number*/ QEMUTimer *qemu_timer; - struct HPETState *state; + struct HPETState q_elsewhere *state; /* parent state */ /* Memory-mapped, software visible timer registers */ uint64_t config; /* configuration/cap */ uint64_t cmp; /* comparator */ @@ -56,9 +59,9 @@ typedef struct HPETTimer { /* timers */ uint8_t wrap_flag; /* timer pop will indicate wrap for one-shot 32-bit * mode. Next pop will be actual timer expiration. */ -} HPETTimer; +}; -typedef struct HPETState { +QIDL_DECLARE(HPETState) { SysBusDevice busdev; MemoryRegion iomem; uint64_t hpet_offset; @@ -75,7 +78,7 @@ typedef struct HPETState { uint64_t isr; /* interrupt status reg */ uint64_t hpet_counter; /* main counter */ uint8_t hpet_id; /* instance id */ -} HPETState; +}; static uint32_t hpet_in_legacy_mode(HPETState *s) {