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
This commit is contained in:
qwang12 2008-10-14 15:34:00 +00:00
parent 0b94e31981
commit 190344219a
11 changed files with 189 additions and 194 deletions

View File

@ -22,7 +22,6 @@ Abstract:
#ifndef _DPC_LIB_H_ #ifndef _DPC_LIB_H_
#define _DPC_LIB_H_ #define _DPC_LIB_H_
#include <PiDxe.h>
#include <Protocol/Dpc.h> #include <Protocol/Dpc.h>
/** /**

View File

@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _GENERIC_BDS_LIB_H_ #ifndef _GENERIC_BDS_LIB_H_
#define _GENERIC_BDS_LIB_H_ #define _GENERIC_BDS_LIB_H_
#include <PiDxe.h>
#include <Protocol/HiiDatabase.h> #include <Protocol/HiiDatabase.h>
#include <IndustryStandard/PeImage.h> #include <IndustryStandard/PeImage.h>

View File

@ -1,5 +1,5 @@
/** @file /** @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 Copyright (c) 2005 - 2008, Intel Corporation
All rights reserved. This program and the accompanying materials 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_ #ifndef _IP_IO_H_
#define _IP_IO_H_ #define _IP_IO_H_
#include <PiDxe.h> #include <Protocol/Ip4.h>
#include <Protocol/Ip4.h> #include <Library/IpIoLib.h>
#include <Library/IpIoLib.h>
#include <Library/NetLib.h> #include <Library/NetLib.h>
// //
// type and code define for ICMP protocol error got // type and code define for ICMP protocol error got
// from IP // from IP
// //
#define ICMP_TYPE_UNREACH 3 #define ICMP_TYPE_UNREACH 3
#define ICMP_TYPE_TIMXCEED 11 #define ICMP_TYPE_TIMXCEED 11
#define ICMP_TYPE_PARAMPROB 12 #define ICMP_TYPE_PARAMPROB 12
#define ICMP_TYPE_SOURCEQUENCH 4 #define ICMP_TYPE_SOURCEQUENCH 4
#define ICMP_CODE_UNREACH_NET 0 #define ICMP_CODE_UNREACH_NET 0
#define ICMP_CODE_UNREACH_HOST 1 #define ICMP_CODE_UNREACH_HOST 1
#define ICMP_CODE_UNREACH_PROTOCOL 2 #define ICMP_CODE_UNREACH_PROTOCOL 2
#define ICMP_CODE_UNREACH_PORT 3 #define ICMP_CODE_UNREACH_PORT 3
#define ICMP_CODE_UNREACH_NEEDFRAG 4 #define ICMP_CODE_UNREACH_NEEDFRAG 4
#define ICMP_CODE_UNREACH_SRCFAIL 5 #define ICMP_CODE_UNREACH_SRCFAIL 5
#define ICMP_CODE_UNREACH_NET_UNKNOWN 6 #define ICMP_CODE_UNREACH_NET_UNKNOWN 6
#define ICMP_CODE_UNREACH_HOST_UNKNOWN 7 #define ICMP_CODE_UNREACH_HOST_UNKNOWN 7
#define ICMP_CODE_UNREACH_ISOLATED 8 #define ICMP_CODE_UNREACH_ISOLATED 8
#define ICMP_CODE_UNREACH_NET_PROHIB 9 #define ICMP_CODE_UNREACH_NET_PROHIB 9
#define ICMP_CODE_UNREACH_HOST_PROHIB 10 #define ICMP_CODE_UNREACH_HOST_PROHIB 10
#define ICMP_CODE_UNREACH_TOSNET 11 #define ICMP_CODE_UNREACH_TOSNET 11
#define ICMP_CODE_UNREACH_TOSHOST 12 #define ICMP_CODE_UNREACH_TOSHOST 12
// //
// this error will be delivered to the // this error will be delivered to the
// listening transportation layer protocol // listening transportation layer protocol
// consuming IpIO // consuming IpIO
// //
typedef enum { typedef enum {
ICMP_ERR_UNREACH_NET = 0, ICMP_ERR_UNREACH_NET = 0,
ICMP_ERR_UNREACH_HOST, ICMP_ERR_UNREACH_HOST,
ICMP_ERR_UNREACH_PROTOCOL, ICMP_ERR_UNREACH_PROTOCOL,
ICMP_ERR_UNREACH_PORT, ICMP_ERR_UNREACH_PORT,
ICMP_ERR_MSGSIZE, ICMP_ERR_MSGSIZE,
ICMP_ERR_UNREACH_SRCFAIL, ICMP_ERR_UNREACH_SRCFAIL,
ICMP_ERR_TIMXCEED_INTRANS, ICMP_ERR_TIMXCEED_INTRANS,
ICMP_ERR_TIMXCEED_REASS, ICMP_ERR_TIMXCEED_REASS,
ICMP_ERR_QUENCH, ICMP_ERR_QUENCH,
ICMP_ERR_PARAMPROB ICMP_ERR_PARAMPROB
} ICMP_ERROR; } ICMP_ERROR;
typedef struct _ICMP_ERROR_INFO { typedef struct _ICMP_ERROR_INFO {
BOOLEAN IsHard; BOOLEAN IsHard;
BOOLEAN Notify; BOOLEAN Notify;
} ICMP_ERROR_INFO; } ICMP_ERROR_INFO;
#define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2) #define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)
@ -170,15 +169,15 @@ typedef struct _IP_IO_IP_INFO {
INTN RefCnt; INTN RefCnt;
} IP_IO_IP_INFO; } IP_IO_IP_INFO;
/** /**
Create a new IP_IO instance. Create a new IP_IO instance.
@param Image The image handle of an IP_IO consumer protocol. @param Image The image handle of an IP_IO consumer protocol.
@param Controller The controller handle of an IP_IO consumer protocol @param Controller The controller handle of an IP_IO consumer protocol
installed on. installed on.
@return Pointer to a newly created IP_IO instance. @return Pointer to a newly created IP_IO instance.
**/ **/
IP_IO * IP_IO *
EFIAPI EFIAPI
@ -187,15 +186,15 @@ IpIoCreate (
IN EFI_HANDLE Controller IN EFI_HANDLE Controller
); );
/** /**
Destroy an IP_IO instance. Destroy an IP_IO instance.
@param IpIo Pointer to the IP_IO instance that needs to @param IpIo Pointer to the IP_IO instance that needs to
destroy. destroy.
@retval EFI_SUCCESS The IP_IO instance destroyed successfully. @retval EFI_SUCCESS The IP_IO instance destroyed successfully.
@retval other Error condition occurred. @retval other Error condition occurred.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -203,14 +202,14 @@ IpIoDestroy (
IN IP_IO *IpIo IN IP_IO *IpIo
); );
/** /**
Stop an IP_IO instance. Stop an IP_IO instance.
@param IpIo Pointer to the IP_IO instance that needs to stop. @param IpIo Pointer to the IP_IO instance that needs to stop.
@retval EFI_SUCCESS The IP_IO instance stopped successfully. @retval EFI_SUCCESS The IP_IO instance stopped successfully.
@retval other Error condition occurred. @retval other Error condition occurred.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -218,16 +217,16 @@ IpIoStop (
IN IP_IO *IpIo IN IP_IO *IpIo
); );
/** /**
Open an IP_IO instance for use. Open an IP_IO instance for use.
@param IpIo Pointer to an IP_IO instance that needs to open. @param IpIo Pointer to an IP_IO instance that needs to open.
@param OpenData The configuration data for the IP_IO instance. @param OpenData The configuration data for the IP_IO instance.
@retval EFI_SUCCESS The IP_IO instance opened with OpenData @retval EFI_SUCCESS The IP_IO instance opened with OpenData
successfully. successfully.
@retval other Error condition occurred. @retval other Error condition occurred.
**/ **/
EFI_STATUS EFI_STATUS
IpIoOpen ( IpIoOpen (
@ -235,23 +234,23 @@ IpIoOpen (
IN IP_IO_OPEN_DATA *OpenData IN IP_IO_OPEN_DATA *OpenData
); );
/** /**
Send out an IP packet. Send out an IP packet.
@param IpIo Pointer to an IP_IO instance used for sending IP @param IpIo Pointer to an IP_IO instance used for sending IP
packet. packet.
@param Pkt Pointer to the IP packet to be sent. @param Pkt Pointer to the IP packet to be sent.
@param Sender The IP protocol instance used for sending. @param Sender The IP protocol instance used for sending.
@param Context @param Context
@param NotifyData @param NotifyData
@param Dest The destination IP address to send this packet to. @param Dest The destination IP address to send this packet to.
@param OverrideData The data to override some configuration of the IP @param OverrideData The data to override some configuration of the IP
instance used for sending. instance used for sending.
@retval EFI_SUCCESS The operation is completed successfully. @retval EFI_SUCCESS The operation is completed successfully.
@retval EFI_NOT_STARTED The IpIo is not configured. @retval EFI_NOT_STARTED The IpIo is not configured.
@retval EFI_OUT_OF_RESOURCES Failed due to resource limit. @retval EFI_OUT_OF_RESOURCES Failed due to resource limit.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -265,11 +264,11 @@ IpIoSend (
IN IP_IO_OVERRIDE *OverrideData IN IP_IO_OVERRIDE *OverrideData
); );
/** /**
Cancel the IP transmit token which wraps this Packet. Cancel the IP transmit token which wraps this Packet.
@param IpIo Pointer to the IP_IO instance. @param IpIo Pointer to the IP_IO instance.
@param Packet Pointer to the packet to cancel. @param Packet Pointer to the packet to cancel.
**/ **/
VOID VOID
@ -279,14 +278,14 @@ IpIoCancelTxToken (
IN VOID *Packet IN VOID *Packet
); );
/** /**
Add a new IP instance for sending data. Add a new IP instance for sending data.
@param IpIo Pointer to a IP_IO instance to add a new IP @param IpIo Pointer to a IP_IO instance to add a new IP
instance for sending purpose. instance for sending purpose.
@return Pointer to the created IP_IO_IP_INFO structure, NULL is failed. @return Pointer to the created IP_IO_IP_INFO structure, NULL is failed.
**/ **/
IP_IO_IP_INFO * IP_IO_IP_INFO *
EFIAPI EFIAPI
@ -294,20 +293,20 @@ IpIoAddIp (
IN IP_IO *IpIo IN IP_IO *IpIo
); );
/** /**
Configure the IP instance of this IpInfo and start the receiving if Ip4ConfigData Configure the IP instance of this IpInfo and start the receiving if Ip4ConfigData
is not NULL. is not NULL.
@param IpInfo Pointer to the IP_IO_IP_INFO instance. @param IpInfo Pointer to the IP_IO_IP_INFO instance.
@param Ip4ConfigData The IP4 configure data used to configure the ip @param Ip4ConfigData The IP4 configure data used to configure the ip
instance, if NULL the ip instance is reseted. If instance, if NULL the ip instance is reseted. If
UseDefaultAddress is set to TRUE, and the configure UseDefaultAddress is set to TRUE, and the configure
operation succeeds, the default address information operation succeeds, the default address information
is written back in this Ip4ConfigData. is written back in this Ip4ConfigData.
@retval EFI_STATUS The status returned by IP4->Configure or @retval EFI_STATUS The status returned by IP4->Configure or
IP4->Receive. IP4->Receive.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -316,15 +315,15 @@ IpIoConfigIp (
IN OUT EFI_IP4_CONFIG_DATA *Ip4ConfigData OPTIONAL IN OUT EFI_IP4_CONFIG_DATA *Ip4ConfigData OPTIONAL
); );
/** /**
Destroy an IP instance maintained in IpIo->IpList for Destroy an IP instance maintained in IpIo->IpList for
sending purpose. sending purpose.
@param IpIo Pointer to the IP_IO instance. @param IpIo Pointer to the IP_IO instance.
@param IpInfo Pointer to the IpInfo to be removed. @param IpInfo Pointer to the IpInfo to be removed.
@return None. @return None.
**/ **/
VOID VOID
EFIAPI EFIAPI
@ -333,16 +332,16 @@ IpIoRemoveIp (
IN IP_IO_IP_INFO *IpInfo IN IP_IO_IP_INFO *IpInfo
); );
/** /**
Find the first IP protocol maintained in IpIo whose local Find the first IP protocol maintained in IpIo whose local
address is the same with Src. address is the same with Src.
@param IpIo Pointer to the pointer of the IP_IO instance. @param IpIo Pointer to the pointer of the IP_IO instance.
@param Src The local IP address. @param Src The local IP address.
@return Pointer to the IP protocol can be used for sending purpose and its local @return Pointer to the IP protocol can be used for sending purpose and its local
@return address is the same with Src. @return address is the same with Src.
**/ **/
IP_IO_IP_INFO * IP_IO_IP_INFO *
EFIAPI EFIAPI
@ -351,19 +350,19 @@ IpIoFindSender (
IN IP4_ADDR Src IN IP4_ADDR Src
); );
/** /**
Get the ICMP error map information, the ErrorStatus will be returned. 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 The IsHard and Notify are optional. If they are not NULL, this rouine will
fill them. fill them.
We move IcmpErrMap[] to local variable to enable EBC build. We move IcmpErrMap[] to local variable to enable EBC build.
@param IcmpError IcmpError Type @param IcmpError IcmpError Type
@param IsHard Whether it is a hard error @param IsHard Whether it is a hard error
@param Notify Whether it need to notify SockError @param Notify Whether it need to notify SockError
@return ICMP Error Status @return ICMP Error Status
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
IpIoGetIcmpErrStatus ( IpIoGetIcmpErrStatus (

View File

@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _NET_LIB_H_ #ifndef _NET_LIB_H_
#define _NET_LIB_H_ #define _NET_LIB_H_
#include <PiDxe.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Protocol/DriverBinding.h> #include <Protocol/DriverBinding.h>
@ -735,14 +734,14 @@ NetLibDispatchDpc (
VOID VOID
); );
/** /**
This is the default unload handle for all the network drivers. This is the default unload handle for all the network drivers.
@param ImageHandle The drivers' driver image. @param ImageHandle The drivers' driver image.
@retval EFI_SUCCESS The image is unloaded. @retval EFI_SUCCESS The image is unloaded.
@retval Others Failed to unload the image. @retval Others Failed to unload the image.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -1266,15 +1265,15 @@ NetbufQueCopy (
IN UINT8 *Dest IN UINT8 *Dest
); );
/** /**
Trim some data from the queue header, release the buffer if Trim some data from the queue header, release the buffer if
whole buffer is trimmed. whole buffer is trimmed.
@param NbufQue Pointer to the net buffer queue. @param NbufQue Pointer to the net buffer queue.
@param Len Length of the data to trim. @param Len Length of the data to trim.
@retval UINTN The length of the data trimmed. @retval UINTN The length of the data trimmed.
**/ **/
UINT32 UINT32
EFIAPI EFIAPI

