diff options
| author | Cédric Le Goater | 2021-10-12 08:20:08 +0200 |
|---|---|---|
| committer | Cédric Le Goater | 2021-10-12 08:20:08 +0200 |
| commit | 30b6852ce4c3398c54fc6f6c7ff5ccbf8c15cf4f (patch) | |
| tree | 2ceed7e6a2e86a393c18092f59012cc205bde77c /hw/arm/aspeed_soc.c | |
| parent | aspeed/smc: Stop using the model name for the memory regions (diff) | |
| download | qemu-30b6852ce4c3398c54fc6f6c7ff5ccbf8c15cf4f.tar.gz qemu-30b6852ce4c3398c54fc6f6c7ff5ccbf8c15cf4f.tar.xz qemu-30b6852ce4c3398c54fc6f6c7ff5ccbf8c15cf4f.zip | |
aspeed/smc: Drop AspeedSMCController structure
The characteristics of the Aspeed controllers are described in a
AspeedSMCController structure which is redundant with the
AspeedSMCClass. Move all attributes under the class and adapt the code
to use class attributes instead.
This is a large change but it is functionally equivalent.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw/arm/aspeed_soc.c')
| -rw-r--r-- | hw/arm/aspeed_soc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index ed84502e23..4f013dd5cd 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -310,7 +310,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) } sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 1, - s->fmc.ctrl->flash_window_base); + ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); @@ -323,7 +323,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, sc->memmap[ASPEED_DEV_SPI1 + i]); sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 1, - s->spi[i].ctrl->flash_window_base); + ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); } /* EHCI */ |