diff mbox

[PULL,41/51] allwinner-a10-pit: avoid generation of spurious interrupts

Message ID CAFEAcA-je+3AG1vRCcX282HT72jmCTdZK7V9yTFJkHH428USTw@mail.gmail.com
State New
Headers show

Commit Message

Peter Maydell April 17, 2014, 8:40 p.m. UTC 
On 17 April 2014 11:33, Peter Maydell <peter.maydell@linaro.org> wrote:
> From: Beniamino Galvani <b.galvani@gmail.com>
> diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h
> index 15efab8..a48d3c7 100644
> --- a/include/hw/timer/allwinner-a10-pit.h
> +++ b/include/hw/timer/allwinner-a10-pit.h
> @@ -35,12 +35,20 @@
>
>  #define AW_A10_PIT_DEFAULT_CLOCK   0x4
>
> +typedef struct AwA10PITState AwA10PITState;
> +
> +typedef struct AwA10TimerContext {
> +    AwA10PITState *container;
> +    int index;
> +} AwA10TimerContext;
> +
>  typedef struct AwA10PITState {
>      /*< private >*/
>      SysBusDevice parent_obj;
>      /*< public >*/
>      qemu_irq irq[AW_A10_PIT_TIMER_NR];
>      ptimer_state * timer[AW_A10_PIT_TIMER_NR];
> +    AwA10TimerContext timer_context[AW_A10_PIT_TIMER_NR];
>      MemoryRegion iomem;
>
>      uint32_t irq_enable;
> --

This turns out to not compile on the mingw32 compiler
(perhaps just because it's a newer gcc?) -- it's pickier
about the fact we've defined this typedef twice. I've applied
the following fixup to the patch and regenerated the
pull request:

cam-vm-266:precise:qemu$ git diff

(not resending in the interests of avoiding spamming
the list with 50 patches again...)

thanks
-- PMM
diff mbox

Patch

diff --git a/include/hw/timer/allwinner-a10-pit.h
b/include/hw/timer/allwinner-a10-pit.h
index a48d3c7..2158fc0 100644
--- a/include/hw/timer/allwinner-a10-pit.h
+++ b/include/hw/timer/allwinner-a10-pit.h
@@ -42,7 +42,7 @@  typedef struct AwA10TimerContext {
     int index;
 } AwA10TimerContext;

-typedef struct AwA10PITState {
+struct AwA10PITState {
     /*< private >*/
     SysBusDevice parent_obj;
     /*< public >*/
@@ -61,6 +61,6 @@  typedef struct AwA10PITState {
     uint32_t count_lo;
     uint32_t count_hi;
     uint32_t count_ctl;
-} AwA10PITState;
+};

 #endif