View File

@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _PLAT_DRI_OVER_LIB_H_ #ifndef _PLAT_DRI_OVER_LIB_H_
#define _PLAT_DRI_OVER_LIB_H_ #define _PLAT_DRI_OVER_LIB_H_
#include <PiDxe.h>
#include <Protocol/PlatformDriverOverride.h> #include <Protocol/PlatformDriverOverride.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
#include <Protocol/DriverBinding.h> #include <Protocol/DriverBinding.h>

View File

@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef __PLATFORM_BDS_LIB_H_ #ifndef __PLATFORM_BDS_LIB_H_
#define __PLATFORM_BDS_LIB_H_ #define __PLATFORM_BDS_LIB_H_
#include <PiDxe.h>
#include <Protocol/Bds.h> #include <Protocol/Bds.h>
#include <Protocol/GenericMemoryTest.h> #include <Protocol/GenericMemoryTest.h>

View File

@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _UDP4IO_H_ #ifndef _UDP4IO_H_
#define _UDP4IO_H_ #define _UDP4IO_H_
#include <PiDxe.h>
#include <Protocol/Udp4.h> #include <Protocol/Udp4.h>
#include <Library/UdpIoLib.h> #include <Library/UdpIoLib.h>
@ -204,14 +202,14 @@ UdpIoSendDatagram (
IN VOID *Context IN VOID *Context
); );
/** /**
Cancel a single sent datagram. Cancel a single sent datagram.
@param UdpIo The UDP IO port to cancel the packet from @param UdpIo The UDP IO port to cancel the packet from
@param Packet The packet to cancel @param Packet The packet to cancel
@return None @return None
**/ **/
VOID VOID
EFIAPI EFIAPI

View File

@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#include <Uefi.h> #include <PiDxe.h>
#include <Protocol/SimpleTextOut.h> #include <Protocol/SimpleTextOut.h>
#include <Protocol/OEMBadging.h> #include <Protocol/OEMBadging.h>

View File

@ -22,6 +22,8 @@ Abstract:
#ifndef _ISCSI_IMPL_H_ #ifndef _ISCSI_IMPL_H_
#define _ISCSI_IMPL_H_ #define _ISCSI_IMPL_H_
#include <Uefi.h>
#include <Library/NetLib.h> #include <Library/NetLib.h>
#include <Library/PrintLib.h> #include <Library/PrintLib.h>
#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/UefiRuntimeServicesTableLib.h>

View File

@ -20,6 +20,7 @@ Abstract:
**/ **/
#include <Uefi.h>
#include <Library/NetLib.h> #include <Library/NetLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>

View File

@ -20,11 +20,11 @@ Abstract:
**/ **/
#include "MnpImpl.h"
#include <Library/NetLib.h> #include <Library/NetLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include "MnpImpl.h"
/** /**