Commit 1b6d0781 authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Peter Maydell
Browse files

hw/char: QOM'ify xilinx_uartlite model 



* drop qemu_char_get_next_serial and use chardev prop
* create xilinx_uartlite_create wrapper function to create
  xilinx_uartlite device
* change affected board code to use the new way

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465028065-5855-6-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 7bd43519

hw/char/xilinx_uartlite.c

+6 −4
Original line number Diff line number Diff line
@@ -172,6 +172,11 @@ static const MemoryRegionOps uart_ops = { 
    }

};



static Property xilinx_uartlite_properties[] = {

    DEFINE_PROP_CHR("chardev", XilinxUARTLite, chr),

    DEFINE_PROP_END_OF_LIST(),

};



static void uart_rx(void *opaque, const uint8_t *buf, int size)

{

    XilinxUARTLite *s = opaque;
@@ -206,8 +211,6 @@ static void xilinx_uartlite_realize(DeviceState *dev, Error **errp) 
{

    XilinxUARTLite *s = XILINX_UARTLITE(dev);



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

    s->chr = qemu_char_get_next_serial();

    if (s->chr)

        qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s);

}
@@ -229,8 +232,7 @@ static void xilinx_uartlite_class_init(ObjectClass *klass, void *data) 


    dc->reset = xilinx_uartlite_reset;

    dc->realize = xilinx_uartlite_realize;

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

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->props = xilinx_uartlite_properties;

}



static const TypeInfo xilinx_uartlite_info = {

hw/microblaze/petalogix_s3adsp1800_mmu.c

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "hw/boards.h"

#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "hw/char/xilinx_uartlite.h"



#include "boot.h"
@@ -103,8 +104,8 @@ petalogix_s3adsp1800_init(MachineState *machine) 
        irq[i] = qdev_get_gpio_in(dev, i);

    }



    sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR,

                         irq[UARTLITE_IRQ]);

    xilinx_uartlite_create(UARTLITE_BASEADDR, irq[UARTLITE_IRQ],

                           serial_hds[0]);



    /* 2 timers at irq 2 @ 62 Mhz.  */

    dev = qdev_create(NULL, "xlnx.xps-timer");

include/hw/char/xilinx_uartlite.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2 or later, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef XILINX_UARTLITE_H

#define XILINX_UARTLITE_H



static inline DeviceState *xilinx_uartlite_create(hwaddr addr,

                                        qemu_irq irq,

                                        CharDriverState *chr)

{

    DeviceState *dev;

    SysBusDevice *s;



    dev = qdev_create(NULL, "xlnx.xps-uartlite");

    s = SYS_BUS_DEVICE(dev);

    qdev_prop_set_chr(dev, "chardev", chr);

    qdev_init_nofail(dev);

    sysbus_mmio_map(s, 0, addr);

    sysbus_connect_irq(s, 0, irq);



    return dev;

}



#endif