ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

syborg_serial: convert to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-24 22:38:26 +02:00 committed by Avi Kivity
parent 43b8c30da2
commit a8a008223c
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/syborg_serial.c
View File

@ -58,6 +58,7 @@ enum {
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
uint32_t int_enable; uint32_t int_enable;
uint32_t fifo_size; uint32_t fifo_size;
uint32_t *read_fifo; uint32_t *read_fifo;
@ -152,7 +153,8 @@ static void dma_rx_start(SyborgSerialState *s, uint32_t len)
syborg_serial_update(s); syborg_serial_update(s);
} }
static uint32_t syborg_serial_read(void *opaque, target_phys_addr_t offset) static uint64_t syborg_serial_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
SyborgSerialState *s = (SyborgSerialState *)opaque; SyborgSerialState *s = (SyborgSerialState *)opaque;
uint32_t c; uint32_t c;
@ -192,7 +194,7 @@ static uint32_t syborg_serial_read(void *opaque, target_phys_addr_t offset)
} }
static void syborg_serial_write(void *opaque, target_phys_addr_t offset, static void syborg_serial_write(void *opaque, target_phys_addr_t offset,
uint32_t value) uint64_t value, unsigned size)
{ {
SyborgSerialState *s = (SyborgSerialState *)opaque; SyborgSerialState *s = (SyborgSerialState *)opaque;
unsigned char ch; unsigned char ch;
@ -261,16 +263,10 @@ static void syborg_serial_event(void *opaque, int event)
/* TODO: Report BREAK events? */ /* TODO: Report BREAK events? */
} }
static CPUReadMemoryFunc * const syborg_serial_readfn[] = { static const MemoryRegionOps syborg_serial_ops = {
syborg_serial_read, .read = syborg_serial_read,
syborg_serial_read, .write = syborg_serial_write,
syborg_serial_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const syborg_serial_writefn[] = {
syborg_serial_write,
syborg_serial_write,
syborg_serial_write
}; };
static const VMStateDescription vmstate_syborg_serial = { static const VMStateDescription vmstate_syborg_serial = {
@ -295,13 +291,11 @@ static const VMStateDescription vmstate_syborg_serial = {
static int syborg_serial_init(SysBusDevice *dev) static int syborg_serial_init(SysBusDevice *dev)
{ {
SyborgSerialState *s = FROM_SYSBUS(SyborgSerialState, dev); SyborgSerialState *s = FROM_SYSBUS(SyborgSerialState, dev);
int iomemtype;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
iomemtype = cpu_register_io_memory(syborg_serial_readfn, memory_region_init_io(&s->iomem, &syborg_serial_ops, s,
syborg_serial_writefn, s, "serial", 0x1000);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, 0x1000, iomemtype);
s->chr = qdev_init_chardev(&dev->qdev); s->chr = qdev_init_chardev(&dev->qdev);
if (s->chr) { if (s->chr) {
qemu_chr_add_handlers(s->chr, syborg_serial_can_receive, qemu_chr_add_handlers(s->chr, syborg_serial_can_receive,