motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

allwinner-h3: Rename memmap enum constants

Browse source 
Some of the enum constant names conflict with the QOM type check
macros (AW_H3_CCU, AW_H3_SYSCTRL).  This needs to be addressed to
allow us to transform the QOM type check macros into functions
generated by OBJECT_DECLARE_TYPE().

Rename all the constants to AW_H3_DEV_*, to avoid conflicts.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-6-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-08-25 15:20:01 -04:00
parent c7bf34922d
commit 4af44e1eca
3 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

62
include/hw/arm/allwinner-h3.h
View file

@ -61,37 +61,37 @@
* @see AwH3State
*/
enum {
AW_H3_SRAM_A1,
AW_H3_SRAM_A2,
AW_H3_SRAM_C,
AW_H3_SYSCTRL,
AW_H3_MMC0,
AW_H3_SID,
AW_H3_EHCI0,
AW_H3_OHCI0,
AW_H3_EHCI1,
AW_H3_OHCI1,
AW_H3_EHCI2,
AW_H3_OHCI2,
AW_H3_EHCI3,
AW_H3_OHCI3,
AW_H3_CCU,
AW_H3_PIT,
AW_H3_UART0,
AW_H3_UART1,
AW_H3_UART2,
AW_H3_UART3,
AW_H3_EMAC,
AW_H3_DRAMCOM,
AW_H3_DRAMCTL,
AW_H3_DRAMPHY,
AW_H3_GIC_DIST,
AW_H3_GIC_CPU,
AW_H3_GIC_HYP,
AW_H3_GIC_VCPU,
AW_H3_RTC,
AW_H3_CPUCFG,
AW_H3_SDRAM
AW_H3_DEV_SRAM_A1,
AW_H3_DEV_SRAM_A2,
AW_H3_DEV_SRAM_C,
AW_H3_DEV_SYSCTRL,
AW_H3_DEV_MMC0,
AW_H3_DEV_SID,
AW_H3_DEV_EHCI0,
AW_H3_DEV_OHCI0,
AW_H3_DEV_EHCI1,
AW_H3_DEV_OHCI1,
AW_H3_DEV_EHCI2,
AW_H3_DEV_OHCI2,
AW_H3_DEV_EHCI3,
AW_H3_DEV_OHCI3,
AW_H3_DEV_CCU,
AW_H3_DEV_PIT,
AW_H3_DEV_UART0,
AW_H3_DEV_UART1,
AW_H3_DEV_UART2,
AW_H3_DEV_UART3,
AW_H3_DEV_EMAC,
AW_H3_DEV_DRAMCOM,
AW_H3_DEV_DRAMCTL,
AW_H3_DEV_DRAMPHY,
AW_H3_DEV_GIC_DIST,
AW_H3_DEV_GIC_CPU,
AW_H3_DEV_GIC_HYP,
AW_H3_DEV_GIC_VCPU,
AW_H3_DEV_RTC,
AW_H3_DEV_CPUCFG,
AW_H3_DEV_SDRAM
};
/** Total number of CPU cores in the H3 SoC */