motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/char/cmsdk-apb-uart: Open-code cmsdk_apb_uart_create()

Browse source 
cmsdk_apb_uart_create() is only used twice in the same
file. Open-code it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20230220115114.25237-7-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-20 12:51:12 +01:00 • committed by Peter Maydell
parent dc1daf392c
commit 4ab694b9a8
2 changed files with 27 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

41
hw/arm/mps2.c
View file

@ -35,6 +35,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
#include "hw/misc/unimp.h" #include "hw/misc/unimp.h"
#include "hw/char/cmsdk-apb-uart.h" #include "hw/char/cmsdk-apb-uart.h"
#include "hw/timer/cmsdk-apb-timer.h" #include "hw/timer/cmsdk-apb-timer.h"
@ -282,6 +283,9 @@ static void mps2_common_init(MachineState *machine)
qdev_connect_gpio_out(orgate_dev, 0, qdev_get_gpio_in(armv7m, 12)); qdev_connect_gpio_out(orgate_dev, 0, qdev_get_gpio_in(armv7m, 12));
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
DeviceState *dev;
SysBusDevice *s;
static const hwaddr uartbase[] = {0x40004000, 0x40005000, static const hwaddr uartbase[] = {0x40004000, 0x40005000,
0x40006000, 0x40007000, 0x40006000, 0x40007000,
0x40009000}; 0x40009000};
@ -294,12 +298,16 @@ static void mps2_common_init(MachineState *machine)
rxovrint = qdev_get_gpio_in(orgate_dev, i * 2 + 1); rxovrint = qdev_get_gpio_in(orgate_dev, i * 2 + 1);
} }
cmsdk_apb_uart_create(uartbase[i], dev = qdev_new(TYPE_CMSDK_APB_UART);
qdev_get_gpio_in(armv7m, uartirq[i] + 1), s = SYS_BUS_DEVICE(dev);
qdev_get_gpio_in(armv7m, uartirq[i]), qdev_prop_set_chr(dev, "chardev", serial_hd(i));
txovrint, rxovrint, qdev_prop_set_uint32(dev, "pclk-frq", SYSCLK_FRQ);
NULL, sysbus_realize_and_unref(s, &error_fatal);
serial_hd(i), SYSCLK_FRQ); sysbus_mmio_map(s, 0, uartbase[i]);
sysbus_connect_irq(s, 0, qdev_get_gpio_in(armv7m, uartirq[i] + 1));
sysbus_connect_irq(s, 1, qdev_get_gpio_in(armv7m, uartirq[i]));
sysbus_connect_irq(s, 2, txovrint);
sysbus_connect_irq(s, 3, rxovrint);
} }
break; break;
} }
@ -324,7 +332,8 @@ static void mps2_common_init(MachineState *machine)
0x4002c000, 0x4002d000, 0x4002c000, 0x4002d000,
0x4002e000}; 0x4002e000};
Object *txrx_orgate; Object *txrx_orgate;
DeviceState *txrx_orgate_dev; DeviceState *txrx_orgate_dev, *dev;
SysBusDevice *s;
txrx_orgate = object_new(TYPE_OR_IRQ); txrx_orgate = object_new(TYPE_OR_IRQ);
object_property_set_int(txrx_orgate, "num-lines", 2, &error_fatal); object_property_set_int(txrx_orgate, "num-lines", 2, &error_fatal);
@ -332,13 +341,17 @@ static void mps2_common_init(MachineState *machine)
txrx_orgate_dev = DEVICE(txrx_orgate); txrx_orgate_dev = DEVICE(txrx_orgate);
qdev_connect_gpio_out(txrx_orgate_dev, 0, qdev_connect_gpio_out(txrx_orgate_dev, 0,
qdev_get_gpio_in(armv7m, uart_txrx_irqno[i])); qdev_get_gpio_in(armv7m, uart_txrx_irqno[i]));
cmsdk_apb_uart_create(uartbase[i],
qdev_get_gpio_in(txrx_orgate_dev, 0), dev = qdev_new(TYPE_CMSDK_APB_UART);
qdev_get_gpio_in(txrx_orgate_dev, 1), s = SYS_BUS_DEVICE(dev);
qdev_get_gpio_in(orgate_dev, i * 2), qdev_prop_set_chr(dev, "chardev", serial_hd(i));
qdev_get_gpio_in(orgate_dev, i * 2 + 1), qdev_prop_set_uint32(dev, "pclk-frq", SYSCLK_FRQ);
NULL, sysbus_realize_and_unref(s, &error_fatal);
serial_hd(i), SYSCLK_FRQ); sysbus_mmio_map(s, 0, uartbase[i]);
sysbus_connect_irq(s, 0, qdev_get_gpio_in(txrx_orgate_dev, 0));
sysbus_connect_irq(s, 1, qdev_get_gpio_in(txrx_orgate_dev, 1));
sysbus_connect_irq(s, 2, qdev_get_gpio_in(orgate_dev, i * 2));
sysbus_connect_irq(s, 3, qdev_get_gpio_in(orgate_dev, i * 2 + 1));
} }
break; break;
} }

34
include/hw/char/cmsdk-apb-uart.h
View file

@ -12,10 +12,8 @@
#ifndef CMSDK_APB_UART_H #ifndef CMSDK_APB_UART_H
#define CMSDK_APB_UART_H #define CMSDK_APB_UART_H
#include "hw/qdev-properties.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "qapi/error.h"
#include "qom/object.h" #include "qom/object.h"
#define TYPE_CMSDK_APB_UART "cmsdk-apb-uart" #define TYPE_CMSDK_APB_UART "cmsdk-apb-uart"
@ -45,36 +43,4 @@ struct CMSDKAPBUART {
uint8_t rxbuf; uint8_t rxbuf;
}; };
/**
* cmsdk_apb_uart_create - convenience function to create TYPE_CMSDK_APB_UART
* @addr: location in system memory to map registers
* @chr: Chardev backend to connect UART to, or NULL if no backend
* @pclk_frq: frequency in Hz of the PCLK clock (used for calculating baud rate)
*/
static inline DeviceState *cmsdk_apb_uart_create(hwaddr addr,
qemu_irq txint,
qemu_irq rxint,
qemu_irq txovrint,
qemu_irq rxovrint,
qemu_irq uartint,
Chardev *chr,
uint32_t pclk_frq)
{
DeviceState *dev;
SysBusDevice *s;
dev = qdev_new(TYPE_CMSDK_APB_UART);
s = SYS_BUS_DEVICE(dev);
qdev_prop_set_chr(dev, "chardev", chr);
qdev_prop_set_uint32(dev, "pclk-frq", pclk_frq);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_mmio_map(s, 0, addr);
sysbus_connect_irq(s, 0, txint);
sysbus_connect_irq(s, 1, rxint);
sysbus_connect_irq(s, 2, txovrint);
sysbus_connect_irq(s, 3, rxovrint);
sysbus_connect_irq(s, 4, uartint);
return dev;
}
#endif #endif