OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/misc/mps2-fpgaio: Make number of LEDs configurable by board

Browse Source 
The MPS2 board has 2 LEDs, but the MPS3 board has 10 LEDs.  The
FPGAIO device is similar on both sets of boards, but the LED0
register has correspondingly more bits that have an effect.  Add a
device property for number of LEDs.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-15 11:51:19 +00:00
parent f7c71b21f2
commit e8556f435e
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/misc/mps2-fpgaio.c
View File

@ -177,9 +177,14 @@ static void mps2_fpgaio_write(void *opaque, hwaddr offset, uint64_t value,
switch (offset) { switch (offset) {
case A_LED0: case A_LED0:
s->led0 = value & 0x3; if (s->num_leds != 0) {
led_set_state(s->led[0], value & 0x01); uint32_t i;
led_set_state(s->led[1], value & 0x02);
s->led0 = value & MAKE_64BIT_MASK(0, s->num_leds);
for (i = 0; i < s->num_leds; i++) {
led_set_state(s->led[i], value & (1 << i));
}
}
break; break;
case A_PRESCALE: case A_PRESCALE:
resync_counter(s); resync_counter(s);
@ -238,7 +243,7 @@ static void mps2_fpgaio_reset(DeviceState *dev)
s->pscntr = 0; s->pscntr = 0;
s->pscntr_sync_ticks = now; s->pscntr_sync_ticks = now;
for (size_t i = 0; i < ARRAY_SIZE(s->led); i++) { for (size_t i = 0; i < s->num_leds; i++) {
device_cold_reset(DEVICE(s->led[i])); device_cold_reset(DEVICE(s->led[i]));
} }
} }
@ -256,11 +261,19 @@ static void mps2_fpgaio_init(Object *obj)
static void mps2_fpgaio_realize(DeviceState *dev, Error **errp) static void mps2_fpgaio_realize(DeviceState *dev, Error **errp)
{ {
MPS2FPGAIO *s = MPS2_FPGAIO(dev); MPS2FPGAIO *s = MPS2_FPGAIO(dev);
uint32_t i;
s->led[0] = led_create_simple(OBJECT(dev), GPIO_POLARITY_ACTIVE_HIGH, if (s->num_leds > MPS2FPGAIO_MAX_LEDS) {
LED_COLOR_GREEN, "USERLED0"); error_setg(errp, "num-leds cannot be greater than %d",
s->led[1] = led_create_simple(OBJECT(dev), GPIO_POLARITY_ACTIVE_HIGH, MPS2FPGAIO_MAX_LEDS);
LED_COLOR_GREEN, "USERLED1"); return;
}
for (i = 0; i < s->num_leds; i++) {
g_autofree char *ledname = g_strdup_printf("USERLED%d", i);
s->led[i] = led_create_simple(OBJECT(dev), GPIO_POLARITY_ACTIVE_HIGH,
LED_COLOR_GREEN, ledname);
}
} }
static bool mps2_fpgaio_counters_needed(void *opaque) static bool mps2_fpgaio_counters_needed(void *opaque)
@ -303,6 +316,8 @@ static const VMStateDescription mps2_fpgaio_vmstate = {
static Property mps2_fpgaio_properties[] = { static Property mps2_fpgaio_properties[] = {
/* Frequency of the prescale counter */ /* Frequency of the prescale counter */
DEFINE_PROP_UINT32("prescale-clk", MPS2FPGAIO, prescale_clk, 20000000), DEFINE_PROP_UINT32("prescale-clk", MPS2FPGAIO, prescale_clk, 20000000),
/* Number of LEDs controlled by LED0 register */
DEFINE_PROP_UINT32("num-leds", MPS2FPGAIO, num_leds, 2),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

5
include/hw/misc/mps2-fpgaio.h
View File

@ -28,13 +28,16 @@
#define TYPE_MPS2_FPGAIO "mps2-fpgaio" #define TYPE_MPS2_FPGAIO "mps2-fpgaio"
OBJECT_DECLARE_SIMPLE_TYPE(MPS2FPGAIO, MPS2_FPGAIO) OBJECT_DECLARE_SIMPLE_TYPE(MPS2FPGAIO, MPS2_FPGAIO)
#define MPS2FPGAIO_MAX_LEDS 32
struct MPS2FPGAIO { struct MPS2FPGAIO {
/*< private >*/ /*< private >*/
SysBusDevice parent_obj; SysBusDevice parent_obj;
/*< public >*/ /*< public >*/
MemoryRegion iomem; MemoryRegion iomem;
LEDState *led[2]; LEDState *led[MPS2FPGAIO_MAX_LEDS];
uint32_t num_leds;
uint32_t led0; uint32_t led0;
uint32_t prescale; uint32_t prescale;