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

1 files changed, 89 insertions, 89 deletions

diff --git a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
index 6117a3245e..8aff74d64e 100644
--- a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
+++ b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
@@ -1,43 +1,43 @@
-/*++
-
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
-are licensed and made available under the terms and conditions of the BSD License         
-which accompanies this distribution.  The full text of the license may be found at        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
-
-Module Name:
-
-  DevicePathDriver.c
-
-Abstract:
-
-  Device Path Driver to produce DevPathUtilities Protocol, DevPathFromText Protocol
-  and DevPathToText Protocol.
-
---*/
-
-#include "DevicePath.h"
-
-EFI_HANDLE  mDevicePathHandle = NULL;
-
+/*++

+

+Copyright (c) 2006, Intel Corporation                                                         

+All rights reserved. This program and the accompanying materials                          

+are licensed and made available under the terms and conditions of the BSD License         

+which accompanies this distribution.  The full text of the license may be found at        

+http://opensource.org/licenses/bsd-license.php                                            

+                                                                                          

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Module Name:

+

+  DevicePathDriver.c

+

+Abstract:

+

+  Device Path Driver to produce DevPathUtilities Protocol, DevPathFromText Protocol

+  and DevPathToText Protocol.

+

+--*/

+

+#include "DevicePath.h"

+

+EFI_HANDLE  mDevicePathHandle = NULL;

+

 GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DEVICE_PATH_UTILITIES_PROTOCOL mDevicePathUtilities = {

-  GetDevicePathSizeProtocolInterface,
-  DuplicateDevicePathProtocolInterface,
-  AppendDevicePathProtocolInterface,
-  AppendDeviceNodeProtocolInterface,
-  AppendDevicePathInstanceProtocolInterface,
-  GetNextDevicePathInstanceProtocolInterface,
-  IsDevicePathMultiInstanceProtocolInterface,
-  CreateDeviceNodeProtocolInterface
+  GetDevicePathSizeProtocolInterface,

+  DuplicateDevicePathProtocolInterface,

+  AppendDevicePathProtocolInterface,

+  AppendDeviceNodeProtocolInterface,

+  AppendDevicePathInstanceProtocolInterface,

+  GetNextDevicePathInstanceProtocolInterface,

+  IsDevicePathMultiInstanceProtocolInterface,

+  CreateDeviceNodeProtocolInterface

 };

 

 GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DEVICE_PATH_TO_TEXT_PROTOCOL   mDevicePathToText = {

-  ConvertDeviceNodeToText,
-  ConvertDevicePathToText
+  ConvertDeviceNodeToText,

+  ConvertDevicePathToText

 };

 

 GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePathFromText = {

@@ -45,65 +45,65 @@ GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePa
   ConvertTextToDevicePath  

 };

 

-GLOBAL_REMOVE_IF_UNREFERENCED const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
-GLOBAL_REMOVE_IF_UNREFERENCED const EFI_GUID mEfiDevicePathMessagingSASGuid             = DEVICE_PATH_MESSAGING_SAS;
-
-EFI_STATUS
-EFIAPI
-DevicePathEntryPoint (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
-  )
-/*++
-
-  Routine Description:
-    Entry point for EFI drivers.
-
-  Arguments:
-   ImageHandle - EFI_HANDLE
-   SystemTable - EFI_SYSTEM_TABLE
-
-  Returns:
-    EFI_SUCCESS
-    others
-
---*/
-{
-  EFI_STATUS  Status;
- 
-  Status = EFI_UNSUPPORTED;
+GLOBAL_REMOVE_IF_UNREFERENCED const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;

+GLOBAL_REMOVE_IF_UNREFERENCED const EFI_GUID mEfiDevicePathMessagingSASGuid             = DEVICE_PATH_MESSAGING_SAS;

+

+EFI_STATUS

+EFIAPI

+DevicePathEntryPoint (

+  IN EFI_HANDLE           ImageHandle,

+  IN EFI_SYSTEM_TABLE     *SystemTable

+  )

+/*++

+

+  Routine Description:

+    Entry point for EFI drivers.

+

+  Arguments:

+   ImageHandle - EFI_HANDLE

+   SystemTable - EFI_SYSTEM_TABLE

+

+  Returns:

+    EFI_SUCCESS

+    others

+

+--*/

+{

+  EFI_STATUS  Status;

+ 

+  Status = EFI_UNSUPPORTED;

   if (FeaturePcdGet (PcdDevicePathSupportDevicePathToText)) {

     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {

-      Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
-                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,
-                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,
-                      NULL
-                      );
+      Status = gBS->InstallMultipleProtocolInterfaces (

+                      &mDevicePathHandle,

+                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,

+                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,

+                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,

+                      NULL

+                      );

     } else {

-      Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
-                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,
-                      NULL
-                      );
+      Status = gBS->InstallMultipleProtocolInterfaces (

+                      &mDevicePathHandle,

+                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,

+                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,

+                      NULL

+                      );

     }

   } else {

     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {

-      Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
-                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,
-                      NULL
-                      );
+      Status = gBS->InstallMultipleProtocolInterfaces (

+                      &mDevicePathHandle,

+                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,

+                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,

+                      NULL

+                      );

     } else {

-      Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
-                      NULL
-                      );
+      Status = gBS->InstallMultipleProtocolInterfaces (

+                      &mDevicePathHandle,

+                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,

+                      NULL

+                      );

     }

   }

-  return Status;
-}
+  return Status;

+}