ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/raspi: Make board_rev a field of RaspiMachineClass 

We want to have a common class_init(). The only value that
matters (and changes) is the board revision.
Pass the board_rev as class_data to class_init().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200208165645.15657-9-f4bug@amsat.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-02-08 17:56:40 +01:00 committed by Peter Maydell
parent cb57df6f7f
commit c318c66c67
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/arm/raspi.c
View File

@ -46,6 +46,7 @@ typedef struct RaspiMachineClass {
/*< private >*/ /*< private >*/
MachineClass parent_obj; MachineClass parent_obj;
/*< public >*/ /*< public >*/
uint32_t board_rev;
} RaspiMachineClass; } RaspiMachineClass;
#define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common")
@ -227,9 +228,11 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo); arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
} }
static void raspi_init(MachineState *machine, uint32_t board_rev) static void raspi_init(MachineState *machine)
{ {
RaspiMachineClass *mc = RASPI_MACHINE_GET_CLASS(machine);
RaspiMachineState *s = RASPI_MACHINE(machine); RaspiMachineState *s = RASPI_MACHINE(machine);
uint32_t board_rev = mc->board_rev;
int version = board_version(board_rev); int version = board_version(board_rev);
uint64_t ram_size = board_ram_size(board_rev); uint64_t ram_size = board_ram_size(board_rev);
uint32_t vcram_size; uint32_t vcram_size;
@ -279,13 +282,16 @@ static void raspi_init(MachineState *machine, uint32_t board_rev)
static void raspi2_init(MachineState *machine) static void raspi2_init(MachineState *machine)
{ {
raspi_init(machine, 0xa21041); raspi_init(machine);
} }
static void raspi2_machine_class_init(ObjectClass *oc, void *data) static void raspi2_machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
uint32_t board_rev = (uint32_t)(uintptr_t)data;
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 2B"; mc->desc = "Raspberry Pi 2B";
mc->init = raspi2_init; mc->init = raspi2_init;
mc->block_default_type = IF_SD; mc->block_default_type = IF_SD;
@ -302,13 +308,16 @@ static void raspi2_machine_class_init(ObjectClass *oc, void *data)
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
static void raspi3_init(MachineState *machine) static void raspi3_init(MachineState *machine)
{ {
raspi_init(machine, 0xa02082); raspi_init(machine);
} }
static void raspi3_machine_class_init(ObjectClass *oc, void *data) static void raspi3_machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
uint32_t board_rev = (uint32_t)(uintptr_t)data;
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 3B"; mc->desc = "Raspberry Pi 3B";
mc->init = raspi3_init; mc->init = raspi3_init;
mc->block_default_type = IF_SD; mc->block_default_type = IF_SD;
@ -327,11 +336,13 @@ static const TypeInfo raspi_machine_types[] = {
.name = MACHINE_TYPE_NAME("raspi2"), .name = MACHINE_TYPE_NAME("raspi2"),
.parent = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_MACHINE,
.class_init = raspi2_machine_class_init, .class_init = raspi2_machine_class_init,
.class_data = (void *)0xa21041,
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
}, { }, {
.name = MACHINE_TYPE_NAME("raspi3"), .name = MACHINE_TYPE_NAME("raspi3"),
.parent = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_MACHINE,
.class_init = raspi3_machine_class_init, .class_init = raspi3_machine_class_init,
.class_data = (void *)0xa02082,
#endif #endif
}, { }, {
.name = TYPE_RASPI_MACHINE, .name = TYPE_RASPI_MACHINE,