From c2ddaa62b6979c8f30569059180f66af7bba1224 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Wed, 25 May 2016 14:39:02 +0800 Subject: hw/char: QOM'ify lm32_juart.c * Drop the old SysBus init function * Call qemu_chr_add_handlers in the realize callback * Use qdev chardev prop instead of qemu_char_get_next_serial Signed-off-by: xiaoqiang zhao Message-Id: <1464158344-12266-4-git-send-email-zxq_yx_007@163.com> Tested-by: Michael Walle Acked-by: Michael Walle Signed-off-by: Paolo Bonzini --- hw/lm32/lm32_boards.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'hw/lm32/lm32_boards.c') diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index c0290560fc..2ae6555b5b 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -31,6 +31,7 @@ #include "lm32_hwsetup.h" #include "lm32.h" #include "exec/address-spaces.h" +#include "sysemu/sysemu.h" typedef struct { LM32CPU *cpu; @@ -136,7 +137,7 @@ static void lm32_evr_init(MachineState *machine) sysbus_create_simple("lm32-timer", timer1_base, irq[timer1_irq]); /* make sure juart isn't the first chardev */ - env->juart_state = lm32_juart_init(); + env->juart_state = lm32_juart_init(serial_hds[1]); reset_info->bootstrap_pc = flash_base; @@ -238,7 +239,7 @@ static void lm32_uclinux_init(MachineState *machine) sysbus_create_simple("lm32-timer", timer2_base, irq[timer2_irq]); /* make sure juart isn't the first chardev */ - env->juart_state = lm32_juart_init(); + env->juart_state = lm32_juart_init(serial_hds[1]); reset_info->bootstrap_pc = flash_base; -- cgit v1.2.3 From 7aaefcaf6628de1e25eb59a7790a0ae0f9a628f6 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Wed, 25 May 2016 14:39:03 +0800 Subject: hw/char: QOM'ify lm32_uart.c * Drop the old SysBus init function and use instance_init * Call qemu_chr_add_handlers in the realize callback * Use qdev chardev prop instead of qemu_char_get_next_serial * Add lm32_uart_create function to create lm32 uart device Signed-off-by: xiaoqiang zhao Message-Id: <1464158344-12266-5-git-send-email-zxq_yx_007@163.com> Tested-by: Michael Walle Acked-by: Michael Walle Signed-off-by: Paolo Bonzini --- hw/lm32/lm32_boards.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/lm32/lm32_boards.c') diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 2ae6555b5b..8f0c3079d6 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -132,7 +132,7 @@ static void lm32_evr_init(MachineState *machine) irq[i] = qdev_get_gpio_in(env->pic_state, i); } - sysbus_create_simple("lm32-uart", uart0_base, irq[uart0_irq]); + lm32_uart_create(uart0_base, irq[uart0_irq], serial_hds[0]); sysbus_create_simple("lm32-timer", timer0_base, irq[timer0_irq]); sysbus_create_simple("lm32-timer", timer1_base, irq[timer1_irq]); @@ -233,7 +233,7 @@ static void lm32_uclinux_init(MachineState *machine) irq[i] = qdev_get_gpio_in(env->pic_state, i); } - sysbus_create_simple("lm32-uart", uart0_base, irq[uart0_irq]); + lm32_uart_create(uart0_base, irq[uart0_irq], serial_hds[0]); sysbus_create_simple("lm32-timer", timer0_base, irq[timer0_irq]); sysbus_create_simple("lm32-timer", timer1_base, irq[timer1_irq]); sysbus_create_simple("lm32-timer", timer2_base, irq[timer2_irq]); -- cgit v1.2.3