SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

microbit: Tidy up sysbus_init_child_obj() @child argument

Browse Source 
The callers of sysbus_init_child_obj() commonly pass either &child,
sizeof(child), or pchild, sizeof(*pchild).  Tidy up two that don't,
mostly to keep future commits simpler.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-41-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-10 07:32:29 +02:00
parent 9bdee7f4a5
commit b0d09949fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/microbit.c
View File

@ -39,7 +39,7 @@ static void microbit_init(MachineState *machine)
Object *soc = OBJECT(&s->nrf51); Object *soc = OBJECT(&s->nrf51);
Object *i2c = OBJECT(&s->i2c); Object *i2c = OBJECT(&s->i2c);
sysbus_init_child_obj(OBJECT(machine), "nrf51", soc, sizeof(s->nrf51), sysbus_init_child_obj(OBJECT(machine), "nrf51", &s->nrf51, sizeof(s->nrf51),
TYPE_NRF51_SOC); TYPE_NRF51_SOC);
qdev_prop_set_chr(DEVICE(&s->nrf51), "serial0", serial_hd(0)); qdev_prop_set_chr(DEVICE(&s->nrf51), "serial0", serial_hd(0));
object_property_set_link(soc, OBJECT(system_memory), "memory", object_property_set_link(soc, OBJECT(system_memory), "memory",
@ -51,7 +51,7 @@ static void microbit_init(MachineState *machine)
* hack until we implement the nRF51 TWI controller properly and the * hack until we implement the nRF51 TWI controller properly and the
* magnetometer/accelerometer devices. * magnetometer/accelerometer devices.
*/ */
sysbus_init_child_obj(OBJECT(machine), "microbit.twi", i2c, sysbus_init_child_obj(OBJECT(machine), "microbit.twi", &s->i2c,
sizeof(s->i2c), TYPE_MICROBIT_I2C); sizeof(s->i2c), TYPE_MICROBIT_I2C);
object_property_set_bool(i2c, true, "realized", &error_fatal); object_property_set_bool(i2c, true, "realized", &error_fatal);
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);