[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/11] lm32_uart: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH v4 05/11] lm32_uart: convert to memory API |
Date: |
Thu, 24 Nov 2011 14:31:16 +0100 |
Signed-off-by: Benoît Canet <address@hidden>
---
hw/lm32_uart.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c
index 3678545..46a5ae0 100644
--- a/hw/lm32_uart.c
+++ b/hw/lm32_uart.c
@@ -91,6 +91,7 @@ enum {
struct LM32UartState {
SysBusDevice busdev;
+ MemoryRegion iomem;
CharDriverState *chr;
qemu_irq irq;
@@ -124,7 +125,8 @@ static void uart_update_irq(LM32UartState *s)
qemu_set_irq(s->irq, irq);
}
-static uint32_t uart_read(void *opaque, target_phys_addr_t addr)
+static uint64_t uart_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
LM32UartState *s = opaque;
uint32_t r = 0;
@@ -158,7 +160,8 @@ static uint32_t uart_read(void *opaque, target_phys_addr_t
addr)
return r;
}
-static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value)
+static void uart_write(void *opaque, target_phys_addr_t addr,
+ uint64_t value, unsigned size)
{
LM32UartState *s = opaque;
unsigned char ch = value;
@@ -192,16 +195,14 @@ static void uart_write(void *opaque, target_phys_addr_t
addr, uint32_t value)
uart_update_irq(s);
}
-static CPUReadMemoryFunc * const uart_read_fn[] = {
- NULL,
- NULL,
- &uart_read,
-};
-
-static CPUWriteMemoryFunc * const uart_write_fn[] = {
- NULL,
- NULL,
- &uart_write,
+static const MemoryRegionOps uart_ops = {
+ .read = uart_read,
+ .write = uart_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
};
static void uart_rx(void *opaque, const uint8_t *buf, int size)
@@ -245,13 +246,11 @@ static void uart_reset(DeviceState *d)
static int lm32_uart_init(SysBusDevice *dev)
{
LM32UartState *s = FROM_SYSBUS(typeof(*s), dev);
- int uart_regs;
sysbus_init_irq(dev, &s->irq);
- uart_regs = cpu_register_io_memory(uart_read_fn, uart_write_fn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, R_MAX * 4, uart_regs);
+ memory_region_init_io(&s->iomem, &uart_ops, s, "uart", R_MAX * 4);
+ sysbus_init_mmio_region(dev, &s->iomem);
s->chr = qdev_init_chardev(&dev->qdev);
if (s->chr) {
--
1.7.7.3
- [Qemu-devel] [PATCH v4 00/11] more memory API conversions, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 01/11] mcf5206: convert to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 04/11] mcf_intc: convert to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 09/11] bonito: convert south bridge pci config to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 05/11] lm32_uart: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH v4 03/11] mcf_fec: convert to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 06/11] lm32_sys: convert to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 02/11] mcf_uart: convert to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 07/11] bonito: convert north bridge register mapping to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 11/11] bonito: convert cop to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 10/11] bonito: convert ldma to memory API, Benoît Canet, 2011/11/24
- [Qemu-devel] [PATCH v4 08/11] bonito: convert north bridge pci config to memory API, Benoît Canet, 2011/11/24
- Re: [Qemu-devel] [PATCH v4 00/11] more memory API conversions, Avi Kivity, 2011/11/24