From f6203b71926848e7b197ee99a3a86a487d7b334a Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 24 Sep 2007 07:59:36 +0000 Subject: [PATCH] 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 --- MdePkg/Include/Protocol/ManagedNetwork.h | 58 ++++++++++++------------ MdePkg/MdePkg.dec | 6 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/MdePkg/Include/Protocol/ManagedNetwork.h index 040c363dc8..92a41dd183 100644 --- 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. EFI_MANAGED_NETWORK_PROTOCOL as defined in UEFI 2.0. - 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 + 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. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -25,7 +25,7 @@ #define EFI_MANAGED_NETWORK_PROTOCOL_GUID \ { \ - 0x3b95aa31, 0x3793, 0x434b, {0x86, 0x67, 0xc8, 0x7, 0x8, 0x92, 0xe0, 0x5e } \ + 0x7ab33a91, 0xace5, 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 } \ } typedef struct _EFI_MANAGED_NETWORK_PROTOCOL EFI_MANAGED_NETWORK_PROTOCOL; @@ -105,9 +105,9 @@ EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_GET_MODE_DATA) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL, - OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL + OUT EFI_SIMPLE_NETWORK_MODE *SnpModeData OPTIONAL ) -; +; /** Sets or clears the operational parameters for the MNP child driver. @@ -132,10 +132,10 @@ typedef EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_CONFIGURE) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, - IN EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL + IN EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData OPTIONAL ) -; - +; + /** Translates an IP multicast address to a hardware (MAC) multicast address. @@ -163,9 +163,9 @@ EFI_STATUS IN EFI_MANAGED_NETWORK_PROTOCOL *This, IN BOOLEAN Ipv6Flag, IN EFI_IP_ADDRESS *IpAddress, - OUT EFI_MAC_ADDRESS *MacAddress + OUT EFI_MAC_ADDRESS *MacAddress ) -; +; /** Enables and disables receive filters for multicast address. @@ -183,7 +183,7 @@ EFI_STATUS @retval EFI_NOT_STARTED This MNP child driver instance has not been configured. @retval EFI_ALREADY_STARTED The supplied multicast group is already joined. @retval EFI_NOT_FOUND The supplied multicast group is not joined. - @retval EFI_DEVICE_ERROR An unexpected network or system error occurred. + @retval EFI_DEVICE_ERROR An unexpected network or system error occurred. @retval EFI_UNSUPPORTED The requested feature is unsupported in this MNP implementation. @retval Other The requested operation could not be completed. @@ -193,10 +193,10 @@ EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_GROUPS) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, IN BOOLEAN JoinFlag, - IN EFI_MAC_ADDRESS *MacAddress OPTIONAL + IN EFI_MAC_ADDRESS *MacAddress OPTIONAL ) -; - +; + /** Places asynchronous outgoing data packets into the transmit queue. @@ -217,10 +217,10 @@ typedef EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_TRANSMIT) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, - IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token + IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token ) -; - +; + /** Places an asynchronous receiving request into the receiving queue. @@ -244,10 +244,10 @@ typedef EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_RECEIVE) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, - IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token + IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token ) -; - +; + /** Aborts an asynchronous transmit or receive request. @@ -272,9 +272,9 @@ typedef EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_CANCEL) ( IN EFI_MANAGED_NETWORK_PROTOCOL *This, - IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token OPTIONAL + IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN *Token OPTIONAL ) -; +; /** Polls for incoming data packets and processes outgoing data packets. @@ -293,9 +293,9 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_MANAGED_NETWORK_POLL) ( - IN EFI_MANAGED_NETWORK_PROTOCOL *This + IN EFI_MANAGED_NETWORK_PROTOCOL *This ) -; +; struct _EFI_MANAGED_NETWORK_PROTOCOL { EFI_MANAGED_NETWORK_GET_MODE_DATA GetModeData; diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 1e7294e6cc..a932af45a8 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -83,7 +83,7 @@ BaseLib|Include/Library/BaseLib.h BasePeCoffLib|Include/Library/PeCoffLib.h GraphicsLib|Include/Library/GraphicsLib.h - + [LibraryClasses.IPF] SalLib|Include/Library/SalLib.h PalCallLib|Include/Library/PalCallLib.h @@ -232,7 +232,7 @@ gEfiDiskIoProtocolGuid = { 0xCE345171, 0xBA0B, 0x11D2, { 0x8E, 0x4F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }} gEfiBlockIoProtocolGuid = { 0x964E5B21, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }} gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} - + # BugBug: New GUID would be defined in errata of UEFI2.1. gEfiUnicodeCollation2ProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiPciRootBridgeIoProtocolGuid = { 0x2F707EBB, 0x4A1A, 0x11D4, { 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} @@ -253,7 +253,7 @@ gEfiPxeBaseCodeProtocolGuid = { 0x03C4E603, 0xAC28, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiBisProtocolGuid = { 0x0B64AAB0, 0x5429, 0x11D4, { 0x98, 0x16, 0x00, 0xA0, 0xC9, 0x1F, 0xAD, 0xCF }} gEfiManagedNetworkServiceBindingProtocolGuid = { 0xF36FF770, 0xA7E1, 0x42CF, { 0x9E, 0xD2, 0x56, 0xF0, 0xF2, 0x71, 0xF4, 0x4C }} - gEfiManagedNetworkProtocolGuid = { 0x3B95AA31, 0x3793, 0x434B, { 0x86, 0x67, 0xC8, 0x07, 0x08, 0x92, 0xE0, 0x5E }} + gEfiManagedNetworkProtocolGuid = { 0x7ab33a91, 0xace5, 0x4326, { 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }} gEfiArpServiceBindingProtocolGuid = { 0xF44C00EE, 0x1F2C, 0x4A00, { 0xAA, 0x09, 0x1C, 0x9F, 0x3E, 0x08, 0x00, 0xA3 }} gEfiArpProtocolGuid = { 0xF4B427BB, 0xBA21, 0x4F16, { 0xBC, 0x4E, 0x43, 0xE4, 0x16, 0xAB, 0x61, 0x9C }} gEfiDhcp4ServiceBindingProtocolGuid = { 0x9D9A39D8, 0xBD42, 0x4A73, { 0xA4, 0xD5, 0x8E, 0xE9, 0x4B, 0xE1, 0x13, 0x80 }} -- 2.39.2