mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
hw/char/mcf_uart: Have mcf_uart_create() return DeviceState
There is no point in having mcf_uart_init() demote the DeviceState pointer and return a void one. Directly return the real typedef. mcf_uart_init() do both init + realize: rename as mcf_uart_create(). Similarly, mcf_uart_mm_init() do init / realize / mmap: rename as mcf_uart_create_mmap(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20231019104929.16517-1-philmd@linaro.org> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
This commit is contained in:
parent
7f090ed710
commit
f213ccc968
4 changed files with 15 additions and 14 deletions
|
@ -168,7 +168,7 @@ typedef struct {
|
|||
MemoryRegion iomem;
|
||||
qemu_irq *pic;
|
||||
m5206_timer_state *timer[2];
|
||||
void *uart[2];
|
||||
DeviceState *uart[2];
|
||||
uint8_t scr;
|
||||
uint8_t icr[14];
|
||||
uint16_t imr; /* 1 == interrupt is masked. */
|
||||
|
@ -600,8 +600,8 @@ static void mcf5206_mbar_realize(DeviceState *dev, Error **errp)
|
|||
s->pic = qemu_allocate_irqs(m5206_mbar_set_irq, s, 14);
|
||||
s->timer[0] = m5206_timer_init(s->pic[9]);
|
||||
s->timer[1] = m5206_timer_init(s->pic[10]);
|
||||
s->uart[0] = mcf_uart_init(s->pic[12], serial_hd(0));
|
||||
s->uart[1] = mcf_uart_init(s->pic[13], serial_hd(1));
|
||||
s->uart[0] = mcf_uart_create(s->pic[12], serial_hd(0));
|
||||
s->uart[1] = mcf_uart_create(s->pic[13], serial_hd(1));
|
||||
}
|
||||
|
||||
static Property mcf5206_mbar_properties[] = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue