mirror of https://github.com/xemu-project/xemu.git
hw/integratorcp: Simplify flash remap code
Use the new memory mutator API to simplify the flash remap code; this allows us to drop the flash_mapped flag. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
This commit is contained in:
parent
4753dea8c1
commit
563c2bf35c
|
@ -21,7 +21,6 @@ typedef struct {
|
|||
MemoryRegion iomem;
|
||||
uint32_t memsz;
|
||||
MemoryRegion flash;
|
||||
bool flash_mapped;
|
||||
uint32_t cm_osc;
|
||||
uint32_t cm_ctrl;
|
||||
uint32_t cm_lock;
|
||||
|
@ -110,20 +109,12 @@ static uint64_t integratorcm_read(void *opaque, target_phys_addr_t offset,
|
|||
}
|
||||
}
|
||||
|
||||
static void integratorcm_do_remap(integratorcm_state *s, int flash)
|
||||
static void integratorcm_do_remap(integratorcm_state *s)
|
||||
{
|
||||
if (!flash) {
|
||||
if (s->flash_mapped) {
|
||||
sysbus_del_memory(&s->busdev, &s->flash);
|
||||
s->flash_mapped = false;
|
||||
}
|
||||
} else {
|
||||
if (!s->flash_mapped) {
|
||||
sysbus_add_memory_overlap(&s->busdev, 0, &s->flash, 1);
|
||||
s->flash_mapped = true;
|
||||
}
|
||||
}
|
||||
//??? tlb_flush (cpu_single_env, 1);
|
||||
/* Sync memory region state with CM_CTRL REMAP bit:
|
||||
* bit 0 => flash at address 0; bit 1 => RAM
|
||||
*/
|
||||
memory_region_set_enabled(&s->flash, !(s->cm_ctrl & 4));
|
||||
}
|
||||
|
||||
static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
|
||||
|
@ -131,9 +122,6 @@ static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
|
|||
if (value & 8) {
|
||||
qemu_system_reset_request();
|
||||
}
|
||||
if ((s->cm_ctrl ^ value) & 4) {
|
||||
integratorcm_do_remap(s, (value & 4) == 0);
|
||||
}
|
||||
if ((s->cm_ctrl ^ value) & 1) {
|
||||
/* (value & 1) != 0 means the green "MISC LED" is lit.
|
||||
* We don't have any nice place to display LEDs. printf is a bad
|
||||
|
@ -143,6 +131,7 @@ static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
|
|||
}
|
||||
/* Note that the RESET bit [3] always reads as zero */
|
||||
s->cm_ctrl = (s->cm_ctrl & ~5) | (value & 5);
|
||||
integratorcm_do_remap(s);
|
||||
}
|
||||
|
||||
static void integratorcm_update(integratorcm_state *s)
|
||||
|
@ -263,13 +252,12 @@ static int integratorcm_init(SysBusDevice *dev)
|
|||
s->cm_init = 0x00000112;
|
||||
memory_region_init_ram(&s->flash, "integrator.flash", 0x100000);
|
||||
vmstate_register_ram_global(&s->flash);
|
||||
s->flash_mapped = false;
|
||||
|
||||
memory_region_init_io(&s->iomem, &integratorcm_ops, s,
|
||||
"integratorcm", 0x00800000);
|
||||
sysbus_init_mmio(dev, &s->iomem);
|
||||
|
||||
integratorcm_do_remap(s, 1);
|
||||
integratorcm_do_remap(s);
|
||||
/* ??? Save/restore. */
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue