On 21 February 2012 02:33, Rusty Russell <rusty at rustcorp.com.au> wrote: > Interrupts numbers 0-31 are private to the processor interface, 32-1019 are > general interrups. ?Add GIC_INTERNAL and substitute everywhere. > @@ -73,8 +75,9 @@ typedef struct gic_irq_state > ?#define GIC_SET_TRIGGER(irq) s->irq_state[irq].trigger = 1 > ?#define GIC_CLEAR_TRIGGER(irq) s->irq_state[irq].trigger = 0 > ?#define GIC_TEST_TRIGGER(irq) s->irq_state[irq].trigger > -#define GIC_GET_PRIORITY(irq, cpu) \ > - ?(((irq) < 32) ? s->priority1[irq][cpu] : s->priority2[(irq) - 32]) > +#define GIC_GET_PRIORITY(irq, cpu) (((irq) < GIC_INTERNAL) ? ? ? ? ? ? \ > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? s->priority1[irq][cpu] : ? ? ? ? ? ?\ > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? s->priority2[(irq) - GIC_INTERNAL]) Hardcoded tabs are against coding style. In the interests of not taking another round for what's really not a very significant patch, I've fixed this (and the typo in the commit message) and put the fixed result into arm-devs.next. (http://git.linaro.org/gitweb?p=people/pmaydell/qemu-arm.git;a=shortlog;h=refs/heads/arm-devs.next) -- PMM
