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

ds1225y: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-10 11:24:24 +02:00
parent 024e5bb664
commit 871321acb3
1 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hw/ds1225y.c
View File

@ -27,13 +27,14 @@
typedef struct { typedef struct {
DeviceState qdev; DeviceState qdev;
MemoryRegion iomem;
uint32_t chip_size; uint32_t chip_size;
char *filename; char *filename;
FILE *file; FILE *file;
uint8_t *contents; uint8_t *contents;
} NvRamState; } NvRamState;
static uint32_t nvram_readb (void *opaque, target_phys_addr_t addr) static uint64_t nvram_read(void *opaque, target_phys_addr_t addr, unsigned size)
{ {
NvRamState *s = opaque; NvRamState *s = opaque;
uint32_t val; uint32_t val;
@ -43,25 +44,8 @@ static uint32_t nvram_readb (void *opaque, target_phys_addr_t addr)
return val; return val;
} }
static uint32_t nvram_readw (void *opaque, target_phys_addr_t addr) static void nvram_write(void *opaque, target_phys_addr_t addr, uint64_t val,
{ unsigned size)
uint32_t v;
v = nvram_readb(opaque, addr);
v |= nvram_readb(opaque, addr + 1) << 8;
return v;
}
static uint32_t nvram_readl (void *opaque, target_phys_addr_t addr)
{
uint32_t v;
v = nvram_readb(opaque, addr);
v |= nvram_readb(opaque, addr + 1) << 8;
v |= nvram_readb(opaque, addr + 2) << 16;
v |= nvram_readb(opaque, addr + 3) << 24;
return v;
}
static void nvram_writeb (void *opaque, target_phys_addr_t addr, uint32_t val)
{ {
NvRamState *s = opaque; NvRamState *s = opaque;
@ -76,30 +60,14 @@ static void nvram_writeb (void *opaque, target_phys_addr_t addr, uint32_t val)
} }
} }
static void nvram_writew (void *opaque, target_phys_addr_t addr, uint32_t val) static const MemoryRegionOps nvram_ops = {
{ .read = nvram_read,
nvram_writeb(opaque, addr, val & 0xff); .write = nvram_write,
nvram_writeb(opaque, addr + 1, (val >> 8) & 0xff); .impl = {
} .min_access_size = 1,
.max_access_size = 1,
static void nvram_writel (void *opaque, target_phys_addr_t addr, uint32_t val) },
{ .endianness = DEVICE_LITTLE_ENDIAN,
nvram_writeb(opaque, addr, val & 0xff);
nvram_writeb(opaque, addr + 1, (val >> 8) & 0xff);
nvram_writeb(opaque, addr + 2, (val >> 16) & 0xff);
nvram_writeb(opaque, addr + 3, (val >> 24) & 0xff);
}
static CPUReadMemoryFunc * const nvram_read[] = {
&nvram_readb,
&nvram_readw,
&nvram_readl,
};
static CPUWriteMemoryFunc * const nvram_write[] = {
&nvram_writeb,
&nvram_writew,
&nvram_writel,
}; };
static int nvram_post_load(void *opaque, int version_id) static int nvram_post_load(void *opaque, int version_id)
@ -146,13 +114,11 @@ static int nvram_sysbus_initfn(SysBusDevice *dev)
{ {
NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram; NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram;
FILE *file; FILE *file;
int s_io;
s->contents = g_malloc0(s->chip_size); s->contents = g_malloc0(s->chip_size);
s_io = cpu_register_io_memory(nvram_read, nvram_write, s, memory_region_init_io(&s->iomem, &nvram_ops, s, "nvram", s->chip_size);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, s->chip_size, s_io);
/* Read current file */ /* Read current file */
file = fopen(s->filename, "rb"); file = fopen(s->filename, "rb");