75a73a11d3
The 'cpu_type' has been moved from BCM283XState to BCM283XClass in commit210f47840d, but we forgot to remove the old variable. Do it now. Fixes:210f47840d("hw/arm/bcm2836: Hardcode correct CPU type") Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-id: 20200703200459.23294-1-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
58 lines
1.5 KiB
C
58 lines
1.5 KiB
C
/*
|
|
* Raspberry Pi emulation (c) 2012 Gregory Estrade
|
|
* Upstreaming code cleanup [including bcm2835_*] (c) 2013 Jan Petrous
|
|
*
|
|
* Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft
|
|
* Written by Andrew Baumann
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef BCM2836_H
|
|
#define BCM2836_H
|
|
|
|
#include "hw/arm/bcm2835_peripherals.h"
|
|
#include "hw/intc/bcm2836_control.h"
|
|
#include "target/arm/cpu.h"
|
|
|
|
#define TYPE_BCM283X "bcm283x"
|
|
#define BCM283X(obj) OBJECT_CHECK(BCM283XState, (obj), TYPE_BCM283X)
|
|
|
|
#define BCM283X_NCPUS 4
|
|
|
|
/* These type names are for specific SoCs; other than instantiating
|
|
* them, code using these devices should always handle them via the
|
|
* BCM283x base class, so they have no BCM2836(obj) etc macros.
|
|
*/
|
|
#define TYPE_BCM2836 "bcm2836"
|
|
#define TYPE_BCM2837 "bcm2837"
|
|
|
|
typedef struct BCM283XState {
|
|
/*< private >*/
|
|
DeviceState parent_obj;
|
|
/*< public >*/
|
|
|
|
uint32_t enabled_cpus;
|
|
|
|
struct {
|
|
ARMCPU core;
|
|
} cpu[BCM283X_NCPUS];
|
|
BCM2836ControlState control;
|
|
BCM2835PeripheralState peripherals;
|
|
} BCM283XState;
|
|
|
|
typedef struct BCM283XInfo BCM283XInfo;
|
|
|
|
typedef struct BCM283XClass {
|
|
DeviceClass parent_class;
|
|
const BCM283XInfo *info;
|
|
} BCM283XClass;
|
|
|
|
#define BCM283X_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X)
|
|
#define BCM283X_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X)
|
|
|
|
#endif /* BCM2836_H */
|