1. Add the fix for the following Bugs:

i)	BMM_FAKE_NV_DATA definition inconsistent in bm.vfr and BootMain.h
        (EdkNt32Pkg\Dxe\PlatformBdsDxe\Generic\BootMaint\BootMain.h)
ii)	Change some files’ EOL(end of line) format to DOS. Some file use even mixed style EOL.
   (EdkModulePkg\Universal\DevicePath\Dxe\DevicePath.c, DevicepathFromText.c, DevicePathUtilities.c;
EdkModulePkg\Universal\Disk\DiskIo\Dxe\diskIo.c; MdePkg\Library\UefiLib\UefiNotTiano.c)
iii)    Change some illegal characters in many files, the problem is mainly connected with people using Chinese Input method to input symbols such as ' " - ?, etc. Multiple files are influenced.

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

7 files changed, 7 insertions, 7 deletions

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 8932af7083..6f50340bd7 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
@@ -97,7 +97,7 @@ CompareGuid (
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

   If Length is not aligned on a 128-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer  Pointer to the target buffer to scan.

   @param  Length  Number of bytes in Buffer to scan.

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index 29170594d3..95f134bbda 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
@@ -36,7 +36,7 @@
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().

   If Length is not aligned on a 16-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index b54d5da07c..6a3dcd7ad2 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
@@ -36,7 +36,7 @@
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

   If Length is not aligned on a 32-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index 7bfc7d721e..b355fe647c 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -36,7 +36,7 @@
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

   If Length is not aligned on a 64-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 0f7289d3df..2b21b22166 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
@@ -34,7 +34,7 @@
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,

   then NULL is returned.  If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index c73168841b..e74ce8d65b 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -29,7 +29,7 @@
   Fills a target buffer with a byte value, and returns the target buffer.

 

   This function fills Length bytes of Buffer with Value, and returns Buffer.

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  Buffer    Memory to set.

   @param  Length    Number of bytes to set.

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index e2ffb5c3c2..90e607c0ce 100644
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -30,7 +30,7 @@
 

   This function fills Length bytes of Buffer with zeros, and returns Buffer.

   If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT().

+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT().

 

   @param  Buffer      Pointer to the target buffer to fill with zeros.

   @param  Length      Number of bytes in Buffer to fill with zeros.