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

1. Removed #ifdef SNP_DEBUG and used debug lib to output information

Browse Source 
2. Rename PcdPlatformNoCsmSupport to PcdPlatformCsmSupport.
3  Removed #ifdef EFI_NO_CSM and used PcdPlatformCsmSupport.
4. Removed #ifdef ALIGNMENT from C Variable.c and added 2 files Variable/Pei/Ipf/VariableWorker.c and Variable/Pei/VariableWorker.c


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2487 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2007-03-20 02:44:09 +00:00
parent b06af5d71e
commit 3aaddf9276
13 changed files with 202 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
EdkModulePkg/EdkModulePkg.fpd
View File

@ -2075,14 +2075,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>
@ -8030,14 +8022,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>
@ -12587,14 +12571,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>
@ -16966,14 +16942,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>

13
EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
View File

@ -19,11 +19,6 @@ Abstract:
#include "PxeDhcp4.h" #include "PxeDhcp4.h"
#define DebugPrint(x)
//
// #define DebugPrint(x) Aprint x
//
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC STATIC
INTN INTN
offer_verify ( offer_verify (
@ -400,7 +395,7 @@ PxeDhcp4Init (
Private->offer_list = NULL; Private->offer_list = NULL;
Private->callback = NULL; Private->callback = NULL;
DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus)); DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));
return EfiStatus; return EfiStatus;
} }
@ -687,7 +682,7 @@ PxeDhcp4Select (
EfiStatus = add_opt (&request, srvid); EfiStatus = add_opt (&request, srvid);
if (EFI_ERROR (EfiStatus)) { if (EFI_ERROR (EfiStatus)) {
DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus)); DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));
Private->callback = NULL; Private->callback = NULL;
return EfiStatus; return EfiStatus;
} }
@ -702,7 +697,7 @@ PxeDhcp4Select (
EfiStatus = add_opt (&request, op); EfiStatus = add_opt (&request, op);
if (EFI_ERROR (EfiStatus)) { if (EFI_ERROR (EfiStatus)) {
DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus)); DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));
Private->callback = NULL; Private->callback = NULL;
return EfiStatus; return EfiStatus;
} }
@ -724,7 +719,7 @@ PxeDhcp4Select (
); );
if (EFI_ERROR (EfiStatus)) { if (EFI_ERROR (EfiStatus)) {
DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus)); DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));
Private->callback = NULL; Private->callback = NULL;
return EfiStatus; return EfiStatus;
} }

18
EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h
View File

@ -22,17 +22,8 @@ Revision history:
#include "IndustryStandard/pci22.h" #include "IndustryStandard/pci22.h"
#define SNP_DEBUG 0
#define FOUR_GIGABYTES (UINT64) 0x100000000ULL #define FOUR_GIGABYTES (UINT64) 0x100000000ULL
#if SNP_DEBUG
#undef D_NET
#define D_NET D_WARN
#define SNP_PRINT(DebugInfo) Print (DebugInfo)
#else
#define SNP_PRINT(DebugInfo)
#endif
#define SNP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('s', 'n', 'd', 's') #define SNP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('s', 'n', 'd', 's')
#define MAX_MAP_LENGTH 100 #define MAX_MAP_LENGTH 100
@ -455,13 +446,4 @@ VOID
#define SNP_MEM_PAGES(x) (((x) - 1) / 4096 + 1) #define SNP_MEM_PAGES(x) (((x) - 1) / 4096 + 1)
#if SNP_DEBUG
extern
VOID
snp_wait_for_key (
VOID
)
;
#endif
#endif /* _SNP_H */ #endif /* _SNP_H */

2
EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
View File

@ -482,7 +482,7 @@ Returns:
} }
if (Index >= MAX_MAP_LENGTH) { if (Index >= MAX_MAP_LENGTH) {
SNP_PRINT (L"SNP maplist is FULL\n"); DEBUG ((EFI_D_INFO, "SNP maplist is FULL\n"));
*DevAddrPtr = 0; *DevAddrPtr = 0;
return ; return ;
} }

74
EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
View File

