Commit 9bca0edb authored by Peter Maydell's avatar Peter Maydell
Browse files

Change references to serial_hds[] to serial_hd() 



Change all the uses of serial_hds[] to go via the new
serial_hd() function. Code change produced with:
 find hw -name '*.[ch]' | xargs sed -i -e 's/serial_hds\[\([^]]*\)\]/serial_hd(\1)/g'

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 20180420145249.32435-8-peter.maydell@linaro.org
parent a8d78cd0

hw/arm/allwinner-a10.c

+2 −2
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, AW_A10_SATA_BASE);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, s->irq[56]);



    /* FIXME use a qdev chardev prop instead of serial_hds[] */

    /* FIXME use a qdev chardev prop instead of serial_hd() */

    serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2, s->irq[1],

                   115200, serial_hds[0], DEVICE_NATIVE_ENDIAN);

                   115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);

}



static void aw_a10_class_init(ObjectClass *oc, void *data)

hw/arm/aspeed_soc.c

+2 −2
Original line number Diff line number Diff line
@@ -228,11 +228,11 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, ASPEED_SOC_SCU_BASE);



    /* UART - attach an 8250 to the IO space as our UART5 */

    if (serial_hds[0]) {

    if (serial_hd(0)) {

        qemu_irq uart5 = qdev_get_gpio_in(DEVICE(&s->vic), uart_irqs[4]);

        serial_mm_init(get_system_memory(),

                       ASPEED_SOC_IOMEM_BASE + ASPEED_SOC_UART_5_BASE, 2,

                       uart5, 38400, serial_hds[0], DEVICE_LITTLE_ENDIAN);

                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);

    }



    /* I2C */

hw/arm/bcm2835_peripherals.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    sysbus_pass_irq(SYS_BUS_DEVICE(s), SYS_BUS_DEVICE(&s->ic));



    /* UART0 */

    qdev_prop_set_chr(DEVICE(s->uart0), "chardev", serial_hds[0]);

    qdev_prop_set_chr(DEVICE(s->uart0), "chardev", serial_hd(0));

    object_property_set_bool(OBJECT(s->uart0), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);
@@ -179,7 +179,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_UART));

    /* AUX / UART1 */

    qdev_prop_set_chr(DEVICE(&s->aux), "chardev", serial_hds[1]);

    qdev_prop_set_chr(DEVICE(&s->aux), "chardev", serial_hd(1));



    object_property_set_bool(OBJECT(&s->aux), true, "realized", &err);

    if (err) {

hw/arm/digic.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void digic_realize(DeviceState *dev, Error **errp) 
        sysbus_mmio_map(sbd, 0, DIGIC4_TIMER_BASE(i));

    }



    qdev_prop_set_chr(DEVICE(&s->uart), "chardev", serial_hds[0]);

    qdev_prop_set_chr(DEVICE(&s->uart), "chardev", serial_hd(0));

    object_property_set_bool(OBJECT(&s->uart), true, "realized", &err);

    if (err != NULL) {

        error_propagate(errp, err);

hw/arm/fsl-imx25.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) 
        };



        if (i < MAX_SERIAL_PORTS) {

            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hds[i]);

            qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));

        }



        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);