From 190344219aabd6ea3c0cd095dcb1c5120eaa576d Mon Sep 17 00:00:00 2001 From: qwang12 Date: Tue, 14 Oct 2008 15:34:00 +0000 Subject: Remove the unnecessary include, such as PiDxe.h, PiPei.h, Base.h and Uefi.h in header file. The module should include these files before include the Protocol/Ppi/Guid/Library header files. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6111 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Library/DpcLib.h | 1 - MdeModulePkg/Include/Library/GenericBdsLib.h | 1 - MdeModulePkg/Include/Library/IpIoLib.h | 319 ++++++++++----------- MdeModulePkg/Include/Library/NetLib.h | 35 ++- MdeModulePkg/Include/Library/PlatDriOverLib.h | 1 - MdeModulePkg/Include/Library/PlatformBdsLib.h | 1 - MdeModulePkg/Include/Library/UdpIoLib.h | 18 +- MdeModulePkg/Library/GraphicsLib/Graphics.c | 2 +- .../Universal/Network/IScsiDxe/IScsiImpl.h | 2 + .../Network/Ip4ConfigDxe/NicIp4Variable.c | 1 + MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c | 2 +- 11 files changed, 189 insertions(+), 194 deletions(-) diff --git a/MdeModulePkg/Include/Library/DpcLib.h b/MdeModulePkg/Include/Library/DpcLib.h index dce2ec2..ee4705b 100644 --- a/MdeModulePkg/Include/Library/DpcLib.h +++ b/MdeModulePkg/Include/Library/DpcLib.h @@ -22,7 +22,6 @@ Abstract: #ifndef _DPC_LIB_H_ #define _DPC_LIB_H_ -#include #include /** diff --git a/MdeModulePkg/Include/Library/GenericBdsLib.h b/MdeModulePkg/Include/Library/GenericBdsLib.h index 654271d..76b7f94 100644 --- a/MdeModulePkg/Include/Library/GenericBdsLib.h +++ b/MdeModulePkg/Include/Library/GenericBdsLib.h @@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _GENERIC_BDS_LIB_H_ #define _GENERIC_BDS_LIB_H_ -#include #include #include diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h index 640e5f7..19f8679 100644 --- a/MdeModulePkg/Include/Library/IpIoLib.h +++ b/MdeModulePkg/Include/Library/IpIoLib.h @@ -1,5 +1,5 @@ /** @file - This library provides IpIo layer upon EFI IP4 Protocol. + This library provides IpIo layer upon EFI IP4 Protocol. Copyright (c) 2005 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials @@ -15,56 +15,55 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _IP_IO_H_ #define _IP_IO_H_ -#include -#include -#include +#include +#include #include -// -// type and code define for ICMP protocol error got -// from IP -// -#define ICMP_TYPE_UNREACH 3 -#define ICMP_TYPE_TIMXCEED 11 -#define ICMP_TYPE_PARAMPROB 12 -#define ICMP_TYPE_SOURCEQUENCH 4 - -#define ICMP_CODE_UNREACH_NET 0 -#define ICMP_CODE_UNREACH_HOST 1 -#define ICMP_CODE_UNREACH_PROTOCOL 2 -#define ICMP_CODE_UNREACH_PORT 3 -#define ICMP_CODE_UNREACH_NEEDFRAG 4 -#define ICMP_CODE_UNREACH_SRCFAIL 5 -#define ICMP_CODE_UNREACH_NET_UNKNOWN 6 -#define ICMP_CODE_UNREACH_HOST_UNKNOWN 7 -#define ICMP_CODE_UNREACH_ISOLATED 8 -#define ICMP_CODE_UNREACH_NET_PROHIB 9 -#define ICMP_CODE_UNREACH_HOST_PROHIB 10 -#define ICMP_CODE_UNREACH_TOSNET 11 -#define ICMP_CODE_UNREACH_TOSHOST 12 - -// -// this error will be delivered to the -// listening transportation layer protocol -// consuming IpIO -// -typedef enum { - ICMP_ERR_UNREACH_NET = 0, - ICMP_ERR_UNREACH_HOST, - ICMP_ERR_UNREACH_PROTOCOL, - ICMP_ERR_UNREACH_PORT, - ICMP_ERR_MSGSIZE, - ICMP_ERR_UNREACH_SRCFAIL, - ICMP_ERR_TIMXCEED_INTRANS, - ICMP_ERR_TIMXCEED_REASS, - ICMP_ERR_QUENCH, - ICMP_ERR_PARAMPROB -} ICMP_ERROR; - -typedef struct _ICMP_ERROR_INFO { - BOOLEAN IsHard; - BOOLEAN Notify; -} ICMP_ERROR_INFO; +// +// type and code define for ICMP protocol error got +// from IP +// +#define ICMP_TYPE_UNREACH 3 +#define ICMP_TYPE_TIMXCEED 11 +#define ICMP_TYPE_PARAMPROB 12 +#define ICMP_TYPE_SOURCEQUENCH 4 + +#define ICMP_CODE_UNREACH_NET 0 +#define ICMP_CODE_UNREACH_HOST 1 +#define ICMP_CODE_UNREACH_PROTOCOL 2 +#define ICMP_CODE_UNREACH_PORT 3 +#define ICMP_CODE_UNREACH_NEEDFRAG 4 +#define ICMP_CODE_UNREACH_SRCFAIL 5 +#define ICMP_CODE_UNREACH_NET_UNKNOWN 6 +#define ICMP_CODE_UNREACH_HOST_UNKNOWN 7 +#define ICMP_CODE_UNREACH_ISOLATED 8 +#define ICMP_CODE_UNREACH_NET_PROHIB 9 +#define ICMP_CODE_UNREACH_HOST_PROHIB 10 +#define ICMP_CODE_UNREACH_TOSNET 11 +#define ICMP_CODE_UNREACH_TOSHOST 12 + +// +// this error will be delivered to the +// listening transportation layer protocol +// consuming IpIO +// +typedef enum { + ICMP_ERR_UNREACH_NET = 0, + ICMP_ERR_UNREACH_HOST, + ICMP_ERR_UNREACH_PROTOCOL, + ICMP_ERR_UNREACH_PORT, + ICMP_ERR_MSGSIZE, + ICMP_ERR_UNREACH_SRCFAIL, + ICMP_ERR_TIMXCEED_INTRANS, + ICMP_ERR_TIMXCEED_REASS, + ICMP_ERR_QUENCH, + ICMP_ERR_PARAMPROB +} ICMP_ERROR; + +typedef struct _ICMP_ERROR_INFO { + BOOLEAN IsHard; + BOOLEAN Notify; +} ICMP_ERROR_INFO; #define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2) @@ -170,15 +169,15 @@ typedef struct _IP_IO_IP_INFO { INTN RefCnt; } IP_IO_IP_INFO; -/** - Create a new IP_IO instance. - - @param Image The image handle of an IP_IO consumer protocol. - @param Controller The controller handle of an IP_IO consumer protocol - installed on. - - @return Pointer to a newly created IP_IO instance. - +/** + Create a new IP_IO instance. + + @param Image The image handle of an IP_IO consumer protocol. + @param Controller The controller handle of an IP_IO consumer protocol + installed on. + + @return Pointer to a newly created IP_IO instance. + **/ IP_IO * EFIAPI @@ -187,15 +186,15 @@ IpIoCreate ( IN EFI_HANDLE Controller ); -/** - Destroy an IP_IO instance. - - @param IpIo Pointer to the IP_IO instance that needs to - destroy. - - @retval EFI_SUCCESS The IP_IO instance destroyed successfully. - @retval other Error condition occurred. - +/** + Destroy an IP_IO instance. + + @param IpIo Pointer to the IP_IO instance that needs to + destroy. + + @retval EFI_SUCCESS The IP_IO instance destroyed successfully. + @retval other Error condition occurred. + **/ EFI_STATUS EFIAPI @@ -203,14 +202,14 @@ IpIoDestroy ( IN IP_IO *IpIo ); -/** - Stop an IP_IO instance. - - @param IpIo Pointer to the IP_IO instance that needs to stop. - - @retval EFI_SUCCESS The IP_IO instance stopped successfully. - @retval other Error condition occurred. - +/** + Stop an IP_IO instance. + + @param IpIo Pointer to the IP_IO instance that needs to stop. + + @retval EFI_SUCCESS The IP_IO instance stopped successfully. + @retval other Error condition occurred. + **/ EFI_STATUS EFIAPI @@ -218,16 +217,16 @@ IpIoStop ( IN IP_IO *IpIo ); -/** - Open an IP_IO instance for use. - - @param IpIo Pointer to an IP_IO instance that needs to open. - @param OpenData The configuration data for the IP_IO instance. - - @retval EFI_SUCCESS The IP_IO instance opened with OpenData - successfully. - @retval other Error condition occurred. - +/** + Open an IP_IO instance for use. + + @param IpIo Pointer to an IP_IO instance that needs to open. + @param OpenData The configuration data for the IP_IO instance. + + @retval EFI_SUCCESS The IP_IO instance opened with OpenData + successfully. + @retval other Error condition occurred. + **/ EFI_STATUS IpIoOpen ( @@ -235,23 +234,23 @@ IpIoOpen ( IN IP_IO_OPEN_DATA *OpenData ); -/** - Send out an IP packet. - - @param IpIo Pointer to an IP_IO instance used for sending IP - packet. - @param Pkt Pointer to the IP packet to be sent. - @param Sender The IP protocol instance used for sending. +/** + Send out an IP packet. + + @param IpIo Pointer to an IP_IO instance used for sending IP + packet. + @param Pkt Pointer to the IP packet to be sent. + @param Sender The IP protocol instance used for sending. @param Context - @param NotifyData - @param Dest The destination IP address to send this packet to. - @param OverrideData The data to override some configuration of the IP - instance used for sending. - - @retval EFI_SUCCESS The operation is completed successfully. - @retval EFI_NOT_STARTED The IpIo is not configured. - @retval EFI_OUT_OF_RESOURCES Failed due to resource limit. - + @param NotifyData + @param Dest The destination IP address to send this packet to. + @param OverrideData The data to override some configuration of the IP + instance used for sending. + + @retval EFI_SUCCESS The operation is completed successfully. + @retval EFI_NOT_STARTED The IpIo is not configured. + @retval EFI_OUT_OF_RESOURCES Failed due to resource limit. + **/ EFI_STATUS EFIAPI @@ -265,11 +264,11 @@ IpIoSend ( IN IP_IO_OVERRIDE *OverrideData ); -/** - Cancel the IP transmit token which wraps this Packet. - - @param IpIo Pointer to the IP_IO instance. - @param Packet Pointer to the packet to cancel. +/** + Cancel the IP transmit token which wraps this Packet. + + @param IpIo Pointer to the IP_IO instance. + @param Packet Pointer to the packet to cancel. **/ VOID @@ -279,14 +278,14 @@ IpIoCancelTxToken ( IN VOID *Packet ); -/** - Add a new IP instance for sending data. - - @param IpIo Pointer to a IP_IO instance to add a new IP - instance for sending purpose. - - @return Pointer to the created IP_IO_IP_INFO structure, NULL is failed. - +/** + Add a new IP instance for sending data. + + @param IpIo Pointer to a IP_IO instance to add a new IP + instance for sending purpose. + + @return Pointer to the created IP_IO_IP_INFO structure, NULL is failed. + **/ IP_IO_IP_INFO * EFIAPI @@ -294,20 +293,20 @@ IpIoAddIp ( IN IP_IO *IpIo ); -/** - Configure the IP instance of this IpInfo and start the receiving if Ip4ConfigData - is not NULL. - - @param IpInfo Pointer to the IP_IO_IP_INFO instance. - @param Ip4ConfigData The IP4 configure data used to configure the ip - instance, if NULL the ip instance is reseted. If - UseDefaultAddress is set to TRUE, and the configure - operation succeeds, the default address information - is written back in this Ip4ConfigData. - - @retval EFI_STATUS The status returned by IP4->Configure or - IP4->Receive. - +/** + Configure the IP instance of this IpInfo and start the receiving if Ip4ConfigData + is not NULL. + + @param IpInfo Pointer to the IP_IO_IP_INFO instance. + @param Ip4ConfigData The IP4 configure data used to configure the ip + instance, if NULL the ip instance is reseted. If + UseDefaultAddress is set to TRUE, and the configure + operation succeeds, the default address information + is written back in this Ip4ConfigData. + + @retval EFI_STATUS The status returned by IP4->Configure or + IP4->Receive. + **/ EFI_STATUS EFIAPI @@ -316,15 +315,15 @@ IpIoConfigIp ( IN OUT EFI_IP4_CONFIG_DATA *Ip4ConfigData OPTIONAL ); -/** - Destroy an IP instance maintained in IpIo->IpList for - sending purpose. - - @param IpIo Pointer to the IP_IO instance. - @param IpInfo Pointer to the IpInfo to be removed. - - @return None. - +/** + Destroy an IP instance maintained in IpIo->IpList for + sending purpose. + + @param IpIo Pointer to the IP_IO instance. + @param IpInfo Pointer to the IpInfo to be removed. + + @return None. + **/ VOID EFIAPI @@ -333,16 +332,16 @@ IpIoRemoveIp ( IN IP_IO_IP_INFO *IpInfo ); -/** - Find the first IP protocol maintained in IpIo whose local - address is the same with Src. - - @param IpIo Pointer to the pointer of the IP_IO instance. - @param Src The local IP address. - - @return Pointer to the IP protocol can be used for sending purpose and its local - @return address is the same with Src. - +/** + Find the first IP protocol maintained in IpIo whose local + address is the same with Src. + + @param IpIo Pointer to the pointer of the IP_IO instance. + @param Src The local IP address. + + @return Pointer to the IP protocol can be used for sending purpose and its local + @return address is the same with Src. + **/ IP_IO_IP_INFO * EFIAPI @@ -351,19 +350,19 @@ IpIoFindSender ( IN IP4_ADDR Src ); -/** - Get the ICMP error map information, the ErrorStatus will be returned. - The IsHard and Notify are optional. If they are not NULL, this rouine will - fill them. - We move IcmpErrMap[] to local variable to enable EBC build. - - @param IcmpError IcmpError Type - @param IsHard Whether it is a hard error - @param Notify Whether it need to notify SockError - - @return ICMP Error Status - -**/ +/** + Get the ICMP error map information, the ErrorStatus will be returned. + The IsHard and Notify are optional. If they are not NULL, this rouine will + fill them. + We move IcmpErrMap[] to local variable to enable EBC build. + + @param IcmpError IcmpError Type + @param IsHard Whether it is a hard error + @param Notify Whether it need to notify SockError + + @return ICMP Error Status + +**/ EFI_STATUS EFIAPI IpIoGetIcmpErrStatus ( diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h index 7cf89a0..636ec81 100644 --- a/MdeModulePkg/Include/Library/NetLib.h +++ b/MdeModulePkg/Include/Library/NetLib.h @@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _NET_LIB_H_ #define _NET_LIB_H_ -#include #include #include #include @@ -735,14 +734,14 @@ NetLibDispatchDpc ( VOID ); -/** - This is the default unload handle for all the network drivers. - - @param ImageHandle The drivers' driver image. - - @retval EFI_SUCCESS The image is unloaded. - @retval Others Failed to unload the image. - +/** + This is the default unload handle for all the network drivers. + + @param ImageHandle The drivers' driver image. + + @retval EFI_SUCCESS The image is unloaded. + @retval Others Failed to unload the image. + **/ EFI_STATUS EFIAPI @@ -1266,15 +1265,15 @@ NetbufQueCopy ( IN UINT8 *Dest ); -/** - Trim some data from the queue header, release the buffer if - whole buffer is trimmed. - - @param NbufQue Pointer to the net buffer queue. - @param Len Length of the data to trim. - - @retval UINTN The length of the data trimmed. - +/** + Trim some data from the queue header, release the buffer if + whole buffer is trimmed. + + @param NbufQue Pointer to the net buffer queue. + @param Len Length of the data to trim. + + @retval UINTN The length of the data trimmed. + **/ UINT32 EFIAPI diff --git a/MdeModulePkg/Include/Library/PlatDriOverLib.h b/MdeModulePkg/Include/Library/PlatDriOverLib.h index 43d48a4..91aab5a 100644 --- a/MdeModulePkg/Include/Library/PlatDriOverLib.h +++ b/MdeModulePkg/Include/Library/PlatDriOverLib.h @@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _PLAT_DRI_OVER_LIB_H_ #define _PLAT_DRI_OVER_LIB_H_ -#include #include #include #include diff --git a/MdeModulePkg/Include/Library/PlatformBdsLib.h b/MdeModulePkg/Include/Library/PlatformBdsLib.h index 2fcb310..4740d7b 100644 --- a/MdeModulePkg/Include/Library/PlatformBdsLib.h +++ b/MdeModulePkg/Include/Library/PlatformBdsLib.h @@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef __PLATFORM_BDS_LIB_H_ #define __PLATFORM_BDS_LIB_H_ -#include #include #include diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h index ef64e94..2111172 100644 --- a/MdeModulePkg/Include/Library/UdpIoLib.h +++ b/MdeModulePkg/Include/Library/UdpIoLib.h @@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _UDP4IO_H_ #define _UDP4IO_H_ -#include - #include #include @@ -204,14 +202,14 @@ UdpIoSendDatagram ( IN VOID *Context ); -/** - Cancel a single sent datagram. - - @param UdpIo The UDP IO port to cancel the packet from - @param Packet The packet to cancel - - @return None - +/** + Cancel a single sent datagram. + + @param UdpIo The UDP IO port to cancel the packet from + @param Packet The packet to cancel + + @return None + **/ VOID EFIAPI diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c index 80149b7..75aa91d 100644 --- a/MdeModulePkg/Library/GraphicsLib/Graphics.c +++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include +#include #include #include diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h index 743857c..94ae9fe 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h @@ -22,6 +22,8 @@ Abstract: #ifndef _ISCSI_IMPL_H_ #define _ISCSI_IMPL_H_ +#include + #include #include #include diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c index 72c3a72..f97c34f 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c @@ -20,6 +20,7 @@ Abstract: **/ +#include #include #include diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c index 98b6ddd..fc53f0e 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c @@ -20,11 +20,11 @@ Abstract: **/ +#include "MnpImpl.h" #include #include #include #include -#include "MnpImpl.h" /** -- cgit v1.1