@ -41,10 +41,8 @@ Returns:
--*/ --*/
{ {
#if SNP_DEBUG DEBUG ((EFI_D_ERROR, "\nissue_hwundi_command() - This should not be called!"));
Aprint ("\nissue_hwundi_command() - This should not be called!");
snp_wait_for_key ();
#endif
if (cdb == 0) { if (cdb == 0) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -147,19 +145,13 @@ SimpleNetworkDriverSupported (
); );
if (Status == EFI_ALREADY_STARTED) if (Status == EFI_ALREADY_STARTED)
{ {
#if SNP_DEBUG DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %x\n", Controller));
Aprint ("Support(): Already Started. on handle %x\n", Controller);
#endif
return EFI_ALREADY_STARTED; return EFI_ALREADY_STARTED;
} }
if (!EFI_ERROR (Status)) if (!EFI_ERROR (Status))
{ {
DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %x\n", Controller));
#if SNP_DEBUG
Aprint ("Support(): UNDI3.1 found on handle %x\n", Controller);
snp_wait_for_key ();
#endif
IsUndi31 = TRUE; IsUndi31 = TRUE;
} else { } else {
// //
@ -177,10 +169,7 @@ SimpleNetworkDriverSupported (
return Status; return Status;
} }
#if SNP_DEBUG DEBUG ((EFI_D_INFO, "Support(): UNDI3.0 found on handle %x\n", Controller));
Aprint ("Support(): UNDI3.0 found on handle %x\n", Controller);
snp_wait_for_key ();
#endif
} }
// //
// check the version, we don't want to connect to the undi16 // check the version, we don't want to connect to the undi16
@ -244,10 +233,7 @@ SimpleNetworkDriverSupported (
} }
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
#if SNP_DEBUG DEBUG ((EFI_D_INFO, "Support(): supported on %x\n", Controller));
Aprint ("Support(): supported on %x\n", Controller);
snp_wait_for_key ();
#endif
Done: Done:
if (IsUndi31) { if (IsUndi31) {
@ -374,10 +360,8 @@ Arguments:
// probably not a 3.1 UNDI // probably not a 3.1 UNDI
// //
UndiNew = TRUE; UndiNew = TRUE;
#if SNP_DEBUG DEBUG ((EFI_D_INFO, "Start(): UNDI3.1 found\n"));
Aprint ("Start(): UNDI3.1 found\n");
snp_wait_for_key ();
#endif
} else { } else {
UndiNew = FALSE; UndiNew = FALSE;
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
@ -399,10 +383,7 @@ Arguments:
return Status; return Status;
} }
#if SNP_DEBUG DEBUG ((EFI_D_INFO, "Start(): UNDI3.0 found\n"));
Aprint ("Start(): UNDI3.0 found\n");
snp_wait_for_key ();
#endif
} }
pxe = (PXE_UNDI *) (UINTN) (Nii->ID); pxe = (PXE_UNDI *) (UINTN) (Nii->ID);
@ -1210,11 +1191,9 @@ Returns:
gBS->FreePool (v); gBS->FreePool (v);
#if SNP_DEBUG
if (Status) { if (Status) {
Print (L"Unmap failed with status = %x\n", Status); DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));
} }
#endif
return Status; return Status;
} }
@ -1223,42 +1202,13 @@ Returns:
v->next = t->next; v->next = t->next;
Status = mPciIoFncs->Unmap (mPciIoFncs, t->unmap); Status = mPciIoFncs->Unmap (mPciIoFncs, t->unmap);
gBS->FreePool (t); gBS->FreePool (t);
#if SNP_DEBUG
if (Status) { if (Status) {
Print (L"Unmap failed with status = %x\n", Status); DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));
} }
#endif
return Status; return Status;
} }
} }
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
#if SNP_DEBUG
VOID
snp_wait_for_key (
VOID
)
/*++
Routine Description:
Wait for a key stroke, used for debugging purposes
Arguments:
none
Returns:
none
--*/
{
EFI_INPUT_KEY key;
Aprint ("\nPress any key to continue\n");
while (gST->ConIn->ReadKeyStroke (gST->ConIn, &key) == EFI_NOT_READY) {
;
}
}
#endif

44
EdkModulePkg/Universal/Variable/Pei/Ipf/VariableWorker.c Normal file
View File

@ -0,0 +1,44 @@
/*++
Copyright (c) 2007, Intel Corporation
All rights reserved. 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
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
VariableWorker.c
Abstract:
Framework PEIM to provide the Variable functionality
--*/
#include <Variable.h>
VARIABLE_HEADER *
GetVariableByIndex (
IN VARIABLE_INDEX_TABLE *IndexTable,
IN UINT32 Count
)
{
return (VARIABLE_HEADER *) (UINTN) ((((UINT32)IndexTable->Index[Count]) << 2) + ((UINT32)(UINTN)IndexTable->StartPtr & 0xFFFC0000) );
}
VOID
VariableIndexTableUpdate (
IN OUT VARIABLE_INDEX_TABLE *IndexTable,
IN VARIABLE_HEADER *Variable
)
{
IndexTable->Index[IndexTable->Length++] = (UINT16) (((UINT32)(UINTN) Variable) >> 2);
return;
}

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

