tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Perfected MSA files. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2552 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2007-04-10 05:09:57 +00:00
parent 26aa0c2ff5
commit 9c198b4066
8 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
View File

@ -64,6 +64,9 @@
</Protocols> </Protocols>
<Guids> <Guids>
<GuidCNames Usage="ALWAYS_CONSUMED"> <GuidCNames Usage="ALWAYS_CONSUMED">
<GuidCName>gEfiCapsuleGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiCapsuleVendorGuid</GuidCName> <GuidCName>gEfiCapsuleVendorGuid</GuidCName>
</GuidCNames> </GuidCNames>
</Guids> </Guids>

8
EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
View File

@ -21,9 +21,7 @@ Abstract:
#include "CapsuleService.h" #include "CapsuleService.h"
extern EFI_GUID gEfiCapsuleGuid;
STATIC EFI_GUID mEfiCapsuleHeaderGuid = EFI_CAPSULE_GUID;
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -78,7 +76,7 @@ Returns:
if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) { if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) { if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) { if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -206,7 +204,7 @@ Returns:
if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) { if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) { if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) { if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }

42
EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
View File

@ -61,6 +61,15 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/> <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies> </PackageDependencies>
<Protocols> <Protocols>
<Protocol Usage="BY_START">
<ProtocolCName>gEfiConsoleInDeviceGuid</ProtocolCName>
</Protocol>
<Protocol Usage="BY_START">
<ProtocolCName>gEfiConsoleOutDeviceGuid</ProtocolCName>
</Protocol>
<Protocol Usage="BY_START">
<ProtocolCName>gEfiStandardErrorDeviceGuid</ProtocolCName>
</Protocol>
<Protocol Usage="TO_START"> <Protocol Usage="TO_START">
<ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName> <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
@ -70,46 +79,43 @@
<Protocol Usage="TO_START"> <Protocol Usage="TO_START">
<ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName> <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="TO_START">
<ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>
</Protocol>
</Protocols> </Protocols>
<Variables> <Variables>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName> <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
<GuidC_Name>gConInDevGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName> <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName>
<GuidC_Name>gConInGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ConIn" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName> <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
<GuidC_Name>gConOutDevGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName> <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>
<GuidC_Name>gConOutGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ConOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName> <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
<GuidC_Name>gErrOutDevGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
<Variable Usage="SOMETIMES_CONSUMED"> <Variable Usage="SOMETIMES_CONSUMED">
<VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName> <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>
<GuidC_Name>gErrOutGuid</GuidC_Name> <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
<HelpText>L"ErrOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
</Variable> </Variable>
</Variables> </Variables>
<Guids> <Guids>
<GuidCNames Usage="SOMETIMES_PRODUCED">
<GuidCName>gEfiConsoleInDeviceGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_PRODUCED">
<GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_PRODUCED">
<GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED"> <GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiGlobalVariableGuid</GuidCName> <GuidCName>gEfiGlobalVariableGuid</GuidCName>
</GuidCNames> </GuidCNames>

4
EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
View File

@ -58,10 +58,10 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/> <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies> </PackageDependencies>
<Protocols> <Protocols>
<Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64"> <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">
<ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName> <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64"> <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">
<ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName> <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
</Protocols> </Protocols>

6
EdkModulePkg/Universal/Variable/Pei/Variable.c
View File

@ -34,7 +34,7 @@ static EFI_PEI_PPI_DESCRIPTOR mPpiListVariable = {
&mVariablePpi &mVariablePpi
}; };
EFI_GUID gEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID; EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -265,9 +265,9 @@ Returns:
// //
MaxIndex = 0; MaxIndex = 0;
GuidHob = GetFirstGuidHob (&gEfiVariableIndexTableGuid); GuidHob = GetFirstGuidHob (&mEfiVariableIndexTableGuid);
if (GuidHob == NULL) { if (GuidHob == NULL) {
IndexTable = BuildGuidHob (&gEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE)); IndexTable = BuildGuidHob (&mEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));
IndexTable->Length = 0; IndexTable->Length = 0;
IndexTable->StartPtr = NULL; IndexTable->StartPtr = NULL;
IndexTable->EndPtr = NULL; IndexTable->EndPtr = NULL;

1
EdkModulePkg/Universal/Variable/Pei/Variable.h
View File

@ -61,7 +61,6 @@ typedef struct {
UINT16 Index[VARIABLE_INDEX_TABLE_VOLUME]; UINT16 Index[VARIABLE_INDEX_TABLE_VOLUME];
} VARIABLE_INDEX_TABLE; } VARIABLE_INDEX_TABLE;
extern EFI_GUID gEfiVariableIndexTableGuid;
// //
// Functions // Functions

8
EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
View File

@ -69,16 +69,16 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/> <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies> </PackageDependencies>
<Protocols> <Protocols>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_PRODUCED">
<ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName> <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_PRODUCED">
<ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName> <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
</Protocols> </Protocols>

4
EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
View File

@ -72,10 +72,10 @@
<Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/> <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
</PackageDependencies> </PackageDependencies>
<Protocols> <Protocols>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="SOMETIMES_CONSUMED">
<ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName> <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
</Protocol> </Protocol>
<Protocol Usage="ALWAYS_CONSUMED"> <Protocol Usage="ALWAYS_CONSUMED">