jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

ARM: PL061: Introduce N_GPIOS

Add a definition for the number of GPIO lines controlled by a PL061
instance, and use it instead of the hardcoded magic value 8.

Suggested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200519085143.1376-1-geert+renesas@glider.be
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

authored by

Geert Uytterhoeven and committed by
Peter Maydell faf58e53 a50fe668

+7 -5
+7 -5
hw/gpio/pl061.c
··· 36 36 #define TYPE_PL061 "pl061" 37 37 #define PL061(obj) OBJECT_CHECK(PL061State, (obj), TYPE_PL061) 38 38 39 + #define N_GPIOS 8 40 + 39 41 typedef struct PL061State { 40 42 SysBusDevice parent_obj; 41 43 ··· 62 64 uint32_t cr; 63 65 uint32_t amsel; 64 66 qemu_irq irq; 65 - qemu_irq out[8]; 67 + qemu_irq out[N_GPIOS]; 66 68 const unsigned char *id; 67 69 uint32_t rsvd_start; /* reserved area: [rsvd_start, 0xfcc] */ 68 70 } PL061State; ··· 112 114 changed = s->old_out_data ^ out; 113 115 if (changed) { 114 116 s->old_out_data = out; 115 - for (i = 0; i < 8; i++) { 117 + for (i = 0; i < N_GPIOS; i++) { 116 118 mask = 1 << i; 117 119 if (changed & mask) { 118 120 DPRINTF("Set output %d = %d\n", i, (out & mask) != 0); ··· 125 127 changed = (s->old_in_data ^ s->data) & ~s->dir; 126 128 if (changed) { 127 129 s->old_in_data = s->data; 128 - for (i = 0; i < 8; i++) { 130 + for (i = 0; i < N_GPIOS; i++) { 129 131 mask = 1 << i; 130 132 if (changed & mask) { 131 133 DPRINTF("Changed input %d = %d\n", i, (s->data & mask) != 0); ··· 364 366 memory_region_init_io(&s->iomem, obj, &pl061_ops, s, "pl061", 0x1000); 365 367 sysbus_init_mmio(sbd, &s->iomem); 366 368 sysbus_init_irq(sbd, &s->irq); 367 - qdev_init_gpio_in(dev, pl061_set_irq, 8); 368 - qdev_init_gpio_out(dev, s->out, 8); 369 + qdev_init_gpio_in(dev, pl061_set_irq, N_GPIOS); 370 + qdev_init_gpio_out(dev, s->out, N_GPIOS); 369 371 } 370 372 371 373 static void pl061_class_init(ObjectClass *klass, void *data)