removed gEfiWinNtCPUSpeedGuid, gEfiWinNtCPUModelGuid, and gEfiWinNtMemoryGuid. Replaced them with the PCD values they represent. There was no need to use the driver model, when you could get PCD value directly. Also removed local copies of Atoi() in several modules. Fixed bug in reporting of memory size.

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

1 files changed, 2 insertions, 48 deletions

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
index 3f32d2028..b294d5bda 100644
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
@@ -284,10 +284,10 @@ Returns:
       WriteProtected  = (BOOLEAN) (*Str == 'O');

       Str             = GetNextElementPastTerminator (Str, ';');

 

-      NumberOfBlocks  = Atoi (Str);

+      NumberOfBlocks  = StrDecimalToUintn (Str);

       if (NumberOfBlocks != 0) {

         Str       = GetNextElementPastTerminator (Str, ';');

-        BlockSize = Atoi (Str);

+        BlockSize = StrDecimalToUintn (Str);

         if (BlockSize != 0) {

           //

           // If we get here the variable is valid so do the work.

@@ -1063,52 +1063,6 @@ WinNtBlockIoResetBlock (
   return EFI_SUCCESS;

 }

 

-UINTN

-Atoi (

-  CHAR16  *String

-  )

-/*++

-

-Routine Description:

-

-  Convert a unicode string to a UINTN

-

-Arguments:

-

-  String - Unicode string.

-

-Returns:

-

-  UINTN of the number represented by String.

-

---*/

-{

-  UINTN   Number;

-  CHAR16  *Str;

-

-  //

-  // skip preceeding white space

-  //

-  Str = String;

-  while ((*Str) && (*Str == ' ')) {

-    Str++;

-  }

-  //

-  // Convert ot a Number

-  //

-  Number = 0;

-  while (*Str != '\0') {

-    if ((*Str >= '0') && (*Str <= '9')) {

-      Number = (Number * 10) +*Str - '0';

-    } else {

-      break;

-    }

-

-    Str++;

-  }

-

-  return Number;

-}

 

 EFI_STATUS

 SetFilePointer64 (