Commit 7bd43519 authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Peter Maydell
Browse files

hw/char: QOM'ify stm32f2xx_usart model 



* drop qemu_char_get_next_serial and use chardev prop
* change affected board code to use the new way

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465028065-5855-5-git-send-email-zxq_yx_007@163.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 746c3b3e

hw/arm/stm32f205_soc.c

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) 
    /* Attach UART (uses USART registers) and USART controllers */

    for (i = 0; i < STM_NUM_USARTS; i++) {

        usartdev = DEVICE(&(s->usart[i]));

        qdev_prop_set_chr(usartdev, "chardev", i < MAX_SERIAL_PORTS ? serial_hds[i] : NULL);

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

        if (err != NULL) {

            error_propagate(errp, err);

hw/char/stm32f2xx_usart.c

+11 −4
Original line number Diff line number Diff line
@@ -190,6 +190,11 @@ static const MemoryRegionOps stm32f2xx_usart_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static Property stm32f2xx_usart_properties[] = {

    DEFINE_PROP_CHR("chardev", STM32F2XXUsartState, chr),

    DEFINE_PROP_END_OF_LIST(),

};



static void stm32f2xx_usart_init(Object *obj)

{

    STM32F2XXUsartState *s = STM32F2XX_USART(obj);
@@ -199,9 +204,11 @@ static void stm32f2xx_usart_init(Object *obj) 
    memory_region_init_io(&s->mmio, obj, &stm32f2xx_usart_ops, s,

                          TYPE_STM32F2XX_USART, 0x2000);

    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);

}



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

    s->chr = qemu_char_get_next_serial();

static void stm32f2xx_usart_realize(DeviceState *dev, Error **errp)

{

    STM32F2XXUsartState *s = STM32F2XX_USART(dev);



    if (s->chr) {

        qemu_chr_add_handlers(s->chr, stm32f2xx_usart_can_receive,
@@ -214,8 +221,8 @@ static void stm32f2xx_usart_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->reset = stm32f2xx_usart_reset;

    /* Reason: instance_init() method uses qemu_char_get_next_serial() */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->props = stm32f2xx_usart_properties;

    dc->realize = stm32f2xx_usart_realize;

}



static const TypeInfo stm32f2xx_usart_info = {