EDK II

Revision: 9889
          http://edk2.svn.sourceforge.net/edk2/?rev=9889&view=rev
Author:   andrewfish
Date:     2010-01-31 01:52:29 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Added new file.

Added Paths:
-----------
    trunk/edk2/BeagleBoardPkg/Sec/LzmaDecompress.h

Added: trunk/edk2/BeagleBoardPkg/Sec/LzmaDecompress.h
===================================================================
--- trunk/edk2/BeagleBoardPkg/Sec/LzmaDecompress.h	                        (rev 0)
+++ trunk/edk2/BeagleBoardPkg/Sec/LzmaDecompress.h	2010-01-31 01:52:29 UTC (rev 9889)
@@ -0,0 +1,103 @@
+/** @file
+  LZMA Decompress Library header file
+
+  Copyright (c) 2006 - 2010, Intel Corporation<BR>
+  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.
+
+**/
+
+#ifndef __LZMA_DECOMPRESS_H___
+#define __LZMA_DECOMPRESS_H___
+
+/**
+  Examines a GUIDed section and returns the size of the decoded buffer and the
+  size of an scratch buffer required to actually decode the data in a GUIDed section.
+
+  Examines a GUIDed section specified by InputSection.  
+  If GUID for InputSection does not match the GUID that this handler supports,
+  then RETURN_UNSUPPORTED is returned.  
+  If the required information can not be retrieved from InputSection,
+  then RETURN_INVALID_PARAMETER is returned.
+  If the GUID of InputSection does match the GUID that this handler supports,
+  then the size required to hold the decoded buffer is returned in OututBufferSize,
+  the size of an optional scratch buffer is returned in ScratchSize, and the Attributes field
+  from EFI_GUID_DEFINED_SECTION header of InputSection is returned in SectionAttribute.
+  
+  If InputSection is NULL, then ASSERT().
+  If OutputBufferSize is NULL, then ASSERT().
+  If ScratchBufferSize is NULL, then ASSERT().
+  If SectionAttribute is NULL, then ASSERT().
+
+
+  @param[in]  InputSection       A pointer to a GUIDed section of an FFS formatted file.
+  @param[out] OutputBufferSize   A pointer to the size, in bytes, of an output buffer required
+                                 if the buffer specified by InputSection were decoded.
+  @param[out] ScratchBufferSize  A pointer to the size, in bytes, required as scratch space
+                                 if the buffer specified by InputSection were decoded.
+  @param[out] SectionAttribute   A pointer to the attributes of the GUIDed section. See the Attributes
+                                 field of EFI_GUID_DEFINED_SECTION in the PI Specification.
+
+  @retval  RETURN_SUCCESS            The information about InputSection was returned.
+  @retval  RETURN_UNSUPPORTED        The section specified by InputSection does not match the GUID this handler supports.
+  @retval  RETURN_INVALID_PARAMETER  The information can not be retrieved from the section specified by InputSection.
+
+**/
+RETURN_STATUS
+EFIAPI
+LzmaGuidedSectionGetInfo (
+  IN  CONST VOID  *InputSection,
+  OUT UINT32      *OutputBufferSize,
+  OUT UINT32      *ScratchBufferSize,
+  OUT UINT16      *SectionAttribute
+  );
+
+/**
+  Decompress a LZAM compressed GUIDed section into a caller allocated output buffer.
+  
+  Decodes the GUIDed section specified by InputSection.  
+  If GUID for InputSection does not match the GUID that this handler supports, then RETURN_UNSUPPORTED is returned.  
+  If the data in InputSection can not be decoded, then RETURN_INVALID_PARAMETER is returned.
+  If the GUID of InputSection does match the GUID that this handler supports, then InputSection
+  is decoded into the buffer specified by OutputBuffer and the authentication status of this
+  decode operation is returned in AuthenticationStatus.  If the decoded buffer is identical to the
+  data in InputSection, then OutputBuffer is set to point at the data in InputSection.  Otherwise,
+  the decoded data will be placed in caller allocated buffer specified by OutputBuffer.
+  
+  If InputSection is NULL, then ASSERT().
+  If OutputBuffer is NULL, then ASSERT().
+  If ScratchBuffer is NULL and this decode operation requires a scratch buffer, then ASSERT().
+  If AuthenticationStatus is NULL, then ASSERT().
+
+
+  @param[in]  InputSection  A pointer to a GUIDed section of an FFS formatted file.
+  @param[out] OutputBuffer  A pointer to a buffer that contains the result of a decode operation. 
+  @param[out] ScratchBuffer A caller allocated buffer that may be required by this function
+                            as a scratch buffer to perform the decode operation. 
+  @param[out] AuthenticationStatus 
+                            A pointer to the authentication status of the decoded output buffer.
+                            See the definition of authentication status in the EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI
+                            section of the PI Specification. EFI_AUTH_STATUS_PLATFORM_OVERRIDE must
+                            never be set by this handler.
+
+  @retval  RETURN_SUCCESS            The buffer specified by InputSection was decoded.
+  @retval  RETURN_UNSUPPORTED        The section specified by InputSection does not match the GUID this handler supports.
+  @retval  RETURN_INVALID_PARAMETER  The section specified by InputSection can not be decoded.
+
+**/
+RETURN_STATUS
+EFIAPI
+LzmaGuidedSectionExtraction (
+  IN CONST  VOID    *InputSection,
+  OUT       VOID    **OutputBuffer,
+  OUT       VOID    *ScratchBuffer,        OPTIONAL
+  OUT       UINT32  *AuthenticationStatus
+  );
+  
+#endif // __LZMADECOMPRESS_H__
+


Property changes on: trunk/edk2/BeagleBoardPkg/Sec/LzmaDecompress.h
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9888
          http://edk2.svn.sourceforge.net/edk2/?rev=9888&view=rev
Author:   andrewfish
Date:     2010-01-31 01:46:17 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Update mailing list to SourceForge.

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/Ebl/Main.c

Modified: trunk/edk2/EmbeddedPkg/Ebl/Main.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Main.c	2010-01-31 01:39:20 UTC (rev 9887)
+++ trunk/edk2/EmbeddedPkg/Ebl/Main.c	2010-01-31 01:46:17 UTC (rev 9888)
@@ -451,7 +451,7 @@
   EblSetTextColor (0);
   AsciiPrint (") prototype. Built at %a on %a\n",__TIME__, __DATE__);
   AsciiPrint ("THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN 'AS IS' BASIS,\nWITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\n");
-  AsciiPrint ("Please send feedback to dev@...");
+  AsciiPrint ("Please send feedback to edk2-devel@...");
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9887
          http://edk2.svn.sourceforge.net/edk2/?rev=9887&view=rev
Author:   andrewfish
Date:     2010-01-31 01:39:20 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Updated to support passing PE/COFF and LZMA decompress up via HOBS. Currently turned off.

Modified Paths:
--------------
    trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc
    trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.fdf
    trunk/edk2/BeagleBoardPkg/Sec/Sec.c
    trunk/edk2/BeagleBoardPkg/Sec/Sec.inf
    trunk/edk2/BeagleBoardPkg/build.sh
    trunk/edk2/EmbeddedPkg/Include/Guid/ExtractSection.h
    trunk/edk2/EmbeddedPkg/Include/Library/PrePiLib.h
    trunk/edk2/EmbeddedPkg/Include/Protocol/PeCoffLoader.h
    trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoff.c
    trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
    trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.c
    trunk/edk2/EmbeddedPkg/Library/PrePiLib/Hob.c

Removed Paths:
-------------
    trunk/edk2/EmbeddedPkg/Include/Protocol/ExtractSection.h

Modified: trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc
===================================================================
--- trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-31 01:39:20 UTC (rev 9887)
@@ -57,7 +57,6 @@
   
   
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
   
   #
   # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window 
@@ -120,6 +119,7 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
   LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
 
 [LibraryClasses.common.PEI_CORE]
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -133,6 +133,8 @@
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+#  PeCoffLib|EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
@@ -154,6 +156,8 @@
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+#  PeCoffLib|EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
 
 
 [LibraryClasses.ARM]
@@ -293,9 +297,7 @@
   gBeagleBoardTokenSpaceGuid.PcdBeagleConsoleUart|3
   
   # Timers
-#  gBeagleBoardTokenSpaceGuid.PcdBeagleArchTimer|OMAP3530_GPTIMER3
   gBeagleBoardTokenSpaceGuid.PcdBeagleArchTimer|3
-#  gBeagleBoardTokenSpaceGuid.PcdBeagleFreeTimer|OMAP3530_GPTIMER4
   gBeagleBoardTokenSpaceGuid.PcdBeagleFreeTimer|4
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000
   gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds|77
@@ -326,6 +328,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
       NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+#      NULL|EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.inf    
   }
 
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf

Modified: trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.fdf
===================================================================
--- trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.fdf	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.fdf	2010-01-31 01:39:20 UTC (rev 9887)
@@ -156,9 +156,9 @@
 
   #NOTE: Open source EHCI stack doesn't work on Beagleboard.
   #NOTE: UsbBus and UsbMassStorage don't work using iPhond SDK tool chain.
-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+  #INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+  #INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  #INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
   #
   # UEFI application (Shell Embedded Boot Loader) 

Modified: trunk/edk2/BeagleBoardPkg/Sec/Sec.c
===================================================================
--- trunk/edk2/BeagleBoardPkg/Sec/Sec.c	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/BeagleBoardPkg/Sec/Sec.c	2010-01-31 01:39:20 UTC (rev 9887)
@@ -24,9 +24,11 @@
 #include <Library/PeCoffGetEntryPointLib.h>
 
 #include <Ppi/GuidedSectionExtraction.h>
-
+#include <Guid/LzmaDecompress.h>
 #include <Omap3530/Omap3530.h>
 
