Enable PlatformBdsDxe

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3008 6f19259b-4bc3-4df7-8a09-765794883524

8 files changed, 25 insertions, 18 deletions

diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
index 270eea1831..0c84833fd8 100644
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@@ -66,7 +66,7 @@ Returns:
                           );

   ASSERT (gST->FirmwareVendor != NULL);

 

-  gST->FirmwareRevision = EFI_FIRMWARE_REVISION;

+  gST->FirmwareRevision = FIRMWARE_REVISION;

 

   //

   // Fixup Tasble CRC after we updated Firmware Vendor and Revision

diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
index 2234acd860..d44bd37553 100644
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@@ -20,6 +20,7 @@
 // The package level header files this module uses

 //

 #include <PiDxe.h>

+

 //

 // The protocols, PPI and GUID defintions for this module

 //

@@ -46,6 +47,11 @@
 #include <Guid/FlashMapHob.h>

 #include <Protocol/SerialIo.h>

 #include <Protocol/LegacyBios.h>

+#include <Common/MaxBbsEntries.h>

+#include <Guid/PcAnsi.h>

+#include <Guid/DataHubRecords.h>

+#include <Protocol/Performance.h>

+

 //

 // The Library classes this module consumes

 //

@@ -69,4 +75,11 @@
 #include <Library/HiiLibFramework.h>

 #include <Library/PeCoffLib.h>

 

+//

+// The rest of the includes

+//

+#include <Common/FirmwareRevision.h>

+

+extern UINT8 PlatformBdsStrings[];

+

 #endif

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
index 9be0875b30..a3d8069136 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
@@ -35,7 +35,6 @@ EFI_GUID                          gBmGuid = BOOT_MANAGER_GUID;
 

 extern EFI_FORM_BROWSER_PROTOCOL  *gBrowser;

 extern UINT8                      BootManagerVfrBin[];

-extern UINT8                      BdsStrings[];

 extern BOOLEAN                    gConnectAllHappened;

 

 EFI_STATUS

@@ -173,7 +172,7 @@ Returns:
   //

   // Post our VFR to the HII database

   //

-  PackageList = PreparePackages (2, &BmGuid, BootManagerVfrBin, BdsStrings);

+  PackageList = PreparePackages (2, &BmGuid, BootManagerVfrBin, PlatformBdsStrings);

   Status      = Hii->NewPack (Hii, PackageList, &gBootManagerHandle);

   FreePool (PackageList);

 

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
index 696eb9efad..921c5a2ea5 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
@@ -48,10 +48,10 @@ BdsLockFv (
 

   BaseAddress = FlashEntry->Base - 0x400000 + 2;

   FvHeader    = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) (FlashEntry->Base));

-  BlockMap    = &(FvHeader->FvBlockMap[0]);

+  BlockMap    = &(FvHeader->BlockMap[0]);

 

-  while ((BlockMap->NumBlocks != 0) && (BlockMap->BlockLength != 0)) {

-    BlockLength = BlockMap->BlockLength;

+  while ((BlockMap->NumBlocks != 0) && (BlockMap->Length != 0)) {

+    BlockLength = BlockMap->Length;

     for (Index = 0; Index < BlockMap->NumBlocks; Index++) {

       CpuIo->Mem.Read (

                   CpuIo,

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
index 4176ccc3a1..ef72e79309 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
@@ -22,7 +22,6 @@ Abstract:
 // Include common header file for this module.

 //

 #include "CommonHeader.h"

-

 #include "DeviceManager.h"

 

 STATIC UINT16                     mTokenCount;

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index 8d68f4c0b3..dc4ed3b6ea 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -27,12 +27,11 @@ Revision History
 #include "CommonHeader.h"

 

 #include "Bds.h"

-#include "String.h"

+#include "BdsString.h"

 #include "Language.h"

 

-extern UINT8  BdsStrings[];

-

 EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };

+extern        UINT8 PlatformBdsStrings[];

 

 EFI_STATUS

 InitializeStringSupport (

@@ -63,7 +62,7 @@ Returns:
                   &Hii

                   );

   if (!EFI_ERROR (Status)) {

-    PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);

+    PackageList = PreparePackages (1, &gBdsStringPackGuid, PlatformBdsStrings);

     Status      = Hii->NewPack (Hii, PackageList, &gStringPackHandle);

     FreePool (PackageList);

   }

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.h b/Nt32Pkg/PlatformBdsDxe/Generic/String.h
index 5067d492c2..83928b0cb8 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.h
@@ -21,13 +21,8 @@ Revision History
 

 --*/

 

-#ifndef _STRING_H_

-#define _STRING_H_

-

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#ifndef _PLATFORMBDS_STRING_H_

+#define _PLATFORMBDS_STRING_H_

 

 //

 // String Definition Guid for BDS Platform

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformData.c b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
index f2b84233a0..68818ef34b 100644
--- a/Nt32Pkg/PlatformBdsDxe/PlatformData.c
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
@@ -27,6 +27,8 @@ Abstract:
 

 #include "Generic/Bds.h"

 #include "BdsPlatform.h"

+#include <Protocol/WinNtThunk.h>

+#include <Protocol/WinNtIo.h>

 

 //

 // Predefined platform default time out value