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

stellaris: convert sys to memory API

Browse Source 
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-17 17:28:29 +02:00 committed by Avi Kivity
parent 0c36493e51
commit 5699301fe2
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/stellaris.c
View File

@ -327,6 +327,7 @@ static int stellaris_gptm_init(SysBusDevice *dev)
/* System controller. */ /* System controller. */
typedef struct { typedef struct {
MemoryRegion iomem;
uint32_t pborctl; uint32_t pborctl;
uint32_t ldopctl; uint32_t ldopctl;
uint32_t int_status; uint32_t int_status;
@ -414,7 +415,8 @@ static int ssys_board_class(const ssys_state *s)
} }
} }
static uint32_t ssys_read(void *opaque, target_phys_addr_t offset) static uint64_t ssys_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
ssys_state *s = (ssys_state *)opaque; ssys_state *s = (ssys_state *)opaque;
@ -518,7 +520,8 @@ static void ssys_calculate_system_clock(ssys_state *s)
} }
} }
static void ssys_write(void *opaque, target_phys_addr_t offset, uint32_t value) static void ssys_write(void *opaque, target_phys_addr_t offset,
uint64_t value, unsigned size)
{ {
ssys_state *s = (ssys_state *)opaque; ssys_state *s = (ssys_state *)opaque;
@ -602,16 +605,10 @@ static void ssys_write(void *opaque, target_phys_addr_t offset, uint32_t value)
ssys_update(s); ssys_update(s);
} }
static CPUReadMemoryFunc * const ssys_readfn[] = { static const MemoryRegionOps ssys_ops = {
ssys_read, .read = ssys_read,
ssys_read, .write = ssys_write,
ssys_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const ssys_writefn[] = {
ssys_write,
ssys_write,
ssys_write
}; };
static void ssys_reset(void *opaque) static void ssys_reset(void *opaque)
@ -667,7 +664,6 @@ static int stellaris_sys_init(uint32_t base, qemu_irq irq,
stellaris_board_info * board, stellaris_board_info * board,
uint8_t *macaddr) uint8_t *macaddr)
{ {
int iomemtype;
ssys_state *s; ssys_state *s;
s = (ssys_state *)g_malloc0(sizeof(ssys_state)); s = (ssys_state *)g_malloc0(sizeof(ssys_state));
@ -677,10 +673,8 @@ static int stellaris_sys_init(uint32_t base, qemu_irq irq,
s->user0 = macaddr[0] | (macaddr[1] << 8) | (macaddr[2] << 16); s->user0 = macaddr[0] | (macaddr[1] << 8) | (macaddr[2] << 16);
s->user1 = macaddr[3] | (macaddr[4] << 8) | (macaddr[5] << 16); s->user1 = macaddr[3] | (macaddr[4] << 8) | (macaddr[5] << 16);
iomemtype = cpu_register_io_memory(ssys_readfn, memory_region_init_io(&s->iomem, &ssys_ops, s, "ssys", 0x00001000);
ssys_writefn, s, memory_region_add_subregion(get_system_memory(), base, &s->iomem);
DEVICE_NATIVE_ENDIAN);
cpu_register_physical_memory(base, 0x00001000, iomemtype);
ssys_reset(s); ssys_reset(s);
vmstate_register(NULL, -1, &vmstate_stellaris_sys, s); vmstate_register(NULL, -1, &vmstate_stellaris_sys, s);
return 0; return 0;