MdeModulePkg/BdsDxe: Avoid overwriting PlatformRecovery####

[mirror_edk2.git] / MdeModulePkg / Universal / DebugPortDxe / DebugPort.h

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 852cae94815ac7afe88b73983f5927c0eca27147..3ce702dfa46b5a1588cffbd2b2d7a717dd10cdbf 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -1,8 +1,8 @@
 /** @file\r
   Definitions and prototypes for DebugPort driver.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -43,7 +43,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2;
 //\r
 // local type definitions\r
 //\r
-#define DEBUGPORT_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('D', 'B', 'G', 'P')\r
+#define DEBUGPORT_DEVICE_SIGNATURE  SIGNATURE_32 ('D', 'B', 'G', 'P')\r
 \r
 //\r
 // Device structure used by driver\r
@@ -52,10 +52,7 @@ typedef struct {
   UINT32                      Signature;\r
   EFI_HANDLE                  DriverBindingHandle;\r
   EFI_HANDLE                  DebugPortDeviceHandle;\r
-  VOID                        *DebugPortVariable;\r
 \r
-  EFI_DRIVER_BINDING_PROTOCOL DriverBindingInterface;\r
-  EFI_COMPONENT_NAME_PROTOCOL ComponentNameInterface;\r
   EFI_DEVICE_PATH_PROTOCOL    *DebugPortDevicePath;\r
   EFI_DEBUGPORT_PROTOCOL      DebugPortInterface;\r
 \r
@@ -77,7 +74,7 @@ typedef struct {
 #define DEBUGPORT_UART_DEFAULT_BAUDRATE   115200\r
 #define DEBUGPORT_UART_DEFAULT_PARITY     0\r
 #define DEBUGPORT_UART_DEFAULT_FIFO_DEPTH 16\r
-#define DEBUGPORT_UART_DEFAULT_TIMEOUT    50000 // 5 ms\r
+#define DEBUGPORT_UART_DEFAULT_TIMEOUT    50000 ///< 5 ms\r
 #define DEBUGPORT_UART_DEFAULT_DATA_BITS  8\r
 #define DEBUGPORT_UART_DEFAULT_STOP_BITS  1\r
 \r
@@ -85,13 +82,8 @@ typedef struct {
 \r
 #define IS_UART_DEVICEPATH(dp)           (DevicePathType (dp) == MESSAGING_DEVICE_PATH && DevicePathSubType (dp) == MSG_UART_DP)\r
 \r
-//\r
-// globals\r
-//\r
-extern DEBUGPORT_DEVICE  *gDebugPortDevice;\r
-\r
 /**\r
-  Debug Port Driver entry pointo. \r
+  Debug Port Driver entry point. \r
 \r
   Reads DebugPort variable to determine what device and settings to use as the\r
   debug port.  Binds exclusively to SerialIo. Reverts to defaults if no variable\r
@@ -209,7 +201,7 @@ DebugPortStop (
                                 languages specified in SupportedLanguages. The\r
                                 number of languages supported by a driver is up\r
                                 to the driver writer. Language is specified\r
-                                in RFC 3066 or ISO 639-2 language code format.\r
+                                in RFC 4646 or ISO 639-2 language code format.\r
 \r
   @param  DriverName[out]       A pointer to the Unicode string to return.\r
                                 This Unicode string is the name of the\r
@@ -274,7 +266,7 @@ DebugPortComponentNameGetDriverName (
                                 languages specified in SupportedLanguages. The\r
                                 number of languages supported by a driver is up\r
                                 to the driver writer. Language is specified in\r
-                                RFC 3066 or ISO 639-2 language code format.\r
+                                RFC 4646 or ISO 639-2 language code format.\r
 \r
   @param  ControllerName[out]   A pointer to the Unicode string to return.\r
                                 This Unicode string is the name of the\r
@@ -288,7 +280,7 @@ DebugPortComponentNameGetDriverName (
                                 driver specified by This was returned in\r
                                 DriverName.\r
 \r
-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.\r
+  @retval EFI_INVALID_PARAMETER ControllerHandle is NULL.\r
 \r
   @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid\r
                                 EFI_HANDLE.\r