Commit 8208335b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

hw/misc/pca9552: Rename 'nr_leds' as 'pin_count' 



The PCA9552 device does not expose LEDs, but simple pins
to connnect LEDs to. To be clearer with the device model,
rename 'nr_leds' as 'pin_count'.

Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 20200623072723.6324-3-f4bug@amsat.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d88c42ff

hw/misc/pca9552.c

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static void pca9552_update_pin_input(PCA9552State *s) 
{

    int i;



    for (i = 0; i < s->nr_leds; i++) {

    for (i = 0; i < s->pin_count; i++) {

        uint8_t input_reg = PCA9552_INPUT0 + (i / 8);

        uint8_t input_shift = (i % 8);

        uint8_t config = pca9552_pin_get_config(s, i);
@@ -185,7 +185,7 @@ static void pca9552_get_led(Object *obj, Visitor *v, const char *name, 
        error_setg(errp, "%s: error reading %s", __func__, name);

        return;

    }

    if (led < 0 || led > s->nr_leds) {

    if (led < 0 || led > s->pin_count) {

        error_setg(errp, "%s invalid led %s", __func__, name);

        return;

    }
@@ -228,7 +228,7 @@ static void pca9552_set_led(Object *obj, Visitor *v, const char *name, 
        error_setg(errp, "%s: error reading %s", __func__, name);

        return;

    }

    if (led < 0 || led > s->nr_leds) {

    if (led < 0 || led > s->pin_count) {

        error_setg(errp, "%s invalid led %s", __func__, name);

        return;

    }
@@ -291,9 +291,9 @@ static void pca9552_initfn(Object *obj) 
     * PCA955X device

     */

    s->max_reg = PCA9552_LS3;

    s->nr_leds = 16;

    s->pin_count = 16;



    for (led = 0; led < s->nr_leds; led++) {

    for (led = 0; led < s->pin_count; led++) {

        char *name;



        name = g_strdup_printf("led%d", led);

include/hw/misc/pca9552.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef struct PCA9552State { 


    uint8_t regs[PCA9552_NR_REGS];

    uint8_t max_reg;

    uint8_t nr_leds;

    uint8_t pin_count;

} PCA9552State;



#endif