+#include "LzmaDecompress.h"
+
 VOID
 EFIAPI 
 _ModuleEntryPoint(
@@ -260,6 +262,16 @@
   ExtractGuidedSectionLibConstructor();
   LzmaDecompressLibConstructor();
 
+  // Build HOBs to pass up our version of stuff the DXE Core needs to save space
+#if 0
+  BuildPeCoffLoaderHob ();
+  BuildExtractSectionHob (
+    &gLzmaCustomDecompressGuid,
+    LzmaGuidedSectionGetInfo,
+    LzmaGuidedSectionExtraction
+    );
+#endif
+
   DecompressFirstFv ();
 
   // Load the DXE Core and transfer control to it

Modified: trunk/edk2/BeagleBoardPkg/Sec/Sec.inf
===================================================================
--- trunk/edk2/BeagleBoardPkg/Sec/Sec.inf	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/BeagleBoardPkg/Sec/Sec.inf	2010-01-31 01:39:20 UTC (rev 9887)
@@ -37,6 +37,7 @@
   EmbeddedPkg/EmbeddedPkg.dec
   ArmPkg/ArmPkg.dec
   Omap35xxPkg/Omap35xxPkg.dec
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [LibraryClasses]
   BaseLib

Modified: trunk/edk2/BeagleBoardPkg/build.sh
===================================================================
--- trunk/edk2/BeagleBoardPkg/build.sh	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/BeagleBoardPkg/build.sh	2010-01-31 01:39:20 UTC (rev 9887)
@@ -99,7 +99,7 @@
 # Build the edk2 BeagleBoard code
 #
 if [[ $TARGET == RELEASE ]]; then
-  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b -D DEBUG_TARGET=RELEASE $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET -D DEBUG_TARGET=RELEASE $2 $3 $4 $5 $6 $7 $8
 else
   build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET $1 $2 $3 $4 $5 $6 $7 $8
 fi

Modified: trunk/edk2/EmbeddedPkg/Include/Guid/ExtractSection.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Include/Guid/ExtractSection.h	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Include/Guid/ExtractSection.h	2010-01-31 01:39:20 UTC (rev 9887)
@@ -22,11 +22,14 @@
 // The GUID for this protocol mathes the Decompression scheme being used
 // So for example LZMA would be gLzmaCustomDecompressGuid
 //
-
 typedef struct {
-  EFI_HOB_GUID_TYPE                         Hob;                             
   EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER   SectionGetInfo;
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction;
+} EXTRACT_SECTION_DATA;
+
+typedef struct {
+  EFI_HOB_GUID_TYPE     Hob;     
+  EXTRACT_SECTION_DATA  Data;
 } EXTRACT_SECTION_HOB;
 
 #endif

Modified: trunk/edk2/EmbeddedPkg/Include/Library/PrePiLib.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Include/Library/PrePiLib.h	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Include/Library/PrePiLib.h	2010-01-31 01:39:20 UTC (rev 9887)
@@ -678,6 +678,7 @@
 VOID
 EFIAPI
 BuildPeCoffLoaderHob (
+  VOID
   );
 
 

Deleted: trunk/edk2/EmbeddedPkg/Include/Protocol/ExtractSection.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Include/Protocol/ExtractSection.h	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Include/Protocol/ExtractSection.h	2010-01-31 01:39:20 UTC (rev 9887)
@@ -1,33 +0,0 @@
-/** @file
-
-  Copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
-
-  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.
-
-**/
-
-#ifndef __EXTRACT_SECTION_PROTOCOL_H__
-#define __EXTRACT_SECTION_PROTOCOL_H__
-
-
-//
-// The GUID for this protocol mathes the Decompression scheme being used
-// So for example LZMA would be gLzmaCustomDecompressGuid
-//
-
-typedef struct {
-  EFI_HOB_GUID_TYPE                         Hob;
-  EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER   SectionGetInfo;
-  EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction;
-} PROTOCOL_HOB;
-
-
-#endif
-
-

Modified: trunk/edk2/EmbeddedPkg/Include/Protocol/PeCoffLoader.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Include/Protocol/PeCoffLoader.h	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Include/Protocol/PeCoffLoader.h	2010-01-31 01:39:20 UTC (rev 9887)
@@ -15,6 +15,9 @@
 #ifndef __PE_COFF_LOADER_H__
 #define __PE_COFF_LOADER_H__
 
+// Needed for PE_COFF_LOADER_IMAGE_CONTEXT
+#include <Library/PeCoffLib.h>
+
 // B323179B-97FB-477E-B0FE-D88591FA11AB
 #define PE_COFF_LOADER_PROTOCOL_GUID \
   { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }

Modified: trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoff.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoff.c	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoff.c	2010-01-31 01:39:20 UTC (rev 9887)
@@ -21,6 +21,9 @@
 #include <Protocol/PeCoffLoader.h>
 
 
+PE_COFF_LOADER_PROTOCOL  *gPeCoffLoader = NULL;
+
+
 /**
   Retrieves information about a PE/COFF image.
 
@@ -167,11 +170,11 @@
   OUT    VOID    *Buffer
   )
 {
-  return gPeCoffLoader->RelocateImageForRuntime (
-                          *FileHandle,
+  return gPeCoffLoader->ReadFromMemory (
+                          FileHandle,
                           FileOffset,
-                          *ReadSize,
-                          *Buffer
+                          ReadSize,
+                          Buffer
                           );
                           
 }
@@ -214,7 +217,7 @@
                           ImageBase,
                           VirtImageBase,
                           ImageSize,
-                          *RelocationData
+                          RelocationData
                           );
 }
 
@@ -244,27 +247,42 @@
   return gPeCoffLoader->UnloadImage (ImageContext);
 }
 
+typedef struct {
+  EFI_HOB_GUID_TYPE             Hob;
+  VOID                          *Interface;
+} PROTOCOL_HOB;
 
 
 /**
-  Register LzmaDecompress and LzmaDecompressGetInfo handlers with LzmaCustomerDecompressGuid.
+  The constructor function caches the pointer of DXE Services Table.
 
-  @retval  RETURN_SUCCESS            Register successfully.
-  @retval  RETURN_OUT_OF_RESOURCES   No enough memory to store this handler.
+  The constructor function caches the pointer of DXE Services Table.
+  It will ASSERT() if that operation fails.
+  It will ASSERT() if the pointer of DXE Services Table is NULL.
+  It will always return EFI_SUCCESS.
+
+  @param  ImageHandle   The firmware allocated handle for the EFI image.
+  @param  SystemTable   A pointer to the EFI System Table.
+
+  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.
+
 **/
 EFI_STATUS
 EFIAPI
 DxeHobPeCoffLibConstructor (
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
   PROTOCOL_HOB   *Hob;
-  
+
   Hob = GetFirstGuidHob (&gPeCoffLoaderProtocolGuid);
   if (Hob == NULL) {
     return EFI_NOT_FOUND;
   }
   
   gPeCoffLoader = Hob->Interface;
+  return EFI_SUCCESS;
 }
 
 

Modified: trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf	2010-01-31 01:39:20 UTC (rev 9887)
@@ -16,7 +16,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = BasePeCoffLib
+  BASE_NAME                      = DxeHobPeCoffLib
   FILE_GUID                      = 671C6FD7-99FB-4EE3-B640-4B1D463BC3B5
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -34,7 +34,11 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
 
 [LibraryClasses]
   DebugLib
+  HobLib
 
+[Protocols]
+  gPeCoffLoaderProtocolGuid

Modified: trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.c	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/LzmaHobCustomDecompressLib.c	2010-01-31 01:39:20 UTC (rev 9887)
@@ -44,7 +44,7 @@
 
   return ExtractGuidedSectionRegisterHandlers (
           &gLzmaCustomDecompressGuid,
-          Hob->SectionGetInfo,
-          Hob->SectionExtraction
+          Hob->Data.SectionGetInfo,
+          Hob->Data.SectionExtraction
           );      
 }

Modified: trunk/edk2/EmbeddedPkg/Library/PrePiLib/Hob.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/PrePiLib/Hob.c	2010-01-31 01:36:43 UTC (rev 9886)
+++ trunk/edk2/EmbeddedPkg/Library/PrePiLib/Hob.c	2010-01-31 01:39:20 UTC (rev 9887)
@@ -818,11 +818,11 @@
   IN  EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction
   )
 {
-  EXTRACT_SECTION_HOB  Hob;
+  EXTRACT_SECTION_DATA Data;
   
-  Hob.SectionGetInfo    = SectionGetInfo;
-  Hob.SectionExtraction = SectionExtraction;
-  BuildGuidDataHob (Guid, &Hob, sizeof (EXTRACT_SECTION_HOB));
+  Data.SectionGetInfo    = SectionGetInfo;
+  Data.SectionExtraction = SectionExtraction;
+  BuildGuidDataHob (Guid, &Data, sizeof (Data));
 }
 
 PE_COFF_LOADER_PROTOCOL gPeCoffProtocol = {
@@ -834,22 +834,18 @@
   PeCoffLoaderUnloadImage
 };
 
