mirror of https://github.com/xemu-project/xemu.git
ppc/sam460ex: Remove address_space_mem local variable
Some places already use get_system_memory() directly so replace the remaining uses and drop the local variable. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Message-ID: <d134d64f13258d1f157b445fedb1e86cf3abb606.1688586835.git.balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
340dc03c79
commit
41cd3e649b
|
@ -269,7 +269,6 @@ static void main_cpu_reset(void *opaque)
|
||||||
|
|
||||||
static void sam460ex_init(MachineState *machine)
|
static void sam460ex_init(MachineState *machine)
|
||||||
{
|
{
|
||||||
MemoryRegion *address_space_mem = get_system_memory();
|
|
||||||
MemoryRegion *isa = g_new(MemoryRegion, 1);
|
MemoryRegion *isa = g_new(MemoryRegion, 1);
|
||||||
MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1);
|
MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1);
|
||||||
DeviceState *uic[4];
|
DeviceState *uic[4];
|
||||||
|
@ -409,7 +408,8 @@ static void sam460ex_init(MachineState *machine)
|
||||||
/* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */
|
/* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */
|
||||||
memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB,
|
memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB,
|
||||||
&error_abort);
|
&error_abort);
|
||||||
memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_ram);
|
memory_region_add_subregion(get_system_memory(), 0x400000000LL,
|
||||||
|
l2cache_ram);
|
||||||
|
|
||||||
/* USB */
|
/* USB */
|
||||||
sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400,
|
sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400,
|
||||||
|
@ -459,13 +459,13 @@ static void sam460ex_init(MachineState *machine)
|
||||||
/* SoC has 4 UARTs
|
/* SoC has 4 UARTs
|
||||||
* but board has only one wired and two are present in fdt */
|
* but board has only one wired and two are present in fdt */
|
||||||
if (serial_hd(0) != NULL) {
|
if (serial_hd(0) != NULL) {
|
||||||
serial_mm_init(address_space_mem, 0x4ef600300, 0,
|
serial_mm_init(get_system_memory(), 0x4ef600300, 0,
|
||||||
qdev_get_gpio_in(uic[1], 1),
|
qdev_get_gpio_in(uic[1], 1),
|
||||||
PPC_SERIAL_MM_BAUDBASE, serial_hd(0),
|
PPC_SERIAL_MM_BAUDBASE, serial_hd(0),
|
||||||
DEVICE_BIG_ENDIAN);
|
DEVICE_BIG_ENDIAN);
|
||||||
}
|
}
|
||||||
if (serial_hd(1) != NULL) {
|
if (serial_hd(1) != NULL) {
|
||||||
serial_mm_init(address_space_mem, 0x4ef600400, 0,
|
serial_mm_init(get_system_memory(), 0x4ef600400, 0,
|
||||||
qdev_get_gpio_in(uic[0], 1),
|
qdev_get_gpio_in(uic[0], 1),
|
||||||
PPC_SERIAL_MM_BAUDBASE, serial_hd(1),
|
PPC_SERIAL_MM_BAUDBASE, serial_hd(1),
|
||||||
DEVICE_BIG_ENDIAN);
|
DEVICE_BIG_ENDIAN);
|
||||||
|
|
Loading…
Reference in New Issue