@ -8,7 +8,6 @@ http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: Module Name:
Variable.c Variable.c
@ -277,13 +276,8 @@ Returns:
IndexTable = GET_GUID_HOB_DATA (GuidHob); IndexTable = GET_GUID_HOB_DATA (GuidHob);
for (Count = 0; Count < IndexTable->Length; Count++) for (Count = 0; Count < IndexTable->Length; Count++)
{ {
#if ALIGNMENT <= 1 MaxIndex = GetVariableByIndex (IndexTable, Count);
MaxIndex = (VARIABLE_HEADER *) (UINTN) (IndexTable->Index[Count] + ((UINTN) IndexTable->StartPtr & 0xFFFF0000));
#else
#if ALIGNMENT >= 4
MaxIndex = (VARIABLE_HEADER *) (UINTN) ((((UINT32)IndexTable->Index[Count]) << 2) + ((UINT32)(UINTN)IndexTable->StartPtr & 0xFFFC0000) );
#endif
#endif
if (CompareWithValidVariable (MaxIndex, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) { if (CompareWithValidVariable (MaxIndex, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {
PtrTrack->StartPtr = IndexTable->StartPtr; PtrTrack->StartPtr = IndexTable->StartPtr;
PtrTrack->EndPtr = IndexTable->EndPtr; PtrTrack->EndPtr = IndexTable->EndPtr;
@ -342,13 +336,7 @@ Returns:
// //
if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME) if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME)
{ {
#if ALIGNMENT <= 1 VariableIndexTableUpdate (IndexTable, Variable);
IndexTable->Index[IndexTable->Length++] = (UINT16) (UINTN) Variable;
#else
#if ALIGNMENT >= 4
IndexTable->Index[IndexTable->Length++] = (UINT16) (((UINT32)(UINTN) Variable) >> 2);
#endif
#endif
} }
if (CompareWithValidVariable (Variable, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) { if (CompareWithValidVariable (Variable, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {

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

@ -150,4 +150,16 @@ Returns:
--*/ --*/
; ;
VARIABLE_HEADER *
GetVariableByIndex (
IN VARIABLE_INDEX_TABLE *IndexTable,
IN UINT32 Count
);
VOID
VariableIndexTableUpdate (
IN OUT VARIABLE_INDEX_TABLE *IndexTable,
IN VARIABLE_HEADER *Variable
);
#endif // _PEI_VARIABLE_H #endif // _PEI_VARIABLE_H

4
EdkModulePkg/Universal/Variable/Pei/Variable.msa
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<MsaHeader> <MsaHeader>
<ModuleName>PeiVariable</ModuleName> <ModuleName>PeiVariable</ModuleName>
@ -42,6 +42,8 @@
<Filename>Variable.h</Filename> <Filename>Variable.h</Filename>
<Filename>Variable.c</Filename> <Filename>Variable.c</Filename>
<Filename>Variable.dxs</Filename> <Filename>Variable.dxs</Filename>
<Filename SupArchList="IA32 X64 EBC">VariableWorker.c</Filename>
<Filename SupArchList="IPF">Ipf/VariableWorker.c</Filename>
<Filename SupArchList="IA32">Ia32/VarMachine.h</Filename> <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>
<Filename SupArchList="EBC">Ebc/VarMachine.h</Filename> <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>
<Filename SupArchList="X64">x64/VarMachine.h</Filename> <Filename SupArchList="X64">x64/VarMachine.h</Filename>

44
EdkModulePkg/Universal/Variable/Pei/VariableWorker.c Normal file
View File

@ -0,0 +1,44 @@
/*++
Copyright (c) 2007, Intel Corporation
All rights reserved. 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
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
VariableWorker.c
Abstract:
Framework PEIM to provide the Variable functionality
--*/
#include <Variable.h>
VARIABLE_HEADER *
GetVariableByIndex (
IN VARIABLE_INDEX_TABLE *IndexTable,
IN UINT32 Count
)
{
return (VARIABLE_HEADER *) (UINTN) (IndexTable->Index[Count] + ((UINTN) IndexTable->StartPtr & 0xFFFF0000));
}
VOID
VariableIndexTableUpdate (
IN OUT VARIABLE_INDEX_TABLE *IndexTable,
IN VARIABLE_HEADER *Variable
)
{
IndexTable->Index[IndexTable->Length++] = (UINT16) (UINTN) Variable;
return;
}

8
EdkNt32Pkg/Nt32.fpd
View File

@ -3224,14 +3224,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>

8
EdkUnixPkg/Unix.fpd
View File

@ -3216,14 +3216,6 @@
<MaxDatumSize>4</MaxDatumSize> <MaxDatumSize>4</MaxDatumSize>
<Value>320</Value> <Value>320</Value>
</PcdData> </PcdData>
<PcdData ItemType="FEATURE_FLAG">
<C_Name>PcdNtEmulatorEnable</C_Name>
<Token>0x0001003e</Token>
<TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
<DatumType>BOOLEAN</DatumType>
<MaxDatumSize>1</MaxDatumSize>
<Value>FALSE</Value>
</PcdData>
</PcdBuildDefinition> </PcdBuildDefinition>
<ModuleSaBuildOptions> <ModuleSaBuildOptions>
<FvBinding>NULL</FvBinding> <FvBinding>NULL</FvBinding>