xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 21:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/sparc/sun4m: Register machine types in sun4m_machine_types[]

Browse Source 
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-5-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Philippe Mathieu-Daudé 2021-05-03 19:13:01 +02:00 committed by Mark Cave-Ayland
parent f55e8977ec
commit 355eb81af1
1 changed files with 36 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
hw/sparc/sun4m.c
View File

@ -1396,12 +1396,6 @@ static void ss5_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[0]; smc->hwdef = &sun4m_hwdefs[0];
} }
static const TypeInfo ss5_type = {
.name = MACHINE_TYPE_NAME("SS-5"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss5_class_init,
};
static void ss10_class_init(ObjectClass *oc, void *data) static void ss10_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1413,12 +1407,6 @@ static void ss10_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[1]; smc->hwdef = &sun4m_hwdefs[1];
} }
static const TypeInfo ss10_type = {
.name = MACHINE_TYPE_NAME("SS-10"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss10_class_init,
};
static void ss600mp_class_init(ObjectClass *oc, void *data) static void ss600mp_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1430,12 +1418,6 @@ static void ss600mp_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[2]; smc->hwdef = &sun4m_hwdefs[2];
} }
static const TypeInfo ss600mp_type = {
.name = MACHINE_TYPE_NAME("SS-600MP"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss600mp_class_init,
};
static void ss20_class_init(ObjectClass *oc, void *data) static void ss20_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1447,12 +1429,6 @@ static void ss20_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[3]; smc->hwdef = &sun4m_hwdefs[3];
} }
static const TypeInfo ss20_type = {
.name = MACHINE_TYPE_NAME("SS-20"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss20_class_init,
};
static void voyager_class_init(ObjectClass *oc, void *data) static void voyager_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1463,12 +1439,6 @@ static void voyager_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[4]; smc->hwdef = &sun4m_hwdefs[4];
} }
static const TypeInfo voyager_type = {
.name = MACHINE_TYPE_NAME("Voyager"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = voyager_class_init,
};
static void ss_lx_class_init(ObjectClass *oc, void *data) static void ss_lx_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1479,12 +1449,6 @@ static void ss_lx_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[5]; smc->hwdef = &sun4m_hwdefs[5];
} }
static const TypeInfo ss_lx_type = {
.name = MACHINE_TYPE_NAME("LX"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss_lx_class_init,
};
static void ss4_class_init(ObjectClass *oc, void *data) static void ss4_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1495,12 +1459,6 @@ static void ss4_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[6]; smc->hwdef = &sun4m_hwdefs[6];
} }
static const TypeInfo ss4_type = {
.name = MACHINE_TYPE_NAME("SS-4"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss4_class_init,
};
static void scls_class_init(ObjectClass *oc, void *data) static void scls_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1511,12 +1469,6 @@ static void scls_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[7]; smc->hwdef = &sun4m_hwdefs[7];
} }
static const TypeInfo scls_type = {
.name = MACHINE_TYPE_NAME("SPARCClassic"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = scls_class_init,
};
static void sbook_class_init(ObjectClass *oc, void *data) static void sbook_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -1527,14 +1479,44 @@ static void sbook_class_init(ObjectClass *oc, void *data)
smc->hwdef = &sun4m_hwdefs[8]; smc->hwdef = &sun4m_hwdefs[8];
} }
static const TypeInfo sbook_type = { static const TypeInfo sun4m_machine_types[] = {
{
.name = MACHINE_TYPE_NAME("SS-5"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss5_class_init,
}, {
.name = MACHINE_TYPE_NAME("SS-10"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss10_class_init,
}, {
.name = MACHINE_TYPE_NAME("SS-600MP"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss600mp_class_init,
}, {
.name = MACHINE_TYPE_NAME("SS-20"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss20_class_init,
}, {
.name = MACHINE_TYPE_NAME("Voyager"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = voyager_class_init,
}, {
.name = MACHINE_TYPE_NAME("LX"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss_lx_class_init,
}, {
.name = MACHINE_TYPE_NAME("SS-4"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = ss4_class_init,
}, {
.name = MACHINE_TYPE_NAME("SPARCClassic"),
.parent = TYPE_SUN4M_MACHINE,
.class_init = scls_class_init,
}, {
.name = MACHINE_TYPE_NAME("SPARCbook"), .name = MACHINE_TYPE_NAME("SPARCbook"),
.parent = TYPE_SUN4M_MACHINE, .parent = TYPE_SUN4M_MACHINE,
.class_init = sbook_class_init, .class_init = sbook_class_init,
}; }, {
static const TypeInfo sun4m_machine_types[] = {
{
.name = TYPE_SUN4M_MACHINE, .name = TYPE_SUN4M_MACHINE,
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.class_size = sizeof(Sun4mMachineClass), .class_size = sizeof(Sun4mMachineClass),
@ -1551,16 +1533,6 @@ static void sun4m_register_types(void)
type_register_static(&afx_info); type_register_static(&afx_info);
type_register_static(&prom_info); type_register_static(&prom_info);
type_register_static(&ram_info); type_register_static(&ram_info);
type_register_static(&ss5_type);
type_register_static(&ss10_type);
type_register_static(&ss600mp_type);
type_register_static(&ss20_type);
type_register_static(&voyager_type);
type_register_static(&ss_lx_type);
type_register_static(&ss4_type);
type_register_static(&scls_type);
type_register_static(&sbook_type);
} }
type_init(sun4m_register_types) type_init(sun4m_register_types)