 12ec8bd51e
			
		
	
	
		12ec8bd51e
		
	
	
	
	
		
			
			The header file hw/arm/arm.h now includes only declarations relating to hw/arm/boot.c functionality. Rename it accordingly, and adjust its header comment. The bulk of this commit was created via perl -pi -e 's|hw/arm/arm.h|hw/arm/boot.h|' hw/arm/*.c include/hw/arm/*.h In a few cases we can just delete the #include: hw/arm/msf2-soc.c, include/hw/arm/aspeed_soc.h and include/hw/arm/bcm2836.h did not require it. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20190516163857.6430-4-peter.maydell@linaro.org
		
			
				
	
	
		
			55 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			1.4 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 code is licensed under the GNU GPLv2 and later.
 | |
|  */
 | |
| 
 | |
| #ifndef BCM2836_H
 | |
| #define BCM2836_H
 | |
| 
 | |
| #include "hw/arm/bcm2835_peripherals.h"
 | |
| #include "hw/intc/bcm2836_control.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 >*/
 | |
| 
 | |
|     char *cpu_type;
 | |
|     uint32_t enabled_cpus;
 | |
| 
 | |
|     ARMCPU cpus[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 */
 |