X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FLibrary%2FDxeNetLib%2FDxeNetLib.c;h=bb0ac06851ffd81ab68b12d38eaf11e4cce42ab0;hp=f65489e7ed71b4c89ebaecfa06b1c2cc07629d60;hb=f381602727922e793de5826ee390344cb907e07a;hpb=36ee91ca3661d3d020a7841aacbf858d885c4728
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index f65489e7ed..bb0ac06851 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1,6 +1,7 @@
/** @file
-
-Copyright (c) 2005 - 2007, Intel Corporation
+ Network library.
+
+Copyright (c) 2005 - 2007, 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
@@ -8,23 +9,16 @@ 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:
-
- NetLib.c
-
-Abstract:
-
-
-
**/
-#include
+#include
#include
#include
-#include
#include
+#include
+#include
+#include
#include
#include
@@ -32,16 +26,17 @@ Abstract:
#include
#include
#include
-#include
#include
-
+#include
EFI_DPC_PROTOCOL *mDpc = NULL;
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mNetLibHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+
//
// All the supported IP4 maskes in host byte order.
//
-IP4_ADDR mIp4AllMasks[IP4_MASK_NUM] = {
+IP4_ADDR gIp4AllMasks[IP4_MASK_NUM] = {
0x00000000,
0x80000000,
0xC0000000,
@@ -82,45 +77,18 @@ IP4_ADDR mIp4AllMasks[IP4_MASK_NUM] = {
EFI_IPv4_ADDRESS mZeroIp4Addr = {{0, 0, 0, 0}};
-/**
- Converts the low nibble of a byte to hex unicode character.
-
- @param Nibble lower nibble of a byte.
-
- @return Hex unicode character.
-
-**/
-CHAR16
-NibbleToHexChar (
- IN UINT8 Nibble
- )
-{
- //
- // Porting Guide:
- // This library interface is simply obsolete.
- // Include the source code to user code.
- //
-
- Nibble &= 0x0F;
- if (Nibble <= 0x9) {
- return (CHAR16)(Nibble + L'0');
- }
-
- return (CHAR16)(Nibble - 0xA + L'A');
-}
-
/**
Return the length of the mask. If the mask is invalid,
return the invalid length 33, which is IP4_MASK_NUM.
NetMask is in the host byte order.
- @param NetMask The netmask to get the length from
-
- @return The length of the netmask, IP4_MASK_NUM if the mask isn't
- @return supported.
+ @param[in] NetMask The netmask to get the length from.
+ @return The length of the netmask, IP4_MASK_NUM if the mask isn't.
+
**/
INTN
+EFIAPI
NetGetMaskLength (
IN IP4_ADDR NetMask
)
@@ -128,7 +96,7 @@ NetGetMaskLength (
INTN Index;
for (Index = 0; Index < IP4_MASK_NUM; Index++) {
- if (NetMask == mIp4AllMasks[Index]) {
+ if (NetMask == gIp4AllMasks[Index]) {
break;
}
}
@@ -142,12 +110,13 @@ NetGetMaskLength (
Return the class of the address, such as class a, b, c.
Addr is in host byte order.
- @param Addr The address to get the class from
+ @param[in] Addr The address to get the class from.
- @return IP address class, such as IP4_ADDR_CLASSA
+ @return IP address class, such as IP4_ADDR_CLASSA.
**/
INTN
+EFIAPI
NetGetIpClass (
IN IP4_ADDR Addr
)
@@ -180,13 +149,14 @@ NetGetIpClass (
the netmask. If NetMask is zero, use the IP address's class to
get the default mask.
- @param Ip The IP to check againist
- @param NetMask The mask of the IP
+ @param[in] Ip The IP to check against.
+ @param[in] NetMask The mask of the IP.
- @return TRUE if IP is a valid unicast address on the network, otherwise FALSE
+ @return TRUE if IP is a valid unicast address on the network, otherwise FALSE.
**/
BOOLEAN
+EFIAPI
Ip4IsUnicast (
IN IP4_ADDR Ip,
IN IP4_ADDR NetMask
@@ -201,7 +171,7 @@ Ip4IsUnicast (
}
if (NetMask == 0) {
- NetMask = mIp4AllMasks[Class << 3];
+ NetMask = gIp4AllMasks[Class << 3];
}
if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {
@@ -215,12 +185,11 @@ Ip4IsUnicast (
/**
Initialize a random seed using current time.
- None
-
@return The random seed initialized with current time.
**/
UINT32
+EFIAPI
NetRandomInitSeed (
VOID
)
@@ -241,19 +210,20 @@ NetRandomInitSeed (
Extract a UINT32 from a byte stream, then convert it to host
byte order. Use this function to avoid alignment error.
- @param Buf The buffer to extract the UINT32.
+ @param[in] Buf The buffer to extract the UINT32.
@return The UINT32 extracted.
**/
UINT32
+EFIAPI
NetGetUint32 (
IN UINT8 *Buf
)
{
UINT32 Value;
- NetCopyMem (&Value, Buf, sizeof (UINT32));
+ CopyMem (&Value, Buf, sizeof (UINT32));
return NTOHL (Value);
}
@@ -262,41 +232,41 @@ NetGetUint32 (
Put a UINT32 to the byte stream. Convert it from host byte order
to network byte order before putting.
- @param Buf The buffer to put the UINT32
- @param Data The data to put
-
- @return None
-
+ @param[in, out] Buf The buffer to put the UINT32.
+ @param[in] Data The data to put.
+
**/
VOID
+EFIAPI
NetPutUint32 (
- IN UINT8 *Buf,
- IN UINT32 Data
+ IN OUT UINT8 *Buf,
+ IN UINT32 Data
)
{
Data = HTONL (Data);
- NetCopyMem (Buf, &Data, sizeof (UINT32));
+ CopyMem (Buf, &Data, sizeof (UINT32));
}
/**
- Remove the first entry on the list
+ Remove the first entry on the list.
- @param Head The list header
+ @param[in, out] Head The list header.
@return The entry that is removed from the list, NULL if the list is empty.
**/
-NET_LIST_ENTRY *
+LIST_ENTRY *
+EFIAPI
NetListRemoveHead (
- NET_LIST_ENTRY *Head
+ IN OUT LIST_ENTRY *Head
)
{
- NET_LIST_ENTRY *First;
+ LIST_ENTRY *First;
ASSERT (Head != NULL);
- if (NetListIsEmpty (Head)) {
+ if (IsListEmpty (Head)) {
return NULL;
}
@@ -305,8 +275,8 @@ NetListRemoveHead (
First->ForwardLink->BackLink = Head;
DEBUG_CODE (
- First->ForwardLink = (LIST_ENTRY *) NULL;
- First->BackLink = (LIST_ENTRY *) NULL;
+ First->ForwardLink = (LIST_ENTRY *) NULL;
+ First->BackLink = (LIST_ENTRY *) NULL;
);
return First;
@@ -314,23 +284,24 @@ NetListRemoveHead (
/**
- Remove the last entry on the list
+ Remove the last entry on the list.
- @param Head The list head
+ @param[in, out] Head The list head.
@return The entry that is removed from the list, NULL if the list is empty.
**/
-NET_LIST_ENTRY *
+LIST_ENTRY *
+EFIAPI
NetListRemoveTail (
- NET_LIST_ENTRY *Head
+ IN OUT LIST_ENTRY *Head
)
{
- NET_LIST_ENTRY *Last;
+ LIST_ENTRY *Last;
ASSERT (Head != NULL);
- if (NetListIsEmpty (Head)) {
+ if (IsListEmpty (Head)) {
return NULL;
}
@@ -339,8 +310,8 @@ NetListRemoveTail (
Last->BackLink->ForwardLink = Head;
DEBUG_CODE (
- Last->ForwardLink = (LIST_ENTRY *) NULL;
- Last->BackLink = (LIST_ENTRY *) NULL;
+ Last->ForwardLink = (LIST_ENTRY *) NULL;
+ Last->BackLink = (LIST_ENTRY *) NULL;
);
return Last;
@@ -348,18 +319,17 @@ NetListRemoveTail (
/**
- Insert the NewEntry after the PrevEntry
+ Insert the NewEntry after the PrevEntry.
- @param PrevEntry The previous entry to insert after
- @param NewEntry The new entry to insert
-
- @return None
+ @param[in, out] PrevEntry The previous entry to insert after.
+ @param[in, out] NewEntry The new entry to insert.
**/
VOID
+EFIAPI
NetListInsertAfter (
- IN NET_LIST_ENTRY *PrevEntry,
- IN NET_LIST_ENTRY *NewEntry
+ IN OUT LIST_ENTRY *PrevEntry,
+ IN OUT LIST_ENTRY *NewEntry
)
{
NewEntry->BackLink = PrevEntry;
@@ -370,18 +340,17 @@ NetListInsertAfter (
/**
- Insert the NewEntry before the PostEntry
-
- @param PostEntry The entry to insert before
- @param NewEntry The new entry to insert
+ Insert the NewEntry before the PostEntry.
- @return None
+ @param[in, out] PostEntry The entry to insert before.
+ @param[in, out] NewEntry The new entry to insert.
**/
VOID
+EFIAPI
NetListInsertBefore (
- IN NET_LIST_ENTRY *PostEntry,
- IN NET_LIST_ENTRY *NewEntry
+ IN OUT LIST_ENTRY *PostEntry,
+ IN OUT LIST_ENTRY *NewEntry
)
{
NewEntry->ForwardLink = PostEntry;
@@ -394,20 +363,19 @@ NetListInsertBefore (
/**
Initialize the netmap. Netmap is a reposity to keep the pairs.
- @param Map The netmap to initialize
-
- @return None
+ @param[in, out] Map The netmap to initialize.
**/
VOID
+EFIAPI
NetMapInit (
- IN NET_MAP *Map
+ IN OUT NET_MAP *Map
)
{
ASSERT (Map != NULL);
- NetListInit (&Map->Used);
- NetListInit (&Map->Recycled);
+ InitializeListHead (&Map->Used);
+ InitializeListHead (&Map->Recycled);
Map->Count = 0;
}
@@ -415,53 +383,53 @@ NetMapInit (
/**
To clean up the netmap, that is, release allocated memories.
- @param Map The netmap to clean up.
-
- @return None
+ @param[in, out] Map The netmap to clean up.
**/
VOID
+EFIAPI
NetMapClean (
- IN NET_MAP *Map
+ IN OUT NET_MAP *Map
)
{
NET_MAP_ITEM *Item;
- NET_LIST_ENTRY *Entry;
- NET_LIST_ENTRY *Next;
+ LIST_ENTRY *Entry;
+ LIST_ENTRY *Next;
ASSERT (Map != NULL);
NET_LIST_FOR_EACH_SAFE (Entry, Next, &Map->Used) {
Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);
- NetListRemoveEntry (&Item->Link);
+ RemoveEntryList (&Item->Link);
Map->Count--;
- NetFreePool (Item);
+ gBS->FreePool (Item);
}
- ASSERT ((Map->Count == 0) && NetListIsEmpty (&Map->Used));
+ ASSERT ((Map->Count == 0) && IsListEmpty (&Map->Used));
NET_LIST_FOR_EACH_SAFE (Entry, Next, &Map->Recycled) {
Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);
- NetListRemoveEntry (&Item->Link);
- NetFreePool (Item);
+ RemoveEntryList (&Item->Link);
+ gBS->FreePool (Item);
}
- ASSERT (NetListIsEmpty (&Map->Recycled));
+ ASSERT (IsListEmpty (&Map->Recycled));
}
/**
- Test whether the netmap is empty
+ Test whether the netmap is empty.
- @param Map The net map to test
+ @param[in] Map The net map to test.
@return TRUE if the netmap is empty, otherwise FALSE.
**/
BOOLEAN
+EFIAPI
NetMapIsEmpty (
IN NET_MAP *Map
)
@@ -474,12 +442,13 @@ NetMapIsEmpty (
/**
Return the number of the pairs in the netmap.
- @param Map The netmap to get the entry number
+ @param[in] Map The netmap to get the entry number.
@return The entry number in the netmap.
**/
UINTN
+EFIAPI
NetMapGetCount (
IN NET_MAP *Map
)
@@ -489,31 +458,31 @@ NetMapGetCount (
/**
- Allocate an item for the netmap. It will try to allocate
+ Allocate an item for the netmap. It will try to allocate.
a batch of items and return one.
- @param Map The netmap to allocate item for
+ @param[in, out] Map The netmap to allocate item for.
- @return The allocated item or NULL
+ @return The allocated item. If NULL, the
+ allocation failed due to resource limit.
**/
-STATIC
NET_MAP_ITEM *
NetMapAllocItem (
- IN NET_MAP *Map
+ IN OUT NET_MAP *Map
)
{
NET_MAP_ITEM *Item;
- NET_LIST_ENTRY *Head;
+ LIST_ENTRY *Head;
UINTN Index;
ASSERT (Map != NULL);
Head = &Map->Recycled;
- if (NetListIsEmpty (Head)) {
+ if (IsListEmpty (Head)) {
for (Index = 0; Index < NET_MAP_INCREAMENT; Index++) {
- Item = NetAllocatePool (sizeof (NET_MAP_ITEM));
+ Item = AllocatePool (sizeof (NET_MAP_ITEM));
if (Item == NULL) {
if (Index == 0) {
@@ -523,7 +492,7 @@ NetMapAllocItem (
break;
}
- NetListInsertHead (Head, &Item->Link);
+ InsertHeadList (Head, &Item->Link);
}
}
@@ -537,17 +506,18 @@ NetMapAllocItem (
/**
Allocate an item to save the pair to the head of the netmap.
- @param Map The netmap to insert into
- @param Key The user's key
- @param Value The user's value for the key
+ @param[in, out] Map The netmap to insert into.
+ @param[in] Key The user's key.
+ @param[in] Value The user's value for the key.
- @retval EFI_OUT_OF_RESOURCES Failed to allocate the memory for the item
- @retval EFI_SUCCESS The item is inserted to the head
+ @retval EFI_OUT_OF_RESOURCES Failed to allocate the memory for the item.
+ @retval EFI_SUCCESS The item is inserted to the head.
**/
EFI_STATUS
+EFIAPI
NetMapInsertHead (
- IN NET_MAP *Map,
+ IN OUT NET_MAP *Map,
IN VOID *Key,
IN VOID *Value OPTIONAL
)
@@ -564,7 +534,7 @@ NetMapInsertHead (
Item->Key = Key;
Item->Value = Value;
- NetListInsertHead (&Map->Used, &Item->Link);
+ InsertHeadList (&Map->Used, &Item->Link);
Map->Count++;
return EFI_SUCCESS;
@@ -574,17 +544,18 @@ NetMapInsertHead (
/**
Allocate an item to save the pair to the tail of the netmap.
- @param Map The netmap to insert into
- @param Key The user's key
- @param Value The user's value for the key
+ @param[in, out] Map The netmap to insert into.
+ @param[in] Key The user's key.
+ @param[in] Value The user's value for the key.
- @retval EFI_OUT_OF_RESOURCES Failed to allocate the memory for the item
- @retval EFI_SUCCESS The item is inserted to the tail
+ @retval EFI_OUT_OF_RESOURCES Failed to allocate the memory for the item.
+ @retval EFI_SUCCESS The item is inserted to the tail.
**/
EFI_STATUS
+EFIAPI
NetMapInsertTail (
- IN NET_MAP *Map,
+ IN OUT NET_MAP *Map,
IN VOID *Key,
IN VOID *Value OPTIONAL
)
@@ -601,7 +572,7 @@ NetMapInsertTail (
Item->Key = Key;
Item->Value = Value;
- NetListInsertTail (&Map->Used, &Item->Link);
+ InsertTailList (&Map->Used, &Item->Link);
Map->Count++;
@@ -610,22 +581,21 @@ NetMapInsertTail (
/**
- Check whther the item is in the Map
+ Check whther the item is in the Map.
- @param Map The netmap to search within
- @param Item The item to search
+ @param[in] Map The netmap to search within.
+ @param[in] Item The item to search.
@return TRUE if the item is in the netmap, otherwise FALSE.
**/
-STATIC
BOOLEAN
NetItemInMap (
IN NET_MAP *Map,
IN NET_MAP_ITEM *Item
)
{
- NET_LIST_ENTRY *ListEntry;
+ LIST_ENTRY *ListEntry;
NET_LIST_FOR_EACH (ListEntry, &Map->Used) {
if (ListEntry == &Item->Link) {
@@ -638,21 +608,22 @@ NetItemInMap (
/**
- Find the key in the netmap
+ Find the key in the netmap.
- @param Map The netmap to search within
- @param Key The key to search
+ @param[in] Map The netmap to search within.
+ @param[in] Key The key to search.
@return The point to the item contains the Key, or NULL if Key isn't in the map.
**/
NET_MAP_ITEM *
+EFIAPI
NetMapFindKey (
IN NET_MAP *Map,
IN VOID *Key
)
{
- NET_LIST_ENTRY *Entry;
+ LIST_ENTRY *Entry;
NET_MAP_ITEM *Item;
ASSERT (Map != NULL);
@@ -670,28 +641,29 @@ NetMapFindKey (
/**
- Remove the item from the netmap
+ Remove the item from the netmap.
- @param Map The netmap to remove the item from
- @param Item The item to remove
- @param Value The variable to receive the value if not NULL
+ @param[in, out] Map The netmap to remove the item from.
+ @param[in, out] Item The item to remove.
+ @param[out] Value The variable to receive the value if not NULL.
- @return The key of the removed item.
+ @return The key of the removed item.
**/
VOID *
+EFIAPI
NetMapRemoveItem (
- IN NET_MAP *Map,
- IN NET_MAP_ITEM *Item,
- OUT VOID **Value OPTIONAL
+ IN OUT NET_MAP *Map,
+ IN OUT NET_MAP_ITEM *Item,
+ OUT VOID **Value OPTIONAL
)
{
ASSERT ((Map != NULL) && (Item != NULL));
ASSERT (NetItemInMap (Map, Item));
- NetListRemoveEntry (&Item->Link);
+ RemoveEntryList (&Item->Link);
Map->Count--;
- NetListInsertHead (&Map->Recycled, &Item->Link);
+ InsertHeadList (&Map->Recycled, &Item->Link);
if (Value != NULL) {
*Value = Item->Value;
@@ -702,17 +674,18 @@ NetMapRemoveItem (
/**
- Remove the first entry on the netmap
+ Remove the first entry on the netmap.
- @param Map The netmap to remove the head from
- @param Value The variable to receive the value if not NULL
+ @param[in, out] Map The netmap to remove the head from.
+ @param[out] Value The variable to receive the value if not NULL.
- @return The key of the item removed
+ @return The key of the item removed.
**/
VOID *
+EFIAPI
NetMapRemoveHead (
- IN NET_MAP *Map,
+ IN OUT NET_MAP *Map,
OUT VOID **Value OPTIONAL
)
{
@@ -722,12 +695,12 @@ NetMapRemoveHead (
// Often, it indicates a programming error to remove
// the first entry in an empty list
//
- ASSERT (Map && !NetListIsEmpty (&Map->Used));
+ ASSERT (Map && !IsListEmpty (&Map->Used));
Item = NET_LIST_HEAD (&Map->Used, NET_MAP_ITEM, Link);
- NetListRemoveEntry (&Item->Link);
+ RemoveEntryList (&Item->Link);
Map->Count--;
- NetListInsertHead (&Map->Recycled, &Item->Link);
+ InsertHeadList (&Map->Recycled, &Item->Link);
if (Value != NULL) {
*Value = Item->Value;
@@ -738,17 +711,18 @@ NetMapRemoveHead (
/**
- Remove the last entry on the netmap
+ Remove the last entry on the netmap.
- @param Map The netmap to remove the tail from
- @param Value The variable to receive the value if not NULL
+ @param[in, out] Map The netmap to remove the tail from.
+ @param[out] Value The variable to receive the value if not NULL.
- @return The key of the item removed
+ @return The key of the item removed.
**/
VOID *
+EFIAPI
NetMapRemoveTail (
- IN NET_MAP *Map,
+ IN OUT NET_MAP *Map,
OUT VOID **Value OPTIONAL
)
{
@@ -758,12 +732,12 @@ NetMapRemoveTail (
// Often, it indicates a programming error to remove
// the last entry in an empty list
//
- ASSERT (Map && !NetListIsEmpty (&Map->Used));
+ ASSERT (Map && !IsListEmpty (&Map->Used));
Item = NET_LIST_TAIL (&Map->Used, NET_MAP_ITEM, Link);
- NetListRemoveEntry (&Item->Link);
+ RemoveEntryList (&Item->Link);
Map->Count--;
- NetListInsertHead (&Map->Recycled, &Item->Link);
+ InsertHeadList (&Map->Recycled, &Item->Link);
if (Value != NULL) {
*Value = Item->Value;
@@ -779,14 +753,17 @@ NetMapRemoveTail (
from the loop. It returns the CallBack's last return value. This
function is delete safe for the current item.
- @param Map The Map to iterate through
- @param CallBack The callback function to call for each item.
- @param Arg The opaque parameter to the callback
+ @param[in] Map The Map to iterate through.
+ @param[in] CallBack The callback function to call for each item.
+ @param[in] Arg The opaque parameter to the callback.
- @return It returns the CallBack's last return value.
+ @retval EFI_SUCCESS There is no item in the netmap or CallBack for each item
+ return EFI_SUCCESS.
+ @retval Others It returns the CallBack's last return value.
**/
EFI_STATUS
+EFIAPI
NetMapIterate (
IN NET_MAP *Map,
IN NET_MAP_CALLBACK CallBack,
@@ -794,9 +771,9 @@ NetMapIterate (
)
{
- NET_LIST_ENTRY *Entry;
- NET_LIST_ENTRY *Next;
- NET_LIST_ENTRY *Head;
+ LIST_ENTRY *Entry;
+ LIST_ENTRY *Next;
+ LIST_ENTRY *Head;
NET_MAP_ITEM *Item;
EFI_STATUS Result;
@@ -804,7 +781,7 @@ NetMapIterate (
Head = &Map->Used;
- if (NetListIsEmpty (Head)) {
+ if (IsListEmpty (Head)) {
return EFI_SUCCESS;
}
@@ -824,7 +801,7 @@ NetMapIterate (
/**
This is the default unload handle for all the network drivers.
- @param ImageHandle The drivers' driver image.
+ @param[in] ImageHandle The drivers' driver image.
@retval EFI_SUCCESS The image is unloaded.
@retval Others Failed to unload the image.
@@ -842,8 +819,7 @@ NetLibDefaultUnload (
UINTN Index;
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
- EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration;
- EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics;
+ EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;
//
// Get the list of all the handles in the handle database.
@@ -912,30 +888,15 @@ NetLibDefaultUnload (
Status = gBS->HandleProtocol (
DeviceHandleBuffer[Index],
- &gEfiDriverConfigurationProtocolGuid,
- (VOID **) &DriverConfiguration
- );
-
- if (!EFI_ERROR (Status)) {
- gBS->UninstallProtocolInterface (
- ImageHandle,
- &gEfiDriverConfigurationProtocolGuid,
- DriverConfiguration
- );
- }
-
- Status = gBS->HandleProtocol (
- DeviceHandleBuffer[Index],
- &gEfiDriverDiagnosticsProtocolGuid,
- (VOID **) &DriverDiagnostics
+ &gEfiComponentName2ProtocolGuid,
+ (VOID **) &ComponentName2
);
-
if (!EFI_ERROR (Status)) {
gBS->UninstallProtocolInterface (
- ImageHandle,
- &gEfiDriverDiagnosticsProtocolGuid,
- DriverDiagnostics
- );
+ ImageHandle,
+ &gEfiComponentName2ProtocolGuid,
+ ComponentName2
+ );
}
}
@@ -954,21 +915,22 @@ NetLibDefaultUnload (
/**
Create a child of the service that is identified by ServiceBindingGuid.
- @param Controller The controller which has the service installed.
- @param Image The image handle used to open service.
- @param ServiceBindingGuid The service's Guid.
- @param ChildHandle The handle to receive the create child
+ @param[in] Controller The controller which has the service installed.
+ @param[in] Image The image handle used to open service.
+ @param[in] ServiceBindingGuid The service's Guid.
+ @param[in, out] ChildHandle The handle to receive the create child
@retval EFI_SUCCESS The child is successfully created.
@retval Others Failed to create the child.
**/
EFI_STATUS
+EFIAPI
NetLibCreateServiceChild (
IN EFI_HANDLE Controller,
IN EFI_HANDLE Image,
IN EFI_GUID *ServiceBindingGuid,
- OUT EFI_HANDLE *ChildHandle
+ IN OUT EFI_HANDLE *ChildHandle
)
{
EFI_STATUS Status;
@@ -1004,16 +966,17 @@ NetLibCreateServiceChild (
/**
Destory a child of the service that is identified by ServiceBindingGuid.
- @param Controller The controller which has the service installed.
- @param Image The image handle used to open service.
- @param ServiceBindingGuid The service's Guid.
- @param ChildHandle The child to destory
+ @param[in] Controller The controller which has the service installed.
+ @param[in] Image The image handle used to open service.
+ @param[in] ServiceBindingGuid The service's Guid.
+ @param[in] ChildHandle The child to destory
@retval EFI_SUCCESS The child is successfully destoried.
@retval Others Failed to destory the child.
**/
EFI_STATUS
+EFIAPI
NetLibDestroyServiceChild (
IN EFI_HANDLE Controller,
IN EFI_HANDLE Image,
@@ -1055,22 +1018,24 @@ NetLibDestroyServiceChild (
SnpHandle to a unicode string. Callers are responsible for freeing the
string storage.
- @param SnpHandle The handle where the simple network protocol is
- installed on.
- @param ImageHandle The image handle used to act as the agent handle to
- get the simple network protocol.
- @param MacString The pointer to store the address of the string
- representation of the mac address.
-
+ @param[in] SnpHandle The handle where the simple network protocol is
+ installed on.
+ @param[in] ImageHandle The image handle used to act as the agent handle to
+ get the simple network protocol.
+ @param[out] MacString The pointer to store the address of the string
+ representation of the mac address.
+
+ @retval EFI_SUCCESS Convert the mac address a unicode string successfully.
@retval EFI_OUT_OF_RESOURCES There are not enough memory resource.
- @retval other Failed to open the simple network protocol.
+ @retval Others Failed to open the simple network protocol.
**/
EFI_STATUS
+EFIAPI
NetLibGetMacString (
- IN EFI_HANDLE SnpHandle,
- IN EFI_HANDLE ImageHandle,
- IN OUT CHAR16 **MacString
+ IN EFI_HANDLE SnpHandle,
+ IN EFI_HANDLE ImageHandle,
+ OUT CHAR16 **MacString
)
{
EFI_STATUS Status;
@@ -1102,7 +1067,7 @@ NetLibGetMacString (
// It takes 2 unicode characters to represent a 1 byte binary buffer.
// Plus one unicode character for the null-terminator.
//
- MacAddress = NetAllocatePool ((2 * Mode->HwAddressSize + 1) * sizeof (CHAR16));
+ MacAddress = AllocatePool ((2 * Mode->HwAddressSize + 1) * sizeof (CHAR16));
if (MacAddress == NULL) {
return EFI_OUT_OF_RESOURCES;
}
@@ -1111,8 +1076,8 @@ NetLibGetMacString (
// Convert the mac address into a unicode string.
//
for (Index = 0; Index < Mode->HwAddressSize; Index++) {
- MacAddress[Index * 2] = NibbleToHexChar ((UINT8) (Mode->CurrentAddress.Addr[Index] >> 4));
- MacAddress[Index * 2 + 1] = NibbleToHexChar (Mode->CurrentAddress.Addr[Index]);
+ MacAddress[Index * 2] = (CHAR16) mNetLibHexStr[(Mode->CurrentAddress.Addr[Index] >> 4) & 0x0F];
+ MacAddress[Index * 2 + 1] = (CHAR16) mNetLibHexStr[Mode->CurrentAddress.Addr[Index] & 0x0F];
}
MacAddress[Mode->HwAddressSize * 2] = L'\0';
@@ -1126,14 +1091,13 @@ NetLibGetMacString (
Check the default address used by the IPv4 driver is static or dynamic (acquired
from DHCP).
- @param Controller The controller handle which has the NIC Ip4 Config Protocol
- relative with the default address to judge.
+ @param[in] Controller The controller handle which has the NIC Ip4 Config Protocol
+ relative with the default address to judge.
@retval TRUE If the default address is static.
@retval FALSE If the default address is acquired from DHCP.
**/
-STATIC
BOOLEAN
NetLibDefaultAddressIsStatic (
IN EFI_HANDLE Controller
@@ -1160,7 +1124,7 @@ NetLibDefaultAddressIsStatic (
return TRUE;
}
- ConfigInfo = NetAllocatePool (Len);
+ ConfigInfo = AllocatePool (Len);
if (ConfigInfo == NULL) {
return TRUE;
}
@@ -1175,7 +1139,7 @@ NetLibDefaultAddressIsStatic (
ON_EXIT:
- NetFreePool (ConfigInfo);
+ gBS->FreePool (ConfigInfo);
return IsStatic;
}
@@ -1183,18 +1147,18 @@ ON_EXIT:
/**
Create an IPv4 device path node.
- @param Node Pointer to the IPv4 device path node.
- @param Controller The handle where the NIC IP4 config protocol resides.
- @param LocalIp The local IPv4 address.
- @param LocalPort The local port.
- @param RemoteIp The remote IPv4 address.
- @param RemotePort The remote port.
- @param Protocol The protocol type in the IP header.
- @param UseDefaultAddress Whether this instance is using default address or not.
+ @param[in, out] Node Pointer to the IPv4 device path node.
+ @param[in] Controller The handle where the NIC IP4 config protocol resides.
+ @param[in] LocalIp The local IPv4 address.
+ @param[in] LocalPort The local port.
+ @param[in] RemoteIp The remote IPv4 address.
+ @param[in] RemotePort The remote port.
+ @param[in] Protocol The protocol type in the IP header.
+ @param[in] UseDefaultAddress Whether this instance is using default address or not.
- @retval None
**/
VOID
+EFIAPI
NetLibCreateIPv4DPathNode (
IN OUT IPv4_DEVICE_PATH *Node,
IN EFI_HANDLE Controller,
@@ -1210,8 +1174,8 @@ NetLibCreateIPv4DPathNode (
Node->Header.SubType = MSG_IPv4_DP;
SetDevicePathNodeLength (&Node->Header, 19);
- NetCopyMem (&Node->LocalIpAddress, &LocalIp, sizeof (EFI_IPv4_ADDRESS));
- NetCopyMem (&Node->RemoteIpAddress, &RemoteIp, sizeof (EFI_IPv4_ADDRESS));
+ CopyMem (&Node->LocalIpAddress, &LocalIp, sizeof (EFI_IPv4_ADDRESS));
+ CopyMem (&Node->RemoteIpAddress, &RemoteIp, sizeof (EFI_IPv4_ADDRESS));
Node->LocalPort = LocalPort;
Node->RemotePort = RemotePort;
@@ -1236,13 +1200,14 @@ NetLibCreateIPv4DPathNode (
IP opens these handle BY_DRIVER, use that info, we can get the
UNDI/SNP handle.
- @param Controller Then protocol handle to check
- @param ProtocolGuid The protocol that is related with the handle.
+ @param[in] Controller Then protocol handle to check.
+ @param[in] ProtocolGuid The protocol that is related with the handle.
- @return The UNDI/SNP handle or NULL.
+ @return The UNDI/SNP handle or NULL for errors.
**/
EFI_HANDLE
+EFIAPI
NetLibGetNicHandle (
IN EFI_HANDLE Controller,
IN EFI_GUID *ProtocolGuid
@@ -1281,19 +1246,20 @@ NetLibGetNicHandle (
/**
Add a Deferred Procedure Call to the end of the DPC queue.
- @DpcTpl The EFI_TPL that the DPC should be invoked.
- @DpcProcedure Pointer to the DPC's function.
- @DpcContext Pointer to the DPC's context. Passed to DpcProcedure
- when DpcProcedure is invoked.
+ @param[in] DpcTpl The EFI_TPL that the DPC should be invoked.
+ @param[in] DpcProcedure Pointer to the DPC's function.
+ @param[in] DpcContext Pointer to the DPC's context. Passed to DpcProcedure
+ when DpcProcedure is invoked.
@retval EFI_SUCCESS The DPC was queued.
- @retval EFI_INVALID_PARAMETER DpcTpl is not a valid EFI_TPL.
- DpcProcedure is NULL.
+ @retval EFI_INVALID_PARAMETER DpcTpl is not a valid EFI_TPL, or DpcProcedure
+ is NULL.
@retval EFI_OUT_OF_RESOURCES There are not enough resources available to
add the DPC to the queue.
**/
EFI_STATUS
+EFIAPI
NetLibQueueDpc (
IN EFI_TPL DpcTpl,
IN EFI_DPC_PROCEDURE DpcProcedure,
@@ -1304,13 +1270,17 @@ NetLibQueueDpc (
}
/**
- Add a Deferred Procedure Call to the end of the DPC queue.
+ Dispatch the queue of DPCs. ALL DPCs that have been queued with a DpcTpl
+ value greater than or equal to the current TPL are invoked in the order that
+ they were queued. DPCs with higher DpcTpl values are invoked before DPCs with
+ lower DpcTpl values.
@retval EFI_SUCCESS One or more DPCs were invoked.
@retval EFI_NOT_FOUND No DPCs were invoked.
**/
EFI_STATUS
+EFIAPI
NetLibDispatchDpc (
VOID
)
@@ -1318,15 +1288,14 @@ NetLibDispatchDpc (
return mDpc->DispatchDpc(mDpc);
}
-
/**
The constructor function caches the pointer to DPC protocol.
The constructor function locates DPC protocol from protocol database.
It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.
- @param ImageHandle The firmware allocated handle for the EFI image.
- @param SystemTable A pointer to the EFI System Table.
+ @param[in] ImageHandle The firmware allocated handle for the EFI image.
+ @param[in] SystemTable A pointer to the EFI System Table.
@retval EFI_SUCCESS The constructor always returns EFI_SUCCESS.