mirror of https://gitlab.com/qemu-project/qemu
m48t59: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
871321acb3
commit
5a31cd68ba
23
hw/m48t59.c
23
hw/m48t59.c
|
@ -52,6 +52,7 @@
|
||||||
struct M48t59State {
|
struct M48t59State {
|
||||||
/* Hardware parameters */
|
/* Hardware parameters */
|
||||||
qemu_irq IRQ;
|
qemu_irq IRQ;
|
||||||
|
MemoryRegion iomem;
|
||||||
uint32_t io_base;
|
uint32_t io_base;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
/* RTC management */
|
/* RTC management */
|
||||||
|
@ -573,16 +574,12 @@ static uint32_t nvram_readl (void *opaque, target_phys_addr_t addr)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static CPUWriteMemoryFunc * const nvram_write[] = {
|
static const MemoryRegionOps nvram_ops = {
|
||||||
&nvram_writeb,
|
.old_mmio = {
|
||||||
&nvram_writew,
|
.read = { nvram_readb, nvram_readw, nvram_readl, },
|
||||||
&nvram_writel,
|
.write = { nvram_writeb, nvram_writew, nvram_writel, },
|
||||||
};
|
},
|
||||||
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
||||||
static CPUReadMemoryFunc * const nvram_read[] = {
|
|
||||||
&nvram_readb,
|
|
||||||
&nvram_readw,
|
|
||||||
&nvram_readl,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const VMStateDescription vmstate_m48t59 = {
|
static const VMStateDescription vmstate_m48t59 = {
|
||||||
|
@ -712,13 +709,11 @@ static int m48t59_init1(SysBusDevice *dev)
|
||||||
{
|
{
|
||||||
M48t59SysBusState *d = FROM_SYSBUS(M48t59SysBusState, dev);
|
M48t59SysBusState *d = FROM_SYSBUS(M48t59SysBusState, dev);
|
||||||
M48t59State *s = &d->state;
|
M48t59State *s = &d->state;
|
||||||
int mem_index;
|
|
||||||
|
|
||||||
sysbus_init_irq(dev, &s->IRQ);
|
sysbus_init_irq(dev, &s->IRQ);
|
||||||
|
|
||||||
mem_index = cpu_register_io_memory(nvram_read, nvram_write, s,
|
memory_region_init_io(&s->iomem, &nvram_ops, s, "m48t59.nvram", s->size);
|
||||||
DEVICE_NATIVE_ENDIAN);
|
sysbus_init_mmio_region(dev, &s->iomem);
|
||||||
sysbus_init_mmio(dev, s->size, mem_index);
|
|
||||||
m48t59_init_common(s);
|
m48t59_init_common(s);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue