david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lm32_uart: convert to memory API

Browse Source 
Signed-off-by: Benoît Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-11-24 14:31:16 +01:00 committed by Avi Kivity
parent 663d94467a
commit 5f2be17af1
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/lm32_uart.c
View File

@ -91,6 +91,7 @@ enum {
struct LM32UartState { struct LM32UartState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
CharDriverState *chr; CharDriverState *chr;
qemu_irq irq; qemu_irq irq;
@ -124,7 +125,8 @@ static void uart_update_irq(LM32UartState *s)
qemu_set_irq(s->irq, irq); 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; LM32UartState *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -158,7 +160,8 @@ static uint32_t uart_read(void *opaque, target_phys_addr_t addr)
return r; 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; LM32UartState *s = opaque;
unsigned char ch = value; 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); uart_update_irq(s);
} }
static CPUReadMemoryFunc * const uart_read_fn[] = { static const MemoryRegionOps uart_ops = {
NULL, .read = uart_read,
NULL, .write = uart_write,
&uart_read, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 4,
static CPUWriteMemoryFunc * const uart_write_fn[] = { .max_access_size = 4,
NULL, },
NULL,
&uart_write,
}; };
static void uart_rx(void *opaque, const uint8_t *buf, int size) 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) static int lm32_uart_init(SysBusDevice *dev)
{ {
LM32UartState *s = FROM_SYSBUS(typeof(*s), dev); LM32UartState *s = FROM_SYSBUS(typeof(*s), dev);
int uart_regs;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
uart_regs = cpu_register_io_memory(uart_read_fn, uart_write_fn, s, memory_region_init_io(&s->iomem, &uart_ops, s, "uart", R_MAX * 4);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, R_MAX * 4, uart_regs);
s->chr = qdev_init_chardev(&dev->qdev); s->chr = qdev_init_chardev(&dev->qdev);
if (s->chr) { if (s->chr) {