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

cs4321: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-09 16:10:07 +02:00
parent 9d7f1b9aa5
commit df182043ab
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/cs4231.c
View File

@ -35,6 +35,7 @@
typedef struct CSState { typedef struct CSState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
qemu_irq irq; qemu_irq irq;
uint32_t regs[CS_REGS]; uint32_t regs[CS_REGS];
uint8_t dregs[CS_DREGS]; uint8_t dregs[CS_DREGS];
@ -54,7 +55,8 @@ static void cs_reset(DeviceState *d)
s->dregs[25] = CS_VER; s->dregs[25] = CS_VER;
} }
static uint32_t cs_mem_readl(void *opaque, target_phys_addr_t addr) static uint64_t cs_mem_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
CSState *s = opaque; CSState *s = opaque;
uint32_t saddr, ret; uint32_t saddr, ret;
@ -80,7 +82,8 @@ static uint32_t cs_mem_readl(void *opaque, target_phys_addr_t addr)
return ret; return ret;
} }
static void cs_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) static void cs_mem_write(void *opaque, target_phys_addr_t addr,
uint64_t val, unsigned size)
{ {
CSState *s = opaque; CSState *s = opaque;
uint32_t saddr; uint32_t saddr;
@ -119,16 +122,10 @@ static void cs_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
} }
} }
static CPUReadMemoryFunc * const cs_mem_read[3] = { static const MemoryRegionOps cs_mem_ops = {
cs_mem_readl, .read = cs_mem_read,
cs_mem_readl, .write = cs_mem_write,
cs_mem_readl, .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const cs_mem_write[3] = {
cs_mem_writel,
cs_mem_writel,
cs_mem_writel,
}; };
static const VMStateDescription vmstate_cs4231 = { static const VMStateDescription vmstate_cs4231 = {
@ -145,12 +142,10 @@ static const VMStateDescription vmstate_cs4231 = {
static int cs4231_init1(SysBusDevice *dev) static int cs4231_init1(SysBusDevice *dev)
{ {
int io;
CSState *s = FROM_SYSBUS(CSState, dev); CSState *s = FROM_SYSBUS(CSState, dev);
io = cpu_register_io_memory(cs_mem_read, cs_mem_write, s, memory_region_init_io(&s->iomem, &cs_mem_ops, s, "cs4321", CS_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, CS_SIZE, io);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
return 0; return 0;