-typedef struct {
-  EFI_HOB_GUID_TYPE             Hob;
-  VOID                          *Interface;
-} PROTOCOL_HOB;
 
 
-
 VOID
 EFIAPI
 BuildPeCoffLoaderHob (
+  VOID
   )
 {
-  PROTOCOL_HOB  Hob;      
+  VOID  *Ptr;      
   
-  Hob.Interface = &gPeCoffProtocol;
-  BuildGuidDataHob (&gPeCoffLoaderProtocolGuid, &Hob, sizeof (PROTOCOL_HOB));  
+  Ptr = &gPeCoffProtocol;
+  BuildGuidDataHob (&gPeCoffLoaderProtocolGuid, &Ptr, sizeof (VOID *));  
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9886
          http://edk2.svn.sourceforge.net/edk2/?rev=9886&view=rev
Author:   andrewfish
Date:     2010-01-31 01:36:43 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Rmove info files

Removed Paths:
-------------
    trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/._LzmaHobCustomDecompressLib.c
    trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/._LzmaHobCustomDecompressLib.inf

Deleted: trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/._LzmaHobCustomDecompressLib.c
===================================================================
(Binary files differ)

Deleted: trunk/edk2/EmbeddedPkg/Library/LzmaHobCustomDecompressLib/._LzmaHobCustomDecompressLib.inf
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9885
          http://edk2.svn.sourceforge.net/edk2/?rev=9885&view=rev
Author:   andrewfish
Date:     2010-01-31 01:35:22 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Remove info files

Removed Paths:
-------------
    trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/._DxeHobPeCoff.c
    trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/._DxeHobPeCoffLib.inf

Deleted: trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/._DxeHobPeCoff.c
===================================================================
(Binary files differ)

Deleted: trunk/edk2/EmbeddedPkg/Library/DxeHobPeCoffLib/._DxeHobPeCoffLib.inf
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9884
          http://edk2.svn.sourceforge.net/edk2/?rev=9884&view=rev
Author:   andrewfish
Date:     2010-01-30 21:32:51 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove obsolete comment and drive --thumb from here.

Modified Paths:
--------------
    trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc

Modified: trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc
===================================================================
--- trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-30 21:31:33 UTC (rev 9883)
+++ trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-30 21:32:51 UTC (rev 9884)
@@ -157,10 +157,6 @@
 
 
 [LibraryClasses.ARM]
-  #
-  # Note: This NULL library feature is not yet in the edk2/BaseTools, but it is checked in to 
-  # the BaseTools project. So you need to build with the BaseTools project util this feature gets synced.
-  #
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
 
@@ -170,7 +166,7 @@
   XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv6
   XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 
 
-  RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 
+  RVCT:*_*_ARM_ARCHCC_FLAGS == --cpu Cortex-A8 --thumb
   RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG 
 
 ################################################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9883
          http://edk2.svn.sourceforge.net/edk2/?rev=9883&view=rev
Author:   andrewfish
Date:     2010-01-30 21:31:33 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Default to Cortex ARM CPU type to match UEFI specification. Drive thumb from ARCHCC flags.

Modified Paths:
--------------
    trunk/edk2/BaseTools/Conf/tools_def.template

Modified: trunk/edk2/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/edk2/BaseTools/Conf/tools_def.template	2010-01-30 20:57:49 UTC (rev 9882)
+++ trunk/edk2/BaseTools/Conf/tools_def.template	2010-01-30 21:31:33 UTC (rev 9883)
@@ -124,8 +124,8 @@
 DEFINE ICC_WIN_ASLDLINK_FLAGS  = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE /NODEFAULTLIB:libmmt /NODEFAULTLIB:libirc
 
 DEFINE IPHONE_TOOLS            = /Developer/Platforms/iPhoneOS.platform/Developer
-DEFINE RVCT31_TOOLS_PATH       = c:/Program Files/ARM/RVCT/Programs/3.1/761/win_32-pentium
-DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/761/win_32-pentium
+DEFINE RVCT31_TOOLS_PATH       = c:/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
+DEFINE RVCT31CYGWIN_TOOLS_PATH = /cygdrive/c/Program Files/ARM/RVCT/Programs/3.1/569/win_32-pentium
 
 # Update to the location of the gcc executables
 DEFINE ARMGCC_BIN              = /
@@ -2291,8 +2291,8 @@
 #
 # Use default values, or override in DSC file
 #
-*_RVCT31_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
-*_RVCT31_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
+*_RVCT31_ARM_ARCHCC_FLAGS    = --cpu Cortex-A8 --thumb
+*_RVCT31_ARM_ARCHASM_FLAGS   = --cpu Cortex-A8
 *_RVCT31_ARM_ARCHDLINK_FLAGS = 
 *_RVCT31_ARM_PLATFORM_FLAGS  =
 
@@ -2305,8 +2305,8 @@
 *_RVCT31_ARM_VFRPP_FLAGS     = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 *_RVCT31_ARM_MAKE_PATH       = nmake
 *_RVCT31_ARM_SLINK_FLAGS     = --partial -o
-  DEBUG_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace --thumb --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
-RELEASE_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace --thumb -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
+  DEBUG_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
+RELEASE_RVCT31_ARM_CC_FLAGS  = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90    -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167
 
 ##################
 # ARM definitions
@@ -2341,8 +2341,8 @@
 #
 # Use default values, or override in DSC file
 #
-*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS    = --thumb --cpu ARM1176JZF-S
-*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS   = --cpu ARM1176JZF-S
+*_RVCT31CYGWIN_ARM_ARCHCC_FLAGS    = --cpu Cortex-A8 --thumb
+*_RVCT31CYGWIN_ARM_ARCHASM_FLAGS   = --cpu Cortex-A8 
 *_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS = 
 *_RVCT31CYGWIN_ARM_PLATFORM_FLAGS  =
 
@@ -2354,8 +2354,8 @@
 *_RVCT31CYGWIN_ARM_VFRPP_FLAGS     = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E  -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h`
 *_RVCT31CYGWIN_ARM_MAKE_PATH       = make
 *_RVCT31CYGWIN_ARM_SLINK_FLAGS     = "$(SLINKPATH_FLAG)" --partial -o
-  DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --thumb --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
-RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --thumb --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
+  DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
+RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c    -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167
 
 ##################
 # ARM definitions


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9882
          http://edk2.svn.sourceforge.net/edk2/?rev=9882&view=rev
Author:   andrewfish
Date:     2010-01-30 20:57:49 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove out of date comment and fix gcc warning.

Modified Paths:
--------------
    trunk/edk2/ArmPkg/ArmPkg.dsc
    trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c

Modified: trunk/edk2/ArmPkg/ArmPkg.dsc
===================================================================
--- trunk/edk2/ArmPkg/ArmPkg.dsc	2010-01-30 20:44:32 UTC (rev 9881)
+++ trunk/edk2/ArmPkg/ArmPkg.dsc	2010-01-30 20:57:49 UTC (rev 9882)
@@ -54,21 +54,9 @@
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
 
 [LibraryClasses.ARM]
-  #
-  # Note: This NULL library feature is not yet in the edk2/BaseTools, but it is checked in to 
-  # the BaseTools project. So you need to build with the BaseTools project util this feature gets synced.
-  #
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
 
-[BuildOptions]
-  XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv6 -march=armv6
-  XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv6
-  XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv6
 
-  RVCT:*_*_ARM_ARCHCC_FLAGS     == --cpu Cortex-A8
-  RVCT:*_*_ARM_ARCHASM_FLAGS    == --cpu Cortex-A8
- 
-
 [Components.common]
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf

Modified: trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c
===================================================================
--- trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c	2010-01-30 20:44:32 UTC (rev 9881)
+++ trunk/edk2/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandler.c	2010-01-30 20:57:49 UTC (rev 9882)
@@ -291,7 +291,7 @@
   if (DfsrStatus != 0x00) {
     DEBUG ((EFI_D_ERROR, " %a: %a 0x%08x\n", FaultStatusToString (DfsrStatus), DfsrWrite ? "write to" : "read from", SystemContext.SystemContextArm->DFAR));
   }
-  if (SystemContext.SystemContextArm->IFSR & 0xf != 0x00) {
+  if ((SystemContext.SystemContextArm->IFSR & 0xf) != 0x00) {
     DEBUG ((EFI_D_ERROR, "Instruction %a at 0x%08x, \n", FaultStatusToString (SystemContext.SystemContextArm->IFSR & 0xf), SystemContext.SystemContextArm->IFAR));
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9876
          http://edk2.svn.sourceforge.net/edk2/?rev=9876&view=rev
Author:   andrewfish
Date:     2010-01-30 20:36:25 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove Template stuff and teach people with BeagleBoard

Removed Paths:
-------------
    trunk/edk2/EmbeddedPkg/TemplateBds/
    trunk/edk2/EmbeddedPkg/TemplateCpuDxe/
    trunk/edk2/EmbeddedPkg/TemplateTimerDxe/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9869
          http://edk2.svn.sourceforge.net/edk2/?rev=9869&view=rev
Author:   andrewfish
Date:     2010-01-30 00:01:50 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fixup RELEASE build to use some NULL libs

Modified Paths:
--------------
    trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc
    trunk/edk2/BeagleBoardPkg/build.sh

Modified: trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc
===================================================================
--- trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-29 23:39:48 UTC (rev 9868)
+++ trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc	2010-01-30 00:01:50 UTC (rev 9869)
@@ -32,8 +32,11 @@
 
 
 [LibraryClasses.common]
+!if DEBUG_TARGET == RELEASE
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+!else
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-#  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+!endif
 
   ArmLib|ArmPkg/Library/ArmLib/ArmCortexA/ArmCortexArmLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

Modified: trunk/edk2/BeagleBoardPkg/build.sh
===================================================================
--- trunk/edk2/BeagleBoardPkg/build.sh	2010-01-29 23:39:48 UTC (rev 9868)
+++ trunk/edk2/BeagleBoardPkg/build.sh	2010-01-30 00:01:50 UTC (rev 9869)
@@ -99,7 +99,7 @@
 # Build the edk2 BeagleBoard code
 #
 if [[ $TARGET == RELEASE ]]; then
-  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b -D DEBUG_TARGET=RELEASE $1 $2 $3 $4 $5 $6 $7 $8
 else
   build -p $WORKSPACE/BeagleBoardPkg/BeagleBoardPkg.dsc -a ARM -t $TARGET_TOOLS -b $TARGET $1 $2 $3 $4 $5 $6 $7 $8
 fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9879
          http://edk2.svn.sourceforge.net/edk2/?rev=9879&view=rev
Author:   andrewfish
Date:     2010-01-30 20:41:24 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Change name

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

Modified: trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
===================================================================
--- trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf	2010-01-30 20:38:27 UTC (rev 9878)
+++ trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf	2010-01-30 20:41:24 UTC (rev 9879)
@@ -15,7 +15,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = TemplateMetronomeDxe
+  BASE_NAME                      = MetronomeDxe
   FILE_GUID                      = 4C6E0267-C77D-410D-8100-1495911A989D
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9878
          http://edk2.svn.sourceforge.net/edk2/?rev=9878&view=rev
Author:   andrewfish
Date:     2010-01-30 20:38:27 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix name

Added Paths:
-----------
    trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

Removed Paths:
-------------
    trunk/edk2/EmbeddedPkg/MetronomeDxe/TemplateMetronomeDxe.inf

Copied: trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf (from rev 9877, trunk/edk2/EmbeddedPkg/MetronomeDxe/TemplateMetronomeDxe.inf)
===================================================================
--- trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf	                        (rev 0)
+++ trunk/edk2/EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf	2010-01-30 20:38:27 UTC (rev 9878)
@@ -0,0 +1,49 @@
+#/** @file
+#  
+#    Component discription file for Bds module
+#
+#  Copyright (c) 2008, Apple, Inc <BR>
+#  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.
+#  
+#**/
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = TemplateMetronomeDxe
+  FILE_GUID                      = 4C6E0267-C77D-410D-8100-1495911A989D
+  MODULE_TYPE                    = DXE_DRIVER
+  VERSION_STRING                 = 1.0
+
+  ENTRY_POINT                    = MetronomeInitialize
+
+
+[Sources.common]
+  Metronome.c
+
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  BaseLib
+  UefiLib
+  UefiBootServicesTableLib
+  DebugLib
+  PrintLib
+  UefiDriverEntryPoint
+  TimerLib
+
+[Guids]
+  
+
+[Protocols]
+  gEfiMetronomeArchProtocolGuid                       
+
+[depex]
+  TRUE

Deleted: trunk/edk2/EmbeddedPkg/MetronomeDxe/TemplateMetronomeDxe.inf
===================================================================
--- trunk/edk2/EmbeddedPkg/MetronomeDxe/TemplateMetronomeDxe.inf	2010-01-30 20:37:50 UTC (rev 9877)
+++ trunk/edk2/EmbeddedPkg/MetronomeDxe/TemplateMetronomeDxe.inf	2010-01-30 20:38:27 UTC (rev 9878)
@@ -1,49 +0,0 @@
-#/** @file
-#  
-#    Component discription file for Bds module
-#
-#  Copyright (c) 2008, Apple, Inc <BR>
-#  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.
-#  
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = TemplateMetronomeDxe
-  FILE_GUID                      = 4C6E0267-C77D-410D-8100-1495911A989D
-  MODULE_TYPE                    = DXE_DRIVER
-  VERSION_STRING                 = 1.0
-
-  ENTRY_POINT                    = MetronomeInitialize
-
-
-[Sources.common]
-  Metronome.c
-
-
-[Packages]
-  MdePkg/MdePkg.dec
-
-[LibraryClasses]
-  BaseLib
-  UefiLib
-  UefiBootServicesTableLib
-  DebugLib
-  PrintLib
-  UefiDriverEntryPoint
-  TimerLib
-
-[Guids]
-  
-
-[Protocols]
-  gEfiMetronomeArchProtocolGuid                       
-
-[depex]
-  TRUE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9875
          http://edk2.svn.sourceforge.net/edk2/?rev=9875&view=rev
Author:   andrewfish
Date:     2010-01-30 20:20:37 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix VS2003 cast issue

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/Ebl/Network.c

Modified: trunk/edk2/EmbeddedPkg/Ebl/Network.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Network.c	2010-01-30 20:19:44 UTC (rev 9874)
+++ trunk/edk2/EmbeddedPkg/Ebl/Network.c	2010-01-30 20:20:37 UTC (rev 9875)
@@ -21,13 +21,13 @@
   OUT EFI_IP_ADDRESS  *Address
   )
 {
-  Address->v4.Addr[0] = AsciiStrDecimalToUintn(String);
+  Address->v4.Addr[0] = (UINT8)AsciiStrDecimalToUintn (String);
   String = AsciiStrStr(String, ".") + 1;
-  Address->v4.Addr[1] = AsciiStrDecimalToUintn(String);
+  Address->v4.Addr[1] = (UINT8)AsciiStrDecimalToUintn (String);
   String = AsciiStrStr(String, ".") + 1;
-  Address->v4.Addr[2] = AsciiStrDecimalToUintn(String);
+  Address->v4.Addr[2] = (UINT8)AsciiStrDecimalToUintn (String);
   String = AsciiStrStr(String, ".") + 1;
-  Address->v4.Addr[3] = AsciiStrDecimalToUintn(String);
+  Address->v4.Addr[3] = (UINT8)AsciiStrDecimalToUintn (String);
   
   return EFI_SUCCESS;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9874
          http://edk2.svn.sourceforge.net/edk2/?rev=9874&view=rev
Author:   andrewfish
Date:     2010-01-30 20:19:44 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix VS2003 cast

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c

Modified: trunk/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c
===================================================================
--- trunk/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c	2010-01-30 20:16:45 UTC (rev 9873)
+++ trunk/edk2/EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.c	2010-01-30 20:19:44 UTC (rev 9874)
@@ -49,7 +49,7 @@
   
   gCurrentMonotonicCount += 0x0000000100000000ULL;
   
-  *HighCount = RShiftU64 (gCurrentMonotonicCount, 32) & 0xFFFFFFFF;
+  *HighCount = (UINT32)RShiftU64 (gCurrentMonotonicCount, 32) & 0xFFFFFFFF;
 
   return EFI_SUCCESS;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9873
          http://edk2.svn.sourceforge.net/edk2/?rev=9873&view=rev
Author:   andrewfish
Date:     2010-01-30 20:16:45 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix some VS2003 warnings

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c

Modified: trunk/edk2/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c	2010-01-30 00:13:41 UTC (rev 9872)
+++ trunk/edk2/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c	2010-01-30 20:16:45 UTC (rev 9873)
@@ -1074,7 +1074,7 @@
       return 0;
     }
 
-    File->Size        = BufferSize;
+    File->Size        = (UINTN)BufferSize;
     File->MaxPosition = File->Size;
   }
 
@@ -1451,7 +1451,7 @@
 
       TempBuffer = File->Buffer;
 
-      File->Buffer = AllocatePool (File->CurrentPosition + *BufferSize);
+      File->Buffer = AllocatePool ((UINTN)(File->CurrentPosition + *BufferSize));
       if (File->Buffer == NULL) {
         return EFI_OUT_OF_RESOURCES;
       }
@@ -1460,8 +1460,8 @@
 
       FreePool (TempBuffer);
 
-      File->Size = File->CurrentPosition + *BufferSize;
-      File->MaxPosition = File->Size;
+      File->Size = (UINTN)(File->CurrentPosition + *BufferSize);
+      File->MaxPosition = (UINT64)File->Size;
     }
 
     // Copy in the requested data


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9872
          http://edk2.svn.sourceforge.net/edk2/?rev=9872&view=rev
Author:   mdkinney
Date:     2010-01-30 00:13:41 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/DuetPkg/FSVariable/FSVariable.c

Modified: trunk/edk2/DuetPkg/FSVariable/FSVariable.c
===================================================================
--- trunk/edk2/DuetPkg/FSVariable/FSVariable.c	2010-01-30 00:11:41 UTC (rev 9871)
+++ trunk/edk2/DuetPkg/FSVariable/FSVariable.c	2010-01-30 00:13:41 UTC (rev 9872)
@@ -1301,12 +1301,12 @@
   
   //
   //  The size of the VariableName, including the Unicode Null in bytes plus
-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)
-  //  bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)
+  //  bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.
   //
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {
-    if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) ||                                                       
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {
+    if ((DataSize > PcdGet32(PcdMaxHardwareErrorVariableSize)) ||                                                       
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32(PcdMaxHardwareErrorVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }
     //
@@ -1316,8 +1316,8 @@
       return EFI_INVALID_PARAMETER;
     }
   } else {
-    if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {
+    if ((DataSize > PcdGet32(PcdMaxVariableSize)) ||
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32(PcdMaxVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }  
   }  
@@ -1421,18 +1421,18 @@
   // Harware error record variable needs larger size.
   //
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {
-    *MaximumVariableStorageSize = FixedPcdGet32(PcdHwErrStorageSize);
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableStorageSize = PcdGet32(PcdHwErrStorageSize);
+    *MaximumVariableSize = PcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
   } else {
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
-      ASSERT (FixedPcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);
-      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize);
+      ASSERT (PcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);
+      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32(PcdHwErrStorageSize);
     }
 
     //
-    // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.
+    // Let *MaximumVariableSize be PcdGet32(PcdMaxVariableSize) with the exception of the variable header size.
     //
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableSize = PcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
   }
   
   //


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9871
          http://edk2.svn.sourceforge.net/edk2/?rev=9871&view=rev
Author:   mdkinney
Date:     2010-01-30 00:11:41 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf

Modified: trunk/edk2/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
===================================================================
--- trunk/edk2/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf	2010-01-30 00:10:44 UTC (rev 9870)
+++ trunk/edk2/PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf	2010-01-30 00:11:41 UTC (rev 9871)
@@ -1,7 +1,7 @@
 #/** @file
 # 8259 Interrupt Controller driver
 #
-# Copyright (c) 2005 - 2009, Intel Corporation                                                         
+# Copyright (c) 2005 - 2010, 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        
@@ -18,11 +18,12 @@
   FILE_GUID                      = 79CA4208-BBA1-4a9a-8456-E1E66A81484E
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = Install8259
 
+[Sources]
+  8259.c
+  8259.h
+
 [Packages]
   MdePkg/MdePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -36,15 +37,11 @@
   IoLib
   PcdLib
   
-[Sources.common]
-  8259.c
-  8259.h
-
 [Protocols]
   gEfiLegacy8259ProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED
   gEfiPciIoProtocolGuid
 
-[Pcd]
+[FixedPcd]
   gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeMask|0xFFFF
   gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0000
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9870
          http://edk2.svn.sourceforge.net/edk2/?rev=9870&view=rev
Author:   mdkinney
Date:     2010-01-30 00:10:44 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
    trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
    trunk/edk2/OvmfPkg/PlatformPei/Platform.c
    trunk/edk2/OvmfPkg/PlatformPei/PlatformPei.inf
    trunk/edk2/OvmfPkg/Sec/SecMain.inf

Modified: trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
===================================================================
--- trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c	2010-01-30 00:01:50 UTC (rev 9869)
+++ trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c	2010-01-30 00:10:44 UTC (rev 9870)
@@ -2,7 +2,7 @@
   Firmware Block Services to support emulating non-volatile variables
   by pretending that a memory buffer is storage for the NV variables.
 
-  Copyright (c) 2006 - 2009, Intel Corporation
+  Copyright (c) 2006 - 2010, 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
@@ -769,8 +769,8 @@
   // Verify that the PCD's are set correctly.
   //
   if (
-       (FixedPcdGet32 (PcdVariableStoreSize) +
-        FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize)
+       (PcdGet32 (PcdVariableStoreSize) +
+        PcdGet32 (PcdFlashNvStorageFtwWorkingSize)
        ) >
        EMU_FVB_BLOCK_SIZE
      ) {
@@ -820,7 +820,7 @@
   //
   // Initialize the Fault Tolerant Write data area
   //
-  SubPtr = (VOID*) ((UINT8*) Ptr + FixedPcdGet32 (PcdVariableStoreSize));
+  SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize));
   if (Initialize) {
     InitializeFtwState (SubPtr);
   }

Modified: trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
===================================================================
--- trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf	2010-01-30 00:01:50 UTC (rev 9869)
+++ trunk/edk2/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf	2010-01-30 00:10:44 UTC (rev 9870)
@@ -2,7 +2,7 @@
 #  Firmware Block Services to support emulating non-volatile variables
 #  by pretending that a memory buffer is storage for the NV variables.
 #
-#  Copyright (c) 2008 - 2009, Intel Corporation
+#  Copyright (c) 2008 - 2010, 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
@@ -19,9 +19,6 @@
   FILE_GUID                      = 22dc2b60-fe40-42ac-b01f-3ab1fad9aad8
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = FvbInitialize
 
 #
@@ -30,16 +27,14 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   Fvb.c
 
-
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   OvmfPkg/OvmfPkg.dec
 
-
 [LibraryClasses]
   BaseLib
   BaseMemoryLib
@@ -54,30 +49,25 @@
   UefiLib
   UefiRuntimeLib
 
-
 [Guids]
   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID
 
-
 [Protocols]
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED
 
-
 [FixedPcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
-
 [Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
 
-
 [Depex]
   TRUE
 

Modified: trunk/edk2/OvmfPkg/PlatformPei/Platform.c
===================================================================
--- trunk/edk2/OvmfPkg/PlatformPei/Platform.c	2010-01-30 00:01:50 UTC (rev 9869)
+++ trunk/edk2/OvmfPkg/PlatformPei/Platform.c	2010-01-30 00:10:44 UTC (rev 9870)
@@ -1,7 +1,7 @@
 /**@file
   Platform PEI driver
 
-  Copyright (c) 2006 - 2009, Intel Corporation
+  Copyright (c) 2006 - 2010, 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
@@ -173,12 +173,12 @@
   VariableStore =
     (EFI_PHYSICAL_ADDRESS)(UINTN)
       AllocateRuntimePool (
-        2 * FixedPcdGet32(PcdFlashNvStorageFtwSpareSize)
+        2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)
         );
   DEBUG ((EFI_D_INFO,
           "Reserved variable store memory: 0x%lX; size: %dkb\n",
           VariableStore,
-          (2 * FixedPcdGet32(PcdFlashNvStorageFtwSpareSize)) / 1024
+          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
         ));
   PcdSet64 (PcdEmuVariableNvStoreReserved, VariableStore);
 }

Modified: trunk/edk2/OvmfPkg/PlatformPei/PlatformPei.inf
===================================================================
--- trunk/edk2/OvmfPkg/PlatformPei/PlatformPei.inf	2010-01-30 00:01:50 UTC (rev 9869)
+++ trunk/edk2/OvmfPkg/PlatformPei/PlatformPei.inf	2010-01-30 00:10:44 UTC (rev 9870)
@@ -2,7 +2,7 @@
 #  Platform PEI driver
 #
 #  This module provides platform specific function to detect boot mode.
-#  Copyright (c) 2006 - 2009, Intel Corporation
+#  Copyright (c) 2006 - 2010, 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
@@ -20,9 +20,6 @@
   FILE_GUID                      = 222c386d-5abc-4fb4-b124-fbb82488acf4
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = InitializePlatform
 
 #
@@ -31,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   Cmos.c
   Fv.c
   MemDetect.c
@@ -53,14 +50,12 @@
   PeiServicesTablePointerLib
   PeimEntryPoint
 
-[FixedPcd.common]
+[Pcd]
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-
-[Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
 
 [Depex]

Modified: trunk/edk2/OvmfPkg/Sec/SecMain.inf
===================================================================
--- trunk/edk2/OvmfPkg/Sec/SecMain.inf	2010-01-30 00:01:50 UTC (rev 9869)
+++ trunk/edk2/OvmfPkg/Sec/SecMain.inf	2010-01-30 00:10:44 UTC (rev 9870)
@@ -1,7 +1,7 @@
 #/** @file
 #  SEC Driver
 #
-#  Copyright (c) 2008 - 2009, Intel Corporation
+#  Copyright (c) 2008 - 2010, 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
@@ -19,8 +19,6 @@
   FILE_GUID                      = df1ccef6-f301-4a63-9661-fc6030dcc880
   MODULE_TYPE                    = SEC
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
   ENTRY_POINT                    = SecMain
 
 #
@@ -59,7 +57,7 @@
 [Ppis]
   gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_PRODUCED
 
-[FixedPcd.common]
+[Pcd]
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9868
          http://edk2.svn.sourceforge.net/edk2/?rev=9868&view=rev
Author:   mdkinney
Date:     2010-01-29 23:39:48 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
    trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
    trunk/edk2/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
    trunk/edk2/MdeModulePkg/Core/Pei/FwVol/FwVol.c
    trunk/edk2/MdeModulePkg/Core/Pei/Ppi/Ppi.c
    trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
    trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
    trunk/edk2/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
    trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
    trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Service.c
    trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
    trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Service.c
    trunk/edk2/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
    trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c

Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf	2010-01-29 23:39:48 UTC (rev 9868)
@@ -5,7 +5,7 @@
 #  space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable
 #  hot plug supporting.
 #
-#  Copyright (c) 2006 - 2009, Intel Corporation
+#  Copyright (c) 2006 - 2010, 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
@@ -23,7 +23,6 @@
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  EFI_SPECIFICATION_VERSION      = 0x00020000
   ENTRY_POINT                    = PciBusEntryPoint
 
 #
@@ -36,7 +35,7 @@
 #  COMPONENT_NAME2               =  gPciBusComponentName2
 #
 
-[Sources.common]
+[Sources]
   PciLib.c
   PciIo.c
   PciBus.c
@@ -99,14 +98,14 @@
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## CONSUMED
   gEfiLoadFile2ProtocolGuid                       ## CONSUMED
 
-[FeaturePcd.common]
+[FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport
   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport
   gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport
   gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe
 
-[FixedPcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSystemPageSize
 
 # [Event]

Modified: trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
===================================================================
--- trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -2040,7 +2040,7 @@
                  );
     DEBUG ((EFI_D_INFO, "PCI-IOV B%x.D%x.F%x - SupportedPageSize - 0x%x\n", (UINTN)Bus, (UINTN)Device, (UINTN)Func, PciIoDevice->SystemPageSize));
 
-    PciIoDevice->SystemPageSize = (FixedPcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);
+    PciIoDevice->SystemPageSize = (PcdGet32 (PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);
     ASSERT (PciIoDevice->SystemPageSize != 0);
 
     PciIo->Pci.Write (

Modified: trunk/edk2/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -75,7 +75,7 @@
   //
   // Go ahead to scan this Fv, and cache FileHandles within it.
   //
-  for (PeimCount = 0; PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {
+  for (PeimCount = 0; PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {
     Status = FvPpi->FindFileByType (FvPpi, PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE, CoreFileHandle->FvHandle, &FileHandle);
     if (Status != EFI_SUCCESS) {
       break;
@@ -88,7 +88,7 @@
   // Check whether the count of Peims exceeds the max support PEIMs in a FV image
   // If more Peims are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.
   //
-  ASSERT (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv));
+  ASSERT (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv));
 
   //
   // Get Apriori File handle
@@ -293,7 +293,7 @@
     SaveCurrentFileHandle =  Private->CurrentFileHandle;
 
     for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {
-      for (Index2 = 0; (Index2 < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {
+      for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {
         if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {
           PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];
           Status = PeiLoadImage (
@@ -379,7 +379,7 @@
       // Start to dispatch all modules within the current Fv.
       //
       for (PeimCount = Private->CurrentPeimCount;
-           (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);
+           (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);
            PeimCount++) {
         Private->CurrentPeimCount  = PeimCount;
         PeimFileHandle = Private->CurrentFileHandle = Private->CurrentFvFileHandles[PeimCount];

Modified: trunk/edk2/MdeModulePkg/Core/Pei/FwVol/FwVol.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Pei/FwVol/FwVol.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Core/Pei/FwVol/FwVol.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -368,8 +368,8 @@
   Status       = EFI_SUCCESS;
   PrivateData  = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);
 
-  if (PrivateData->FvCount >= FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {
-    DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, FixedPcdGet32 (PcdPeiCoreMaxFvSupported)));
+  if (PrivateData->FvCount >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {
+    DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, PcdGet32 (PcdPeiCoreMaxFvSupported)));
     DEBUG ((EFI_D_ERROR, "PcdPeiCoreMaxFvSupported value need be reconfigurated in DSC"));
     ASSERT (FALSE);
   }
@@ -1417,7 +1417,7 @@
   //
   // Fixup all FvPpi pointers for the implementation in flash to permanent memory.
   //
-  for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {
+  for (Index = 0; Index < PcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {
     if (PrivateData->Fv[Index].FvPpi == OldFfs2FvPpi) {
       PrivateData->Fv[Index].FvPpi = &mPeiFfs2FvPpi;
     }
@@ -1452,7 +1452,7 @@
 {
   PEI_CORE_UNKNOW_FORMAT_FV_INFO    *NewUnknownFv;
   
-  if (PrivateData->UnknownFvInfoCount + 1 >= FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) {
+  if (PrivateData->UnknownFvInfoCount + 1 >= PcdGet32 (PcdPeiCoreMaxPeimPerFv)) {
     return EFI_OUT_OF_RESOURCES;
   }
   

Modified: trunk/edk2/MdeModulePkg/Core/Pei/Ppi/Ppi.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Pei/Ppi/Ppi.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Core/Pei/Ppi/Ppi.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -1,7 +1,7 @@
 /** @file
   EFI PEI Core PPI services
   
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2010, 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
@@ -30,9 +30,9 @@
   )
 {
   if (OldCoreData == NULL) {
-    PrivateData->PpiData.NotifyListEnd = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
-    PrivateData->PpiData.DispatchListEnd = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
-    PrivateData->PpiData.LastDispatchedNotify = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
+    PrivateData->PpiData.NotifyListEnd = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
+    PrivateData->PpiData.DispatchListEnd = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
+    PrivateData->PpiData.LastDispatchedNotify = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;
   }
 }
 
@@ -60,7 +60,7 @@
   UINT8                 Index;
   PEI_PPI_LIST_POINTERS *PpiPointer;
 
-  for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxPpiSupported); Index++) {
+  for (Index = 0; Index < PcdGet32 (PcdPeiCoreMaxPpiSupported); Index++) {
     if (Index < PrivateData->PpiData.PpiListEnd ||
         Index > PrivateData->PpiData.NotifyListEnd) {
       PpiPointer = &PrivateData->PpiData.PpiListPtrs[Index];
@@ -254,7 +254,7 @@
   // Remove the old PPI from the database, add the new one.
   //
   DEBUG((EFI_D_INFO, "Reinstall PPI: %g\n", NewPpi->Guid));
-  ASSERT (Index < FixedPcdGet32 (PcdPeiCoreMaxPpiSupported));
+  ASSERT (Index < (INTN)(PcdGet32 (PcdPeiCoreMaxPpiSupported)));
   PrivateData->PpiData.PpiListPtrs[Index].Ppi = (EFI_PEI_PPI_DESCRIPTOR *) NewPpi;
 
   //
@@ -512,7 +512,7 @@
         EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH,
         PrivateData->PpiData.LastDispatchedInstall,
         PrivateData->PpiData.PpiListEnd,
-        FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1,
+        PcdGet32 (PcdPeiCoreMaxPpiSupported)-1,
         PrivateData->PpiData.DispatchListEnd
         );
       PrivateData->PpiData.LastDispatchedInstall = TempValue;

Modified: trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -1,7 +1,7 @@
 /** @file
   Sample ACPI Platform Driver
 
-  Copyright (c) 2008 - 2009, Intel Corporation<BR>
+  Copyright (c) 2008 - 2010, Intel Corporation<BR>
   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
@@ -93,7 +93,7 @@
     //
     Status = FvInstance->ReadFile (
                            FvInstance,
-                           (EFI_GUID*)FixedPcdGetPtr (PcdAcpiTableStorageFile),
+                           (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),
                            NULL,
                            &Size,
                            &FileType,
@@ -207,7 +207,7 @@
 
     Status = FwVol->ReadSection (
                       FwVol,
-                      (EFI_GUID*)FixedPcdGetPtr (PcdAcpiTableStorageFile),
+                      (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),
                       EFI_SECTION_RAW,
                       Instance,
                       (VOID**) &CurrentTable,

Modified: trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf	2010-01-29 23:39:48 UTC (rev 9868)
@@ -1,7 +1,7 @@
 #/** @file
 #  Sample ACPI Platform Driver
 #
-#  Copyright (c) 2008 - 2009, Intel Corporation. <BR>
+#  Copyright (c) 2008 - 2010, Intel Corporation. <BR>
 #  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
@@ -18,8 +18,6 @@
   FILE_GUID                      = cb933912-df8f-4305-b1f9-7b44fa11395c
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
   ENTRY_POINT                    = AcpiPlatformEntryPoint
 
 #
@@ -28,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   AcpiPlatform.c
 
 [Packages]
@@ -47,7 +45,7 @@
 [Protocols]
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
 
-[FixedPcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile
 
 [Depex]

Modified: trunk/edk2/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -598,7 +598,7 @@
         goto Error;
       }
 
-      TerminalType = FixedPcdGet8 (PcdDefaultTerminalType);
+      TerminalType = PcdGet8 (PcdDefaultTerminalType);
       //
       // Must be between PCANSITYPE (0) and VTUTF8TYPE (3)
       //

Modified: trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf	2010-01-29 23:39:48 UTC (rev 9868)
@@ -276,7 +276,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -303,7 +303,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   Pcd.c
   Service.c
   Service.h
@@ -331,7 +331,7 @@
   gPcdProtocolGuid                              ## PRODUCES
   gEfiPcdProtocolGuid                           ## PRODUCES
   
-[FixedPcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
 
 [Depex]

Modified: trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Service.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Service.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/PCD/Dxe/Service.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -119,7 +119,7 @@
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {
     case PCD_TYPE_VPD:
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);
-      RetPtr = (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);
+      RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);
       break;
       
     case PCD_TYPE_HII:

Modified: trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Pcd.inf	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Pcd.inf	2010-01-29 23:39:48 UTC (rev 9868)
@@ -271,7 +271,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #    
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -298,7 +298,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #
 
-[Sources.common]
+[Sources]
   Service.c
   Service.h
   Pcd.c
@@ -328,7 +328,7 @@
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable
 
-[FixedPcd]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable
 

Modified: trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Service.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Service.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/PCD/Pei/Service.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -87,13 +87,13 @@
   ASSERT (GuidHob != NULL);
   
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);
-  CallbackTable = CallbackTable + (TokenNumber * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry));
+  CallbackTable = CallbackTable + (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));
 
   Compare = Register? NULL: CallBackFunction;
   Assign  = Register? CallBackFunction: NULL;
 
 
-  for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {
+  for (Idx = 0; Idx < PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {
     if (CallbackTable[Idx] == Compare) {
       CallbackTable[Idx] = Assign;
       return EFI_SUCCESS;
@@ -126,7 +126,7 @@
   
   CopyMem (&Database->Init, &gPEIPcdDbInit, sizeof (gPEIPcdDbInit));
 
-  SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry);
+  SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry);
 
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);
   
@@ -300,9 +300,9 @@
   
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);
 
-  CallbackTable += (TokenNumber * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry));
+  CallbackTable += (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));
 
-  for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {
+  for (Idx = 0; Idx < PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {
     if (CallbackTable[Idx] != NULL) {
       CallbackTable[Idx] (Guid,
                           (Guid == NULL)? TokenNumber: ExTokenNumber,
@@ -621,7 +621,7 @@
     {
       VPD_HEAD *VpdHead;
       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);
-      return (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);
+      return (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);
     }
       
     case PCD_TYPE_HII:

Modified: trunk/edk2/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -3,7 +3,7 @@
   Emulation Variable services operate on the runtime volatile memory.
   The nonvolatile variable space doesn't exist.
 
-Copyright (c) 2006 - 2008, Intel Corporation
+Copyright (c) 2006 - 2010, 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
@@ -767,9 +767,9 @@
   if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) 
-      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))
+      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))
       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) 
-      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {
+      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {
       Status = EFI_OUT_OF_RESOURCES;
       goto Done;
     }
@@ -1166,12 +1166,12 @@
   }
   //
   //  The size of the VariableName, including the Unicode Null in bytes plus
-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)
-  //  bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)
+  //  bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.
   //
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {
-    if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) ||                                                       
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {
+    if ((DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize)) ||                                                       
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }
     //
@@ -1183,10 +1183,10 @@
   } else {
   //
   //  The size of the VariableName, including the Unicode Null in bytes plus
-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxVariableSize) bytes.
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxVariableSize) bytes.
   //
-    if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {
+    if ((DataSize > PcdGet32 (PcdMaxVariableSize)) ||
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }  
   }
@@ -1301,18 +1301,18 @@
   // Harware error record variable needs larger size.
   //
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {
-    *MaximumVariableStorageSize = FixedPcdGet32(PcdHwErrStorageSize);
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableStorageSize = PcdGet32 (PcdHwErrStorageSize);
+    *MaximumVariableSize = PcdGet32 (PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
   } else {
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
-      ASSERT (FixedPcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);
-      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize);
+      ASSERT (PcdGet32 (PcdHwErrStorageSize) < VariableStoreHeader->Size);
+      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize);
     }
 
     //
-    // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.
+    // Let *MaximumVariableSize be PcdGet32 (PcdMaxVariableSize) with the exception of the variable header size.
     //
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableSize = PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
   }
 
   //
@@ -1392,15 +1392,13 @@
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of 
   // PcdVariableStoreSize.
   //
-  ASSERT (FixedPcdGet32(PcdHwErrStorageSize) <= FixedPcdGet32(PcdVariableStoreSize));
+  ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdVariableStoreSize));
 
   //
   // Allocate memory for variable store.
   //
   if (VolatileStore || (PcdGet64 (PcdEmuVariableNvStoreReserved) == 0)) {
-    VariableStore = (VARIABLE_STORE_HEADER *) AllocateRuntimePool (
-                                                FixedPcdGet32(PcdVariableStoreSize)
-                                                );
+    VariableStore = (VARIABLE_STORE_HEADER *) AllocateRuntimePool (PcdGet32 (PcdVariableStoreSize));
   } else {
     //
     // A memory location has been reserved for the NV variable store.  Certain
@@ -1411,7 +1409,7 @@
       (VARIABLE_STORE_HEADER *)(VOID*)(UINTN)
         PcdGet64 (PcdEmuVariableNvStoreReserved);
     if (
-         (VariableStore->Size == FixedPcdGet32(PcdVariableStoreSize)) &&
+         (VariableStore->Size == PcdGet32 (PcdVariableStoreSize)) &&
          (VariableStore->Format == VARIABLE_STORE_FORMATTED) &&
          (VariableStore->State == VARIABLE_STORE_HEALTHY)
        ) {
@@ -1429,7 +1427,7 @@
   }
 
   if (FullyInitializeStore) {
-    SetMem (VariableStore, FixedPcdGet32(PcdVariableStoreSize), 0xff);
+    SetMem (VariableStore, PcdGet32 (PcdVariableStoreSize), 0xff);
   }
 
   //
@@ -1439,7 +1437,7 @@
   InitializeLocationForLastVariableOffset (VariableStore, LastVariableOffset);
 
   CopyGuid (&VariableStore->Signature, &gEfiVariableGuid);
-  VariableStore->Size       = FixedPcdGet32(PcdVariableStoreSize);
+  VariableStore->Size       = PcdGet32 (PcdVariableStoreSize);
   VariableStore->Format     = VARIABLE_STORE_FORMATTED;
   VariableStore->State      = VARIABLE_STORE_HEALTHY;
   VariableStore->Reserved   = 0;

Modified: trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c	2010-01-29 23:34:42 UTC (rev 9867)
+++ trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c	2010-01-29 23:39:48 UTC (rev 9868)
@@ -3,7 +3,7 @@
   Implement all four UEFI Runtime Variable services for the nonvolatile
   and volatile storage space and install variable architecture protocol.
   
-Copyright (c) 2006 - 2009, Intel Corporation                                                         
+Copyright (c) 2006 - 2010, 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        
@@ -1475,7 +1475,7 @@
   // as a temporary storage.
   //
   NextVariable = GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) mVariableModuleGlobal->VariableGlobal.VolatileVariableBase));
-  ScratchSize = MAX(FixedPcdGet32(PcdMaxVariableSize), FixedPcdGet32(PcdMaxHardwareErrorVariableSize));
+  ScratchSize = MAX (PcdGet32 (PcdMaxVariableSize), PcdGet32 (PcdMaxHardwareErrorVariableSize));
 
   SetMem (NextVariable, ScratchSize, 0xff);
 
@@ -1519,9 +1519,9 @@
     Volatile = FALSE;
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase))->Size;
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) 
-      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))
+      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))
       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) 
-      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {
+      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {
       if (EfiAtRuntime ()) {
         Status = EFI_OUT_OF_RESOURCES;
         goto Done;
@@ -1538,9 +1538,9 @@
       // If still no enough space, return out of resources
       //
       if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) 
-        && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))
+        && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))
         || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) 
-        && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {
+        && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {
         Status = EFI_OUT_OF_RESOURCES;
         goto Done;
       }
@@ -1943,12 +1943,12 @@
 
   //
   //  The size of the VariableName, including the Unicode Null in bytes plus
-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)
-  //  bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)
+  //  bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.
   //
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {
-    if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) ||
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {
+    if ((DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize)) ||
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }
     //
@@ -1960,10 +1960,10 @@
   } else {
     //
     //  The size of the VariableName, including the Unicode Null in bytes plus
-    //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxVariableSize) bytes.
+    //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxVariableSize) bytes.
     //
-    if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {
+    if ((DataSize > PcdGet32 (PcdMaxVariableSize)) ||
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize))) {
       return EFI_INVALID_PARAMETER;
     }  
   }  
@@ -2091,18 +2091,18 @@
   // Harware error record variable needs larger size.
   //
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {
-    *MaximumVariableStorageSize = FixedPcdGet32(PcdHwErrStorageSize);
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableStorageSize = PcdGet32 (PcdHwErrStorageSize);
+    *MaximumVariableSize = PcdGet32 (PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);
   } else {
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {
-      ASSERT (FixedPcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);
-      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize);
+      ASSERT (PcdGet32 (PcdHwErrStorageSize) < VariableStoreHeader->Size);
+      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize);
     }
 
     //
-    // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.
+    // Let *MaximumVariableSize be PcdGet32 (PcdMaxVariableSize) with the exception of the variable header size.
     //
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
+    *MaximumVariableSize = PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);
   }
 
   //
@@ -2259,19 +2259,19 @@
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of 
   // PcdFlashNvStorageVariableSize.
   //
-  ASSERT (FixedPcdGet32(PcdHwErrStorageSize) <= FixedPcdGet32(PcdFlashNvStorageVariableSize));
+  ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdFlashNvStorageVariableSize));
 
   //
   // Allocate memory for volatile variable store, note that there is a scratch space to store scratch data.
   //
-  ScratchSize = MAX(FixedPcdGet32(PcdMaxVariableSize), FixedPcdGet32(PcdMaxHardwareErrorVariableSize));
-  VolatileVariableStore = AllocateRuntimePool (FixedPcdGet32(PcdVariableStoreSize) + ScratchSize);
+  ScratchSize = MAX (PcdGet32 (PcdMaxVariableSize), PcdGet32 (PcdMaxHardwareErrorVariableSize));
+  VolatileVariableStore = AllocateRuntimePool (PcdGet32 (PcdVariableStoreSize) + ScratchSize);
   if (VolatileVariableStore == NULL) {
     FreePool (mVariableModuleGlobal);
     return EFI_OUT_OF_RESOURCES;
   }
 
-  SetMem (VolatileVariableStore, FixedPcdGet32(PcdVariableStoreSize) + ScratchSize, 0xff);
+  SetMem (VolatileVariableStore, PcdGet32 (PcdVariableStoreSize) + ScratchSize, 0xff);
 
   //
   //  Variable Specific Data
@@ -2281,7 +2281,7 @@
   mVariableModuleGlobal->FvbInstance = FvbProtocol;
 
   CopyGuid (&VolatileVariableStore->Signature, &gEfiVariableGuid);
-  VolatileVariableStore->Size                       = FixedPcdGet32(PcdVariableStoreSize);
+  VolatileVariableStore->Size                       = PcdGet32 (PcdVariableStoreSize);
   VolatileVariableStore->Format                     = VARIABLE_STORE_FORMATTED;
   VolatileVariableStore->State                      = VARIABLE_STORE_HEALTHY;
   VolatileVariableStore->Reserved                   = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9867
          http://edk2.svn.sourceforge.net/edk2/?rev=9867&view=rev
Author:   mdkinney
Date:     2010-01-29 23:34:42 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
    trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf	2010-01-29 23:33:08 UTC (rev 9866)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf	2010-01-29 23:34:42 UTC (rev 9867)
@@ -1,7 +1,7 @@
 #/** @file
 # Serial driver for standard UARTS on an ISA bus.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation
+# Copyright (c) 2007 - 2010, 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
@@ -19,7 +19,6 @@
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  EFI_SPECIFICATION_VERSION      = 0x00020000
   ENTRY_POINT                    = InitializeIsaSerial
 
 #
@@ -32,7 +31,7 @@
 #  COMPONENT_NAME2               =  gIsaSerialComponentName2
 #
 
-[Sources.common]
+[Sources]
   ComponentName.c
   Serial.h
   Serial.c
@@ -58,11 +57,12 @@
   gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSerialIoProtocolGuid                      ## BY_START
 
-[FixedPcd.common]
+[FeaturePcd]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
+  
+[FixedPcd]
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
 
-[FeaturePcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE

Modified: trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c	2010-01-29 23:33:08 UTC (rev 9866)
+++ trunk/edk2/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c	2010-01-29 23:34:42 UTC (rev 9867)
@@ -1117,7 +1117,7 @@
   // Check for default settings and fill in actual values.
   //
   if (BaudRate == 0) {
-    BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);
+    BaudRate = PcdGet64 (PcdUartDefaultBaudRate);
   }
 
   if (ReceiveFifoDepth == 0) {
@@ -1129,15 +1129,15 @@
   }
 
   if (Parity == DefaultParity) {
-    Parity = (EFI_PARITY_TYPE)FixedPcdGet8 (PcdUartDefaultParity);
+    Parity = (EFI_PARITY_TYPE)PcdGet8 (PcdUartDefaultParity);
   }
 
   if (DataBits == 0) {
-    DataBits = FixedPcdGet8 (PcdUartDefaultDataBits);
+    DataBits = PcdGet8 (PcdUartDefaultDataBits);
   }
 
   if (StopBits == DefaultStopBits) {
-    StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits);
+    StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);
   }
   //
   // 5 and 6 data bits can not be verified on a 16550A UART


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9866
          http://edk2.svn.sourceforge.net/edk2/?rev=9866&view=rev
Author:   mdkinney
Date:     2010-01-29 23:33:08 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
Do some minor clean ups to INF files
 

Modified Paths:
--------------
    trunk/edk2/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
    trunk/edk2/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
    trunk/edk2/UnixPkg/Sec/SecMain.c
    trunk/edk2/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf

Modified: trunk/edk2/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
===================================================================
--- trunk/edk2/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf	2010-01-29 23:30:55 UTC (rev 9865)
+++ trunk/edk2/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf	2010-01-29 23:33:08 UTC (rev 9866)
@@ -3,7 +3,7 @@
 #
 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on 
 #  Unix emulator.
-# Copyright (c) 2008, Intel Corporation
+# Copyright (c) 2008 - 2010, 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
@@ -21,9 +21,6 @@
   FILE_GUID                      = f42fd042-8985-11db-a7db-0040d02b1835
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = FvbInitialize
 
 #
@@ -32,17 +29,15 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.Ia32]
+[Sources]
   FvbInfo.c
   FWBlockService.c
 
-
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   UnixPkg/UnixPkg.dec
 
-
 [LibraryClasses]
   UefiBootServicesTableLib
   MemoryAllocationLib
@@ -56,7 +51,6 @@
   UefiLib
   DevicePathLib
 
-
 [Guids]
   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID
 
@@ -64,17 +58,15 @@
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED
   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED
 
-
-[FixedPcd.common]
+[FixedPcd]
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize
-
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
 
-[Pcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
@@ -82,7 +74,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
 
-
 [Depex]
   TRUE
 

Modified: trunk/edk2/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
===================================================================
--- trunk/edk2/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf	2010-01-29 23:30:55 UTC (rev 9865)
+++ trunk/edk2/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf	2010-01-29 23:33:08 UTC (rev 9866)
@@ -5,7 +5,7 @@
 #  All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file 
 #  and parse all .uni file.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -23,9 +23,6 @@
   FILE_GUID                      = f2fbd108-8985-11db-b06a-0040d02b1835
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = MiscSubclassDriverEntryPoint
 
 #
@@ -34,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   MiscBaseBoardManufacturer.uni
   MiscBaseBoardManufacturerData.c
   MiscBaseBoardManufacturerFunction.c
@@ -91,18 +88,15 @@
   HiiLib
   DebugLib
   BaseLib
-
   PcdLib
 
 [Protocols]
   gEfiUnixIoProtocolGuid                        # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED
 
-[FixedPcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
-
-[Pcd.common]
   gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
 

Modified: trunk/edk2/UnixPkg/Sec/SecMain.c
===================================================================
--- trunk/edk2/UnixPkg/Sec/SecMain.c	2010-01-29 23:30:55 UTC (rev 9865)
+++ trunk/edk2/UnixPkg/Sec/SecMain.c	2010-01-29 23:33:08 UTC (rev 9866)
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006 - 2009 Intel Corporation.
+Copyright (c) 2006 - 2010, Intel Corporation.
 Portions copyright (c) 2008-2009 Apple Inc.
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -188,8 +188,8 @@
   setbuf(stdout, 0);
   setbuf(stderr, 0);
 
-  MemorySizeStr      = (CHAR16 *) FixedPcdGetPtr (PcdUnixMemorySizeForSecMain);
-  FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdUnixFirmwareVolume);
+  MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdUnixMemorySizeForSecMain);
+  FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdUnixFirmwareVolume);
 
   printf ("\nEDK SEC Main UNIX Emulation Environment from http://www.TianoCore.org\n");
 
@@ -227,7 +227,7 @@
   //
   // Setup Boot Mode. If BootModeStr == "" then BootMode = 0 (BOOT_WITH_FULL_CONFIGURATION)
   //
-  printf ("  BootMode 0x%02x\n", (unsigned int)FixedPcdGet32 (PcdUnixBootMode));
+  printf ("  BootMode 0x%02x\n", (unsigned int)PcdGet32 (PcdUnixBootMode));
 
   //
   // Open up a 128K file to emulate temp memory for PEI.
@@ -621,7 +621,7 @@
   SecCoreData                        = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;
   SecCoreData->DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);
   SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;
-  SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdUnixFirmwareFdSize);
+  SecCoreData->BootFirmwareVolumeSize = PcdGet32 (PcdUnixFirmwareFdSize);
   SecCoreData->TemporaryRamBase       = (VOID*)(UINTN)LargestRegion; 
   SecCoreData->TemporaryRamSize       = STACK_SIZE;
   SecCoreData->StackBase              = SecCoreData->TemporaryRamBase;
@@ -868,7 +868,7 @@
     // If the memory buffer could not be allocated at the FD build address
     // the Fixup is the difference.
     //
-    *FixUp = *FdBase - FixedPcdGet32 (PcdUnixFdBaseAddress);
+    *FixUp = *FdBase - PcdGet32 (PcdUnixFdBaseAddress);
   }
 
   return EFI_SUCCESS;

Modified: trunk/edk2/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
===================================================================
--- trunk/edk2/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf	2010-01-29 23:30:55 UTC (rev 9865)
+++ trunk/edk2/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf	2010-01-29 23:33:08 UTC (rev 9866)
@@ -3,7 +3,7 @@
 #
 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
 #  on the NT32 emulator.
-# Copyright (c) 2006, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -21,9 +21,6 @@
   FILE_GUID                      = f40b7864-8985-11db-af21-0040d02b1835
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = PeimInitializeUnixFwh
 
 #
@@ -32,16 +29,14 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   UnixFwh.c
 
-
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   UnixPkg/UnixPkg.dec
 
-
 [LibraryClasses]
   PeiServicesTablePointerLib
   PeiServicesLib
@@ -49,20 +44,16 @@
   PeimEntryPoint
   DebugLib
 
-
-[FixedPcd.common]
+[Pcd]
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase
-
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
 
-
 [Ppis]
   gUnixFwhPpiGuid                               # PPI ALWAYS_CONSUMED
 
-
 [Depex]
   gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9865
          http://edk2.svn.sourceforge.net/edk2/?rev=9865&view=rev
Author:   mdkinney
Date:     2010-01-29 23:30:55 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections.  These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.
 

Modified Paths:
--------------
    trunk/edk2/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
    trunk/edk2/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
    trunk/edk2/Nt32Pkg/Sec/SecMain.c
    trunk/edk2/Nt32Pkg/Sec/SecMain.inf
    trunk/edk2/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
    trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
    trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf

Modified: trunk/edk2/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
===================================================================
--- trunk/edk2/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf	2010-01-29 23:30:55 UTC (rev 9865)
@@ -3,7 +3,7 @@
 #
 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
 #  NT32 emulator.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -21,9 +21,6 @@
   FILE_GUID                      = BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = FvbInitialize
 
 #
@@ -32,18 +29,16 @@
 #  VALID_ARCHITECTURES           = IA32
 #
 
-[Sources.common]
+[Sources]
   FvbInfo.c
   FwBlockService.h
   FWBlockService.c
 
-
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   Nt32Pkg/Nt32Pkg.dec
 
-
 [LibraryClasses]
   UefiBootServicesTableLib
   MemoryAllocationLib
@@ -57,7 +52,6 @@
   UefiLib
   PcdLib
 
-
 [Guids]
   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID
 
@@ -65,23 +59,22 @@
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED
   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED
 
-[FixedPcd.common]
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize
-
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
+[FixedPcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
 
-[Pcd.common]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
 
-[depex]
+[Depex]
   TRUE
   

Modified: trunk/edk2/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
===================================================================
--- trunk/edk2/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf	2010-01-29 23:30:55 UTC (rev 9865)
@@ -5,7 +5,7 @@
 #  All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file
 #  and parse all .uni file.
-# Copyright (c) 2006 - 2009, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -23,9 +23,6 @@
   FILE_GUID                      = 4A9B9DB8-EC62-4A92-818F-8AA0246D246E
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = MiscSubclassDriverEntryPoint
 
 #
@@ -34,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32
 #
 
-[Sources.common]
+[Sources]
   MiscBaseBoardManufacturerData.c
   MiscBaseBoardManufacturerFunction.c
   MiscBiosVendorData.c
@@ -72,7 +69,6 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
   Nt32Pkg/Nt32Pkg.dec
 
-
 [LibraryClasses]
   DevicePathLib
   UefiBootServicesTableLib
@@ -89,11 +85,9 @@
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED
 
-[FixedPcd.common]
+[Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
-
-[Pcd.common]
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
 

Modified: trunk/edk2/Nt32Pkg/Sec/SecMain.c
===================================================================
--- trunk/edk2/Nt32Pkg/Sec/SecMain.c	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/Sec/SecMain.c	2010-01-29 23:30:55 UTC (rev 9865)
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2010, 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
@@ -168,8 +168,8 @@
   CHAR16                *FirmwareVolumesStr;
   UINTN                 *StackPointer;
 
-  MemorySizeStr      = (CHAR16 *) FixedPcdGetPtr (PcdWinNtMemorySizeForSecMain);
-  FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdWinNtFirmwareVolume);
+  MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdWinNtMemorySizeForSecMain);
+  FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdWinNtFirmwareVolume);
 
   SecPrint ("\nEDK II SEC Main NT Emulation Environment from http://www.TianoCore.org\n");
 
@@ -201,7 +201,7 @@
   //
   // Setup Boot Mode. If BootModeStr == "" then BootMode = 0 (BOOT_WITH_FULL_CONFIGURATION)
   //
-  SecPrint ("  BootMode 0x%02x\n", FixedPcdGet32 (PcdWinNtBootMode));
+  SecPrint ("  BootMode 0x%02x\n", PcdGet32 (PcdWinNtBootMode));
 
   //
   //  Allocate 128K memory to emulate temp memory for PEI.
@@ -606,7 +606,7 @@
   SecCoreData                        = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;
   SecCoreData->DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);
   SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;
-  SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdWinNtFirmwareFdSize);
+  SecCoreData->BootFirmwareVolumeSize = PcdGet32(PcdWinNtFirmwareFdSize);
   SecCoreData->TemporaryRamBase       = (VOID*)(UINTN)LargestRegion; 
   SecCoreData->TemporaryRamSize       = STACK_SIZE;
   SecCoreData->StackBase              = SecCoreData->TemporaryRamBase;

Modified: trunk/edk2/Nt32Pkg/Sec/SecMain.inf
===================================================================
--- trunk/edk2/Nt32Pkg/Sec/SecMain.inf	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/Sec/SecMain.inf	2010-01-29 23:30:55 UTC (rev 9865)
@@ -3,7 +3,7 @@
 #
 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.
 #
-#  Copyright (c) 2007, Intel Corporation
+#  Copyright (c) 2007 - 2010, 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
@@ -19,8 +19,6 @@
   FILE_GUID                      = 4b837b03-6587-4d19-b82b-edfad836c0a0
   MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
 
 #
 # The following information is for reference only and not required by the build tools.
@@ -28,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32
 #
 
-[Sources.common]
+[Sources]
   SecMain.h
   WinNtThunk.c
   FwVol.c
@@ -50,7 +48,6 @@
   PeCoffLib
   ReportStatusCodeLib
 
-
 [Ppis]
   gNtPeiLoadFilePpiGuid                         # PPI ALWAYS_PRODUCED
   gEfiPeiStatusCodePpiGuid                      # PPI ALWAYS_PRODUCED
@@ -59,8 +56,7 @@
   gPeiNtThunkPpiGuid                            # PPI ALWAYS_PRODUCED
   gEfiTemporaryRamSupportPpiGuid
 
-
-[FixedPcd.common]
+[Pcd]
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain

Modified: trunk/edk2/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
===================================================================
--- trunk/edk2/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf	2010-01-29 23:30:55 UTC (rev 9865)
@@ -3,7 +3,7 @@
 #
 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
 #  on the NT32 emulator.
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -21,9 +21,6 @@
   FILE_GUID                      = F0384FFD-8633-452f-9010-F6B7D2EAE2F1
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = PeimInitializeWinNtFwh
 
 #
@@ -32,10 +29,9 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-[Sources.common]
+[Sources]
   WinntFwh.c
 
-
 [Packages]
   Nt32Pkg/Nt32Pkg.dec
   MdePkg/MdePkg.dec
@@ -50,18 +46,16 @@
 [Ppis]
   gNtFwhPpiGuid                                 # PPI ALWAYS_CONSUMED
 
-
-[FixedPcd.common]
+[Pcd]
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase
-
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
 
-[depex]
+[Depex]
   gNtFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid
\ No newline at end of file

Modified: trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
===================================================================
--- trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c	2010-01-29 23:30:55 UTC (rev 9865)
@@ -1,6 +1,6 @@
 /**@file
 
-Copyright (c) 2006 - 2009, Intel Corporation
+Copyright (c) 2006 - 2010, 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
@@ -801,7 +801,7 @@
   //   we must set the default values if a null argument is passed in.
   //
   if (BaudRate == 0) {
-    BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);
+    BaudRate = PcdGet64 (PcdUartDefaultBaudRate);
   }
 
   if (ReceiveFifoDepth == 0) {
@@ -813,15 +813,15 @@
   }
 
   if (Parity == DefaultParity) {
-    Parity = (EFI_PARITY_TYPE) (FixedPcdGet8 (PcdUartDefaultParity));
+    Parity = (EFI_PARITY_TYPE) (PcdGet8 (PcdUartDefaultParity));
   }
 
   if (DataBits == 0) {
-    DataBits = FixedPcdGet8 (PcdUartDefaultDataBits);
+    DataBits = PcdGet8 (PcdUartDefaultDataBits);
   }
 
   if (StopBits == DefaultStopBits) {
-    StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits);
+    StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);
   }
 
   //

Modified: trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
===================================================================
--- trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf	2010-01-29 21:49:26 UTC (rev 9864)
+++ trunk/edk2/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf	2010-01-29 23:30:55 UTC (rev 9865)
@@ -3,7 +3,7 @@
 #
 # Our DriverBinding member functions operate on the handles
 #  created by the NT Bus drive
-# Copyright (c) 2006 - 2007, Intel Corporation
+# Copyright (c) 2006 - 2010, 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
@@ -21,9 +21,6 @@
   FILE_GUID                      = 6B41B553-A649-11d4-BD02-0080C73C8881
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
-
   ENTRY_POINT                    = InitializeWinNtSerialIo
 
 #
@@ -35,17 +32,15 @@
 #  COMPONENT_NAME                =  gWinNtSerialIoComponentName                  
 #
 
-[Sources.common]
+[Sources]
   ComponentName.c
   WinNtSerialIo.c
   WinNtSerialIo.h
 
-
 [Packages]
   MdePkg/MdePkg.dec
   Nt32Pkg/Nt32Pkg.dec
 
-
 [LibraryClasses]
   MemoryAllocationLib
   DevicePathLib
@@ -56,17 +51,15 @@
   BaseLib
   DebugLib
 
-
 [Guids]
   gEfiWinNtSerialPortGuid                       # ALWAYS_CONSUMED
 
-
 [Protocols]
   gEfiSerialIoProtocolGuid                      # PROTOCOL BY_START
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
   gEfiWinNtIoProtocolGuid                       # PROTOCOL TO_START
 
-[FixedPcd.common]
+[Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.