From 3a1ab4bc2c322e835faca717ed4b0dc17536cfd7 Mon Sep 17 00:00:00 2001 From: ywu21 Date: Tue, 13 Jan 2009 08:51:55 +0000 Subject: [PATCH] sync Netlib function from c file fix file header issues add in out add . at the end of lines git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7260 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Library/DpcLib.h | 21 +-- MdeModulePkg/Include/Library/IpIoLib.h | 10 +- MdeModulePkg/Include/Library/NetLib.h | 210 ++++++++++++++++++++---- MdeModulePkg/Include/Library/UdpIoLib.h | 70 ++++---- 4 files changed, 221 insertions(+), 90 deletions(-) diff --git a/MdeModulePkg/Include/Library/DpcLib.h b/MdeModulePkg/Include/Library/DpcLib.h index ee4705b7e4..68e8530d0d 100644 --- a/MdeModulePkg/Include/Library/DpcLib.h +++ b/MdeModulePkg/Include/Library/DpcLib.h @@ -1,6 +1,7 @@ /** @file - -Copyright (c) 2007, Intel Corporation + DpcLib.h + +Copyright (c) 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 @@ -9,14 +10,6 @@ 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: - - DpcLib.h - -Abstract: - - Library for Deferred Procedure Calls. - **/ #ifndef _DPC_LIB_H_ @@ -27,10 +20,10 @@ Abstract: /** Add a Deferred Procedure Call to the end of the DPC queue. - @param DpcTpl The EFI_TPL that the DPC should be invoked. - @param DpcProcedure Pointer to the DPC's function. - @param 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. diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h index 99b98d8075..4f40074ae5 100644 --- a/MdeModulePkg/Include/Library/IpIoLib.h +++ b/MdeModulePkg/Include/Library/IpIoLib.h @@ -341,8 +341,8 @@ IpIoOpen ( packet. @param[in, out] Pkt Pointer to the IP packet to be sent. @param[in] Sender The IP protocol instance used for sending. - @param[in] Context Optional context data - @param[in] NotifyData Optional notify data + @param[in] Context Optional context data. + @param[in] NotifyData Optional notify data. @param[in] Dest The destination IP address to send this packet to. @param[in] OverrideData The data to override some configuration of the IP instance used for sending. @@ -466,9 +466,9 @@ IpIoFindSender ( The ErrorStatus will be returned. The IsHard and Notify are optional. If they are not NULL, this routine will fill them. - @param[in] IcmpError IcmpError Type - @param[out] IsHard Whether it is a hard error - @param[out] Notify Whether it need to notify SockError + @param[in] IcmpError IcmpError Type. + @param[out] IsHard Whether it is a hard error. + @param[out] Notify Whether it need to notify SockError. @return ICMP Error Status, such as EFI_NETWORK_UNREACHABLE. diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h index c317f76899..695777a6a9 100644 --- a/MdeModulePkg/Include/Library/NetLib.h +++ b/MdeModulePkg/Include/Library/NetLib.h @@ -166,13 +166,15 @@ typedef struct { #define EFI_IP4_EQUAL(Ip1, Ip2) (CompareMem ((Ip1), (Ip2), sizeof (EFI_IPv4_ADDRESS)) == 0) /** - Return the length of the mask. If the mask is invalid, - return the invalid length 33, which is IP4_MASK_NUM. + Return the length of the mask. + + Return the length of the mask, the correct value is from 0 to 32. + If the mask is invalid, return the invalid length 33, which is IP4_MASK_NUM. NetMask is in the host byte order. @param[in] NetMask The netmask to get the length from. - @return The length of the netmask, IP4_MASK_NUM if the mask isn't. + @return The length of the netmask, IP4_MASK_NUM if the mask is invalid. **/ INTN @@ -182,9 +184,21 @@ NetGetMaskLength ( ); /** - Return the class of the address, such as class a, b, c. + Return the class of the IP address, such as class A, B, C. Addr is in host byte order. + + The address of class A starts with 0. + If the address belong to class A, return IP4_ADDR_CLASSA. + The address of class B starts with 10. + If the address belong to class B, return IP4_ADDR_CLASSB. + The address of class C starts with 110. + If the address belong to class C, return IP4_ADDR_CLASSC. + The address of class D starts with 1110. + If the address belong to class D, return IP4_ADDR_CLASSD. + The address of class E starts with 1111. + If the address belong to class E, return IP4_ADDR_CLASSE. + @param[in] Addr The address to get the class from. @return IP address class, such as IP4_ADDR_CLASSA. @@ -198,8 +212,12 @@ NetGetIpClass ( /** Check whether the IP is a valid unicast address according to - the netmask. If NetMask is zero, use the IP address's class to - get the default mask. + the netmask. If NetMask is zero, use the IP address's class to get the default mask. + + If Ip is 0, IP is not a valid unicast address. + Class D address is used for multicasting and class E address is reserved for future. If Ip + belongs to class D or class E, IP is not a valid unicast address. + If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address. @param[in] Ip The IP to check against. @param[in] NetMask The mask of the IP. @@ -230,8 +248,10 @@ extern EFI_IPv4_ADDRESS mZeroIp4Addr; #define NET_RANDOM(Seed) ((UINT32) ((UINT32) (Seed) * 1103515245UL + 12345) % 4294967295UL) /** - Extract a UINT32 from a byte stream, then convert it to host - byte order. Use this function to avoid alignment error. + Extract a UINT32 from a byte stream. + + Copy a UINT32 from a byte stream, then converts it from Network + byte order to host byte order. Use this function to avoid alignment error. @param[in] Buf The buffer to extract the UINT32. @@ -245,8 +265,10 @@ NetGetUint32 ( ); /** - Put a UINT32 to the byte stream. Convert it from host byte order - to network byte order before putting. + Put a UINT32 to the byte stream in network byte order. + + Converts a UINT32 from host byte order to network byte order. Then copy it to the + byte stream. @param[in, out] Buf The buffer to put the UINT32. @param[in] Data The data to put. @@ -261,7 +283,11 @@ NetPutUint32 ( /** Initialize a random seed using current time. - + + Get current time first. Then initialize a random seed based on some basic + mathematics operation on the hour, day, minute, second, nanosecond and year + of the current time. + @return The random seed initialized with current time. **/ @@ -307,11 +333,21 @@ NetRandomInitSeed ( /** - Remove the first entry on the list. + Remove the first node entry on the list, and return the removed node entry. + + Removes the first node Entry from a doubly linked list. It is up to the caller of + this function to release the memory used by the first node if that is required. On + exit, the removed node is returned. + + If Head is NULL, then ASSERT(). + If Head was not initialized, then ASSERT(). + If PcdMaximumLinkedListLength is not zero, and the number of nodes in the + linked list including the head node is greater than or equal to PcdMaximumLinkedListLength, + then ASSERT(). @param[in, out] Head The list header. - @return The entry that is removed from the list, NULL if the list is empty. + @return The first node entry that is removed from the list, NULL if the list is empty. **/ LIST_ENTRY * @@ -321,11 +357,21 @@ NetListRemoveHead ( ); /** - Remove the last entry on the list. + Remove the last node entry on the list and and return the removed node entry. + Removes the last node entry from a doubly linked list. It is up to the caller of + this function to release the memory used by the first node if that is required. On + exit, the removed node is returned. + + If Head is NULL, then ASSERT(). + If Head was not initialized, then ASSERT(). + If PcdMaximumLinkedListLength is not zero, and the number of nodes in the + linked list including the head node is greater than or equal to PcdMaximumLinkedListLength, + then ASSERT(). + @param[in, out] Head The list head. - @return The entry that is removed from the list, NULL if the list is empty. + @return The last node entry that is removed from the list, NULL if the list is empty. **/ LIST_ENTRY * @@ -335,8 +381,11 @@ NetListRemoveTail ( ); /** - Insert the NewEntry after the PrevEntry. - + Insert a new node entry after a designated node entry of a doubly linked list. + + Inserts a new node entry donated by NewEntry after the node entry donated by PrevEntry + of the doubly linked list. + @param[in, out] PrevEntry The previous entry to insert after. @param[in, out] NewEntry The new entry to insert. @@ -349,8 +398,11 @@ NetListInsertAfter ( ); /** - Insert the NewEntry before the PostEntry. - + Insert a new node entry before a designated node entry of a doubly linked list. + + Inserts a new node entry donated by NewEntry after the node entry donated by PostEntry + of the doubly linked list. + @param[in, out] PostEntry The entry to insert before. @param[in, out] NewEntry The new entry to insert. @@ -383,7 +435,15 @@ typedef struct { /** Initialize the netmap. Netmap is a reposity to keep the pairs. - + + Initialize the forward and backward links of two head nodes donated by Map->Used + and Map->Recycled of two doubly linked lists. + Initializes the count of the pairs in the netmap to zero. + + If Map is NULL, then ASSERT(). + If the address of Map->Used is NULL, then ASSERT(). + If the address of Map->Recycled is NULl, then ASSERT(). + @param[in, out] Map The netmap to initialize. **/ @@ -395,7 +455,13 @@ NetMapInit ( /** To clean up the netmap, that is, release allocated memories. - + + Removes all nodes of the Used doubly linked list and free memory of all related netmap items. + Removes all nodes of the Recycled doubly linked list and free memory of all related netmap items. + The number of the pairs in the netmap is set to be zero. + + If Map is NULL, then ASSERT(). + @param[in, out] Map The netmap to clean up. **/ @@ -406,8 +472,13 @@ NetMapClean ( ); /** - Test whether the netmap is empty. - + Test whether the netmap is empty and return true if it is. + + If the number of the pairs in the netmap is zero, return TRUE. + + If Map is NULL, then ASSERT(). + + @param[in] Map The net map to test. @return TRUE if the netmap is empty, otherwise FALSE. @@ -435,7 +506,13 @@ NetMapGetCount ( /** Allocate an item to save the pair to the head of the netmap. + + Allocate an item to save the pair and add corresponding node entry + to the beginning of the Used doubly linked list. The number of the + pairs in the netmap increase by 1. + If Map is NULL, then ASSERT(). + @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. @@ -455,6 +532,12 @@ NetMapInsertHead ( /** Allocate an item to save the pair to the tail of the netmap. + Allocate an item to save the pair and add corresponding node entry + to the tail of the Used doubly linked list. The number of the + pairs in the netmap increase by 1. + + If Map is NULL, then ASSERT(). + @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. @@ -472,8 +555,13 @@ NetMapInsertTail ( ); /** - Find the key in the netmap. + Find the key in the netmap and returns the point to the item contains the Key. + + Iterate the Used doubly linked list of the netmap to get every item. Compare the key of every + item with the key to search. It returns the point to the item contains the Key if found. + If Map is NULL, then ASSERT(). + @param[in] Map The netmap to search within. @param[in] Key The key to search. @@ -488,8 +576,17 @@ NetMapFindKey ( ); /** - Remove the item from the netmap. - + Remove the node entry of the item from the netmap and return the key of the removed item. + + Remove the node entry of the item from the Used doubly linked list of the netmap. + The number of the pairs in the netmap decrease by 1. Then add the node + entry of the item to the Recycled doubly linked list of the netmap. If Value is not NULL, + Value will point to the value of the item. It returns the key of the removed item. + + If Map is NULL, then ASSERT(). + If Item is NULL, then ASSERT(). + if item in not in the netmap, then ASSERT(). + @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. @@ -506,8 +603,16 @@ NetMapRemoveItem ( ); /** - Remove the first entry on the netmap. + Remove the first node entry on the netmap and return the key of the removed item. + Remove the first node entry from the Used doubly linked list of the netmap. + The number of the pairs in the netmap decrease by 1. Then add the node + entry to the Recycled doubly linked list of the netmap. If parameter Value is not NULL, + parameter Value will point to the value of the item. It returns the key of the removed item. + + If Map is NULL, then ASSERT(). + If the Used doubly linked list is empty, then ASSERT(). + @param[in, out] Map The netmap to remove the head from. @param[out] Value The variable to receive the value if not NULL. @@ -522,8 +627,16 @@ NetMapRemoveHead ( ); /** - Remove the last entry on the netmap. + Remove the last node entry on the netmap and return the key of the removed item. + Remove the last node entry from the Used doubly linked list of the netmap. + The number of the pairs in the netmap decrease by 1. Then add the node + entry to the Recycled doubly linked list of the netmap. If parameter Value is not NULL, + parameter Value will point to the value of the item. It returns the key of the removed item. + + If Map is NULL, then ASSERT(). + If the Used doubly linked list is empty, then ASSERT(). + @param[in, out] Map The netmap to remove the tail from. @param[out] Value The variable to receive the value if not NULL. @@ -546,11 +659,15 @@ EFI_STATUS ); /** - Iterate through the netmap and call CallBack for each item. It will - contiue the traverse if CallBack returns EFI_SUCCESS, otherwise, break - from the loop. It returns the CallBack's last return value. This - function is delete safe for the current item. + Iterate through the netmap and call CallBack for each item. + + It will contiue the traverse if CallBack returns EFI_SUCCESS, otherwise, break + from the loop. It returns the CallBack's last return value. This function is + delete safe for the current item. + If Map is NULL, then ASSERT(). + If CallBack is NULL, then ASSERT(). + @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. @@ -574,11 +691,16 @@ NetMapIterate ( // /** Create a child of the service that is identified by ServiceBindingGuid. + + Get the ServiceBinding Protocol first, then use it to create a child. + If ServiceBindingGuid is NULL, then ASSERT(). + If ChildHandle is NULL, then ASSERT(). + @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 + @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. @@ -595,11 +717,15 @@ NetLibCreateServiceChild ( /** Destory a child of the service that is identified by ServiceBindingGuid. - + + Get the ServiceBinding Protocol first, then use it to destroy a child. + + If ServiceBindingGuid is NULL, then ASSERT(). + @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 + @param[in] ChildHandle The child to destory. @retval EFI_SUCCESS The child is successfully destoried. @retval Others Failed to destory the child. @@ -619,6 +745,11 @@ NetLibDestroyServiceChild ( SnpHandle to a unicode string. Callers are responsible for freeing the string storage. + Get the mac address of the Simple Network protocol from the SnpHandle. Then convert + the mac address into a unicode string. It takes 2 unicode characters to represent + a 1 byte binary buffer. Plus one unicode character for the null-terminator. + + @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 @@ -641,6 +772,11 @@ NetLibGetMacString ( /** Create an IPv4 device path node. + + The header type of IPv4 device path node is MESSAGING_DEVICE_PATH. + The header subtype of IPv4 device path node is MSG_IPv4_DP. + The length of the IPv4 device path node in bytes is 19. + Get other info from parameters to make up the whole IPv4 device path node. @param[in, out] Node Pointer to the IPv4 device path node. @param[in] Controller The handle where the NIC IP4 config protocol resides. @@ -667,6 +803,7 @@ NetLibCreateIPv4DPathNode ( /** Find the UNDI/SNP handle from controller and protocol GUID. + For example, IP will open a MNP child to transmit/receive packets, when MNP is stopped, IP should also be stopped. IP needs to find its own private data which is related the IP's @@ -730,6 +867,9 @@ NetLibDispatchDpc ( /** This is the default unload handle for all the network drivers. + Disconnect the driver specified by ImageHandle from all the devices in the handle database. + Uninstall all the protocols installed in the driver entry point. + @param[in] ImageHandle The drivers' driver image. @retval EFI_SUCCESS The image is unloaded. diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h index 1562d866d5..f8ffa444ed 100644 --- a/MdeModulePkg/Include/Library/UdpIoLib.h +++ b/MdeModulePkg/Include/Library/UdpIoLib.h @@ -50,13 +50,11 @@ typedef struct { UDP access point, and released by user. When sending, the NetBuf is from user, and provided to the callback as a reference. - @param Packet Packet received or sent - @param Points The Udp4 address pair corresponds to the Udp4 IO - @param IoStatus Packet receiving or sending status - @param Context User-defined data when calling UdpIoRecvDatagram() or - UdpIoSendDatagram() - - @return None + @param[in] Packet Packet received or sent + @param[in] Points The Udp4 address pair corresponds to the Udp4 IO + @param[in] IoStatus Packet receiving or sending status + @param[in] Context User-defined data when calling UdpIoRecvDatagram() or + UdpIoSendDatagram() **/ typedef VOID @@ -140,8 +138,8 @@ struct _UDP_IO_PORT { The prototype is set and called when creating a UDP_IO_PORT in UdpIoCreatePort(). - @param UdpIo The UDP_IO_PORT to configure - @param Context User-defined data when calling UdpIoCreatePort() + @param[in] UdpIo The UDP_IO_PORT to configure + @param[in] Context User-defined data when calling UdpIoCreatePort() @retval EFI_SUCCESS The configure process succeeds @retval Others The UDP_IO_PORT fails to configure indicating @@ -155,10 +153,10 @@ EFI_STATUS ); /** - The select function to decide whether to cancel the UDP_TX_TOKEN. It is used + The select function to decide whether to cancel the UDP_TX_TOKEN. - @param Token The UDP_TX_TOKEN to decide whether to cancel - @param Context User-defined data in UdpIoCancelDgrams() + @param[in] Token The UDP_TX_TOKEN to decide whether to cancel + @param[in] Context User-defined data in UdpIoCancelDgrams() @retval TRUE To cancel the UDP_TX_TOKEN @retval FALSE Do not cancel this UDP_TX_TOKEN @@ -181,11 +179,11 @@ BOOLEAN in creating or configure the UDP child will lead to the failure of UDP_IO_PORT creation. - @param Controller The controller that has the UDP service binding - protocol installed. - @param Image The image handle for the driver. - @param Configure The function to configure the created UDP child - @param Context The opaque parameter for the Configure funtion. + @param[in] Controller The controller that has the UDP service binding. + protocol installed. + @param[in] Image The image handle for the driver. + @param[in] Configure The function to configure the created UDP child. + @param[in] Context The opaque parameter for the Configure funtion. @return Newly-created UDP_IO_PORT or NULL if failed. @@ -204,7 +202,7 @@ UdpIoCreatePort ( The function will cancel all sent datagram and receive request. - @param UdpIo The UDP_IO_PORT to free. + @param[in] UdpIo The UDP_IO_PORT to free. @retval EFI_SUCCESS The UDP_IO_PORT is freed. @@ -222,7 +220,7 @@ UdpIoFreePort ( It will release all the transmitted datagrams and receive request. It will also configure NULL for the UDP instance. - @param UdpIo The UDP_IO_PORT to clean up. + @param[in] UdpIo The UDP_IO_PORT to clean up. **/ VOID @@ -238,16 +236,16 @@ UdpIoCleanPort ( when the packet is sent. The optional parameter EndPoint overrides the default address pair if specified. - @param UdpIo The UDP_IO_PORT to send the packet through - @param Packet The packet to send - @param EndPoint The local and remote access point. Override the - default address pair set during configuration. - @param Gateway The gateway to use - @param CallBack The function being called when packet is - transmitted or failed. - @param Context The opaque parameter passed to CallBack + @param[in] UdpIo The UDP_IO_PORT to send the packet through. + @param[in] Packet The packet to send. + @param[in] EndPoint The local and remote access point. Override the + default address pair set during configuration. + @param[in] Gateway The gateway to use. + @param[in] CallBack The function being called when packet is + transmitted or failed. + @param[in] Context The opaque parameter passed to CallBack. - @retval EFI_OUT_OF_RESOURCES Failed to allocate resource for the packet + @retval EFI_OUT_OF_RESOURCES Failed to allocate resource for the packet. @retval EFI_SUCCESS The packet is successfully delivered to UDP for transmission. @@ -257,7 +255,7 @@ EFIAPI UdpIoSendDatagram ( IN UDP_IO_PORT *UdpIo, IN NET_BUF *Packet, - IN UDP_POINTS *EndPoint OPTIONAL, + IN UDP_POINTS *EndPoint, OPTIONAL IN IP4_ADDR Gateway, IN UDP_IO_CALLBACK CallBack, IN VOID *Context @@ -266,8 +264,8 @@ UdpIoSendDatagram ( /** Cancel a single sent datagram. - @param UdpIo The UDP_IO_PORT to cancel the packet from - @param Packet The packet to cancel + @param[in] UdpIo The UDP_IO_PORT to cancel the packet from + @param[in] Packet The packet to cancel **/ VOID @@ -285,11 +283,11 @@ UdpIoCancelSentDatagram ( to invoke this function inside its Callback function when the former packet is processed. - @param UdpIo The UDP_IO_PORT to receive the packet from. - @param CallBack The call back function to execute when the packet - is received. - @param Context The opaque context passed to Callback - @param HeadLen The length of the upper-layer's protocol header + @param[in] UdpIo The UDP_IO_PORT to receive the packet from. + @param[in] CallBack The call back function to execute when the packet + is received. + @param[in] Context The opaque context passed to Callback. + @param[in] HeadLen The length of the upper-layer's protocol header. @retval EFI_ALREADY_STARTED There is already a pending receive request. Only one receive request is supported at a time.