Updated EFI_MANAGED_NETWORK_PROTOCOL_GUID value according to UEFI 2.1b.

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

diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/MdePkg/Include/Protocol/ManagedNetwork.h
index 040c363dc8d1a40b5f54b6b2518e2cc347321432..92a41dd1835272fa0034780cccec39a5390fc0db 100644 (file)
--- a/MdePkg/Include/Protocol/ManagedNetwork.h
+++ b/MdePkg/Include/Protocol/ManagedNetwork.h
@@ -2,14 +2,14 @@
   EFI_MANAGED_NETWORK_SERVICE_BINDING_PROTOCOL as defined in UEFI 2.0.\r
   EFI_MANAGED_NETWORK_PROTOCOL as defined in UEFI 2.0.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
-  All rights reserved. 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
+  Copyright (c) 2006, Intel Corporation\r
+  All rights reserved. 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
 \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -25,7 +25,7 @@
 \r
 #define EFI_MANAGED_NETWORK_PROTOCOL_GUID \\r
   { \\r
-    0x3b95aa31, 0x3793, 0x434b, {0x86, 0x67, 0xc8, 0x7, 0x8, 0x92, 0xe0, 0x5e } \\r
+    0x7ab33a91, 0xace5, 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 } \\r
   }\r
 \r
 typedef struct _EFI_MANAGED_NETWORK_PROTOCOL EFI_MANAGED_NETWORK_PROTOCOL;\r
@@ -105,9 +105,9 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_GET_MODE_DATA) (\r
   IN  EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL \r
+  OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   )\r
-;  \r
+;\r
 \r
 /**\r
   Sets or clears the operational parameters for the MNP child driver.\r
@@ -132,10 +132,10 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_CONFIGURE) (\r
   IN EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
-  IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL \r
+  IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL\r
   )\r
-;    \r
-    \r
+;\r
+\r
 /**\r
   Translates an IP multicast address to a hardware (MAC) multicast address.\r
 \r
@@ -163,9 +163,9 @@ EFI_STATUS
   IN  EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
   IN  BOOLEAN                       Ipv6Flag,\r
   IN  EFI_IP_ADDRESS                *IpAddress,\r
-  OUT EFI_MAC_ADDRESS               *MacAddress \r
+  OUT EFI_MAC_ADDRESS               *MacAddress\r
   )\r
-;      \r
+;\r
 \r
 /**\r
   Enables and disables receive filters for multicast address.\r
@@ -183,7 +183,7 @@ EFI_STATUS
   @retval EFI_NOT_STARTED       This MNP child driver instance has not been configured.\r
   @retval EFI_ALREADY_STARTED   The supplied multicast group is already joined.\r
   @retval EFI_NOT_FOUND         The supplied multicast group is not joined.\r
-  @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.  \r
+  @retval EFI_DEVICE_ERROR      An unexpected network or system error occurred.\r
   @retval EFI_UNSUPPORTED       The requested feature is unsupported in this MNP implementation.\r
   @retval Other                 The requested operation could not be completed.\r
 \r
@@ -193,10 +193,10 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_GROUPS) (\r
   IN EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
   IN BOOLEAN                       JoinFlag,\r
-  IN EFI_MAC_ADDRESS               *MacAddress  OPTIONAL \r
+  IN EFI_MAC_ADDRESS               *MacAddress  OPTIONAL\r
   )\r
-;      \r
-  \r
+;\r
+\r
 /**\r
   Places asynchronous outgoing data packets into the transmit queue.\r
 \r
@@ -217,10 +217,10 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_TRANSMIT) (\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token \r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
-;      \r
-    \r
+;\r
+\r
 /**\r
   Places an asynchronous receiving request into the receiving queue.\r
 \r
@@ -244,10 +244,10 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_RECEIVE) (\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token \r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
   )\r
-;      \r
-   \r
+;\r
+\r
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r
@@ -272,9 +272,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_CANCEL) (\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
-  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token  OPTIONAL \r
+  IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token  OPTIONAL\r
   )\r
-;   \r
+;\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
@@ -293,9 +293,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_POLL) (\r
-  IN EFI_MANAGED_NETWORK_PROTOCOL    *This \r
+  IN EFI_MANAGED_NETWORK_PROTOCOL    *This\r
   )\r
-;     \r
+;\r
 \r
 struct _EFI_MANAGED_NETWORK_PROTOCOL {\r
   EFI_MANAGED_NETWORK_GET_MODE_DATA       GetModeData;\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 1e7294e6cc8cbadb3ef230bdeb908a28710a84ce..a932af45a8fffbbb51869e609d0bf72a09f9e2d0 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -83,7 +83,7 @@
   BaseLib|Include/Library/BaseLib.h\r
   BasePeCoffLib|Include/Library/PeCoffLib.h\r
   GraphicsLib|Include/Library/GraphicsLib.h\r
-  \r
+\r
 [LibraryClasses.IPF]\r
   SalLib|Include/Library/SalLib.h\r
   PalCallLib|Include/Library/PalCallLib.h\r
@@ -232,7 +232,7 @@
   gEfiDiskIoProtocolGuid         = { 0xCE345171, 0xBA0B, 0x11D2, { 0x8E, 0x4F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
   gEfiBlockIoProtocolGuid        = { 0x964E5B21, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
   gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
-  \r
+\r
   # BugBug: New GUID would be defined in errata of UEFI2.1.\r
   gEfiUnicodeCollation2ProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiPciRootBridgeIoProtocolGuid = { 0x2F707EBB, 0x4A1A, 0x11D4, { 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
@@ -253,7 +253,7 @@
   gEfiPxeBaseCodeProtocolGuid    = { 0x03C4E603, 0xAC28, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiBisProtocolGuid            = { 0x0B64AAB0, 0x5429, 0x11D4, { 0x98, 0x16, 0x00, 0xA0, 0xC9, 0x1F, 0xAD, 0xCF }}\r
   gEfiManagedNetworkServiceBindingProtocolGuid = { 0xF36FF770, 0xA7E1, 0x42CF, { 0x9E, 0xD2, 0x56, 0xF0, 0xF2, 0x71, 0xF4, 0x4C }}\r
-  gEfiManagedNetworkProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B, { 0x86, 0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E }}\r
+  gEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5, 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }}\r
   gEfiArpServiceBindingProtocolGuid = { 0xF44C00EE, 0x1F2C, 0x4A00, { 0xAA, 0x09, 0x1C, 0x9F, 0x3E, 0x08, 0x00, 0xA3 }}\r
   gEfiArpProtocolGuid            = { 0xF4B427BB, 0xBA21, 0x4F16, { 0xBC, 0x4E, 0x43, 0xE4, 0x16, 0xAB, 0x61, 0x9C }}\r
   gEfiDhcp4ServiceBindingProtocolGuid = { 0x9D9A39D8, 0xBD42, 0x4A73, { 0xA4, 0xD5, 0x8E, 0xE9, 0x4B, 0xE1, 0x13, 0x80 }}\r