sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing braces around initializer.

Browse Source 
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Qian Ouyang <qian.ouyang@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13817 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lzeng14
2012-10-11 02:15:23 +00:00
parent a5953380b1
commit ce68d3bc68
24 changed files with 515 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OvmfPkg/AcpiTables/Facp.aslc
View File

@@ -1,7 +1,7 @@
/** @file
FACP Table
Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are
licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -15,15 +15,17 @@
#include "Platform.h"
EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
sizeof (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE),
EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,
0, // to make sum of entire table == 0
EFI_ACPI_OEM_ID, // OEMID is a 6 bytes long field
EFI_ACPI_OEM_TABLE_ID, // OEM table identification(8 bytes long)
EFI_ACPI_OEM_REVISION, // OEM revision number
EFI_ACPI_CREATOR_ID, // ASL compiler vendor ID
EFI_ACPI_CREATOR_REVISION, // ASL compiler revision number
{
EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
sizeof (EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE),
EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,
0, // to make sum of entire table == 0
{EFI_ACPI_OEM_ID}, // OEMID is a 6 bytes long field
EFI_ACPI_OEM_TABLE_ID, // OEM table identification(8 bytes long)
EFI_ACPI_OEM_REVISION, // OEM revision number
EFI_ACPI_CREATOR_ID, // ASL compiler vendor ID
EFI_ACPI_CREATOR_REVISION // ASL compiler revision number
},
0, // Physical addesss of FACS
0, // Physical address of DSDT
INT_MODEL, // System Interrupt Model

84
OvmfPkg/AcpiTables/Facs.aslc
View File

@@ -1,7 +1,7 @@
/** @file
FACS Table
Copyright (c) 2008 - 2009, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are
licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -25,46 +25,48 @@ EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE FACS = {
0x00,
0x00,
0x00,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE
{
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE
}
};

105
OvmfPkg/AcpiTables/Madt.aslc
View File

@@ -67,65 +67,82 @@ typedef struct {
// Multiple APIC Description Table
//
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
EFI_ACPI_1_0_APIC_SIGNATURE,
sizeof (EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE),
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,
0x00, // Checksum will be updated at runtime
EFI_ACPI_OEM_ID,
EFI_ACPI_OEM_TABLE_ID,
EFI_ACPI_OEM_REVISION,
EFI_ACPI_CREATOR_ID,
EFI_ACPI_CREATOR_REVISION,
{
{
EFI_ACPI_1_0_APIC_SIGNATURE,
sizeof (EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE),
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,
0x00, // Checksum will be updated at runtime
{EFI_ACPI_OEM_ID},
EFI_ACPI_OEM_TABLE_ID,
EFI_ACPI_OEM_REVISION,
EFI_ACPI_CREATOR_ID,
EFI_ACPI_CREATOR_REVISION
},
//
// MADT specific fields
//
EFI_ACPI_LOCAL_APIC_ADDRESS,
EFI_ACPI_1_0_MULTIPLE_APIC_FLAGS,
//
// MADT specific fields
//
EFI_ACPI_LOCAL_APIC_ADDRESS,
EFI_ACPI_1_0_MULTIPLE_APIC_FLAGS,
},
//
// Processor Local APIC Structure
//
EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC, // Type
sizeof (EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE), // Length
0x00, // Processor ID
0x00, // Local APIC ID
0x00000001, // Flags - Enabled by default
{
{
EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC, // Type
sizeof (EFI_ACPI_1_0_PROCESSOR_LOCAL_APIC_STRUCTURE), // Length
0x00, // Processor ID
0x00, // Local APIC ID
0x00000001 // Flags - Enabled by default
}
},
//
// Interrupt Source Override Structure
//
//
// IRQ0=>IRQ2 Interrupt Source Override Structure
//
EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE, // Type
sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length
0x00, // Bus - ISA
0x00, // Source - IRQ0
0x00000002, // Global System Interrupt - IRQ2
0x0000, // Flags - Conforms to specifications of the bus
{
{
//
// IRQ0=>IRQ2 Interrupt Source Override Structure
//
EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE, // Type
sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length
0x00, // Bus - ISA
0x00, // Source - IRQ0
0x00000002, // Global System Interrupt - IRQ2
0x0000 // Flags - Conforms to specifications of the bus
},
//
// ISO (SCI Active High) Interrupt Source Override Structure
//
EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE, // Type
sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length
0x00, // Bus - ISA
0x09, // Source - IRQ0
0x00000009, // Global System Interrupt - IRQ2
0x000D, // Flags - Level-tiggered, Active High
{
//
// ISO (SCI Active High) Interrupt Source Override Structure
//
EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE, // Type
sizeof (EFI_ACPI_1_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE),// Length
0x00, // Bus - ISA
0x09, // Source - IRQ0
0x00000009, // Global System Interrupt - IRQ2
0x000D // Flags - Level-tiggered, Active High
}
},
//
// IO APIC Structure
//
EFI_ACPI_1_0_IO_APIC, // Type
sizeof (EFI_ACPI_1_0_IO_APIC_STRUCTURE), // Length
0x02, // IO APIC ID
EFI_ACPI_RESERVED_BYTE, // Reserved
0xFEC00000, // IO APIC Address (physical)
0x00000000 // Global System Interrupt Base
{
{
EFI_ACPI_1_0_IO_APIC, // Type
sizeof (EFI_ACPI_1_0_IO_APIC_STRUCTURE), // Length
0x02, // IO APIC ID
EFI_ACPI_RESERVED_BYTE, // Reserved
0xFEC00000, // IO APIC Address (physical)
0x00000000 // Global System Interrupt Base
}
},
};

18
OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
View File

@@ -655,14 +655,17 @@ InitializeFvAndVariableStoreHeaders (
0,
// UINT8 Reserved[1];
0,
{0},
// UINT8 Revision;
EFI_FVH_REVISION,
// EFI_FV_BLOCK_MAP_ENTRY BlockMap[1];
{ 2, // UINT32 NumBlocks;
EMU_FVB_BLOCK_SIZE // UINT32 Length;
{
{
2, // UINT32 NumBlocks;
EMU_FVB_BLOCK_SIZE // UINT32 Length;
}
}
},
// EFI_FV_BLOCK_MAP_ENTRY EndBlockMap;
@@ -721,14 +724,17 @@ InitializeFvAndVariableStoreHeaders (
0,
// UINT8 Reserved[1];
0,
{0},
// UINT8 Revision;
EFI_FVH_REVISION,
// EFI_FV_BLOCK_MAP_ENTRY BlockMap[1];
{ 2, // UINT32 NumBlocks;
EMU_FVB_BLOCK_SIZE // UINT32 Length;
{
{
2, // UINT32 NumBlocks;
EMU_FVB_BLOCK_SIZE // UINT32 Length;
}
}
},
// EFI_FV_BLOCK_MAP_ENTRY EndBlockMap;