sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean-up MdeModulePkg/Include/Protocol.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7192 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
eric_tian
2009-01-06 06:54:29 +00:00
parent f497011482
commit c351b60d13
6 changed files with 22 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MdeModulePkg/Include/Protocol/DiskInfo.h
View File

@ -45,7 +45,7 @@ EFI_STATUS
(EFIAPI *EFI_DISK_INFO_INQUIRY)( (EFIAPI *EFI_DISK_INFO_INQUIRY)(
IN EFI_DISK_INFO_PROTOCOL * This, IN EFI_DISK_INFO_PROTOCOL * This,
IN OUT VOID *InquiryData, IN OUT VOID *InquiryData,
IN OUT UINT32 *IntquiryDataSize IN OUT UINT32 *InquiryDataSize
); );

12
MdeModulePkg/Include/Protocol/Dpc.h
View File

@ -87,17 +87,17 @@ EFI_STATUS
IN EFI_DPC_PROTOCOL *This IN EFI_DPC_PROTOCOL *This
); );
// ///
// DPC Protocol structure /// DPC Protocol structure
// ///
struct _EFI_DPC_PROTOCOL { struct _EFI_DPC_PROTOCOL {
EFI_DPC_QUEUE_DPC QueueDpc; EFI_DPC_QUEUE_DPC QueueDpc;
EFI_DPC_DISPATCH_DPC DispatchDpc; EFI_DPC_DISPATCH_DPC DispatchDpc;
}; };
// ///
// DPC Protocol GUID variable /// DPC Protocol GUID variable
// ///
extern EFI_GUID gEfiDpcProtocolGuid; extern EFI_GUID gEfiDpcProtocolGuid;
#endif #endif

30
MdeModulePkg/Include/Protocol/PxeDhcp4.h
View File

@ -24,19 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define EFI_PXE_DHCP4_PROTOCOL_GUID \ #define EFI_PXE_DHCP4_PROTOCOL_GUID \
{ 0x03c4e624, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x29, 0x3f, 0xc1, 0x4d } } { 0x03c4e624, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x29, 0x3f, 0xc1, 0x4d } }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
// //
// Interface definition // Interface definition
// //
typedef struct _EFI_PXE_DHCP4_PROTOCOL EFI_PXE_DHCP4_PROTOCOL; typedef struct _EFI_PXE_DHCP4_PROTOCOL EFI_PXE_DHCP4_PROTOCOL;
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
// //
// Descriptions of the DHCP version 4 header and options can be found // Descriptions of the DHCP version 4 header and options can be found
// in RFC-2131 and RFC-2132 at www.ietf.org // in RFC-2131 and RFC-2132 at www.ietf.org
// //
#pragma pack(1) #pragma pack(1)
typedef struct { typedef struct {
@ -90,12 +86,10 @@ typedef struct {
} DHCP4_HEADER; } DHCP4_HEADER;
#pragma pack() #pragma pack()
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
// //
// DHCPv4 packet definition. Room for 576 bytes including IP and // DHCPv4 packet definition. Room for 576 bytes including IP and
// UDP header. // UDP header.
// //
#define DHCP4_MAX_PACKET_SIZE 576 #define DHCP4_MAX_PACKET_SIZE 576
#define DHCP4_UDP_HEADER_SIZE 8 #define DHCP4_UDP_HEADER_SIZE 8
#define DHCP4_IP_HEADER_SIZE 20 #define DHCP4_IP_HEADER_SIZE 20
@ -113,11 +107,9 @@ typedef union _DHCP4_PACKET {
#define DHCP4_SERVER_PORT 67 #define DHCP4_SERVER_PORT 67
#define DHCP4_CLIENT_PORT 68 #define DHCP4_CLIENT_PORT 68
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
// //
// DHCPv4 and PXE option numbers. // DHCPv4 and PXE option numbers.
// //
#define DHCP4_PAD 0 #define DHCP4_PAD 0
#define DHCP4_END 255 #define DHCP4_END 255
#define DHCP4_SUBNET_MASK 1 #define DHCP4_SUBNET_MASK 1
@ -230,11 +222,6 @@ typedef union _DHCP4_PACKET {
#define DHCP4_NETWORK_ARCHITECTURE 94 #define DHCP4_NETWORK_ARCHITECTURE 94
#define DHCP4_PLATFORM_ID 97 #define DHCP4_PLATFORM_ID 97
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
//
// DHCP4 option format.
//
#pragma pack(1) #pragma pack(1)
typedef struct { typedef struct {
UINT8 op; UINT8 op;
@ -243,7 +230,6 @@ typedef struct {
} DHCP4_OP; } DHCP4_OP;
#pragma pack() #pragma pack()
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef struct { typedef struct {
DHCP4_PACKET Discover; DHCP4_PACKET Discover;
@ -257,7 +243,6 @@ typedef struct {
BOOLEAN IsAck; BOOLEAN IsAck;
} EFI_PXE_DHCP4_DATA; } EFI_PXE_DHCP4_DATA;
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RUN)( (EFIAPI *EFI_PXE_DHCP4_RUN)(
@ -266,7 +251,6 @@ EFI_STATUS
IN OPTIONAL VOID *OpList IN OPTIONAL VOID *OpList
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_SETUP)( (EFIAPI *EFI_PXE_DHCP4_SETUP)(
@ -274,7 +258,6 @@ EFI_STATUS
IN OPTIONAL EFI_PXE_DHCP4_DATA * NewData IN OPTIONAL EFI_PXE_DHCP4_DATA * NewData
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_INIT)( (EFIAPI *EFI_PXE_DHCP4_INIT)(
@ -287,7 +270,6 @@ EFI_STATUS
#define DHCP4_MIN_SECONDS 1 #define DHCP4_MIN_SECONDS 1
#define DHCP4_MAX_SECONDS 60 #define DHCP4_MAX_SECONDS 60
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_SELECT)( (EFIAPI *EFI_PXE_DHCP4_SELECT)(
@ -296,7 +278,6 @@ EFI_STATUS
IN DHCP4_PACKET * offer IN DHCP4_PACKET * offer
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RENEW)( (EFIAPI *EFI_PXE_DHCP4_RENEW)(
@ -304,7 +285,6 @@ EFI_STATUS
UINTN seconds_timeout UINTN seconds_timeout
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_REBIND)( (EFIAPI *EFI_PXE_DHCP4_REBIND)(
@ -312,15 +292,12 @@ EFI_STATUS
UINTN seconds_timeout UINTN seconds_timeout
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RELEASE)( (EFIAPI *EFI_PXE_DHCP4_RELEASE)(
IN EFI_PXE_DHCP4_PROTOCOL * This IN EFI_PXE_DHCP4_PROTOCOL * This
); );
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#define EFI_PXE_DHCP4_PROTOCOL_REVISION 0x00010000 #define EFI_PXE_DHCP4_PROTOCOL_REVISION 0x00010000
struct _EFI_PXE_DHCP4_PROTOCOL { struct _EFI_PXE_DHCP4_PROTOCOL {
@ -335,11 +312,6 @@ struct _EFI_PXE_DHCP4_PROTOCOL {
EFI_PXE_DHCP4_DATA *Data; EFI_PXE_DHCP4_DATA *Data;
}; };
//
//
//
extern EFI_GUID gEfiPxeDhcp4ProtocolGuid; extern EFI_GUID gEfiPxeDhcp4ProtocolGuid;
#endif /* _PXEDHCP4_H_ */ #endif
/* EOF - PxeDhcp4.h */

20
MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h
View File

@ -16,24 +16,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define __PXE_DHCP4CALLBACK_H__ #define __PXE_DHCP4CALLBACK_H__
#include <Protocol/PxeDhcp4.h> #include <Protocol/PxeDhcp4.h>
//
// GUID definition
//
#define EFI_PXE_DHCP4_CALLBACK_PROTOCOL_GUID \ #define EFI_PXE_DHCP4_CALLBACK_PROTOCOL_GUID \
{ 0xc1544c01, 0x92a4, 0x4198, {0x8a, 0x84, 0x77, 0x85, 0x83, 0xc2, 0x36, 0x21 } } { 0xc1544c01, 0x92a4, 0x4198, {0x8a, 0x84, 0x77, 0x85, 0x83, 0xc2, 0x36, 0x21 } }
//
// Revision number
//
#define EFI_PXE_DHCP4_CALLBACK_INTERFACE_REVISION 0x00010000 #define EFI_PXE_DHCP4_CALLBACK_INTERFACE_REVISION 0x00010000
//
// Interface definition
//
typedef struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL EFI_PXE_DHCP4_CALLBACK_PROTOCOL; typedef struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL EFI_PXE_DHCP4_CALLBACK_PROTOCOL;
typedef enum { typedef enum {
@ -70,11 +58,7 @@ struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL {
EFI_PXE_DHCP4_CALLBACK Callback; EFI_PXE_DHCP4_CALLBACK Callback;
}; };
//
// GUID declaration
//
extern EFI_GUID gEfiPxeDhcp4CallbackProtocolGuid; extern EFI_GUID gEfiPxeDhcp4CallbackProtocolGuid;
#endif /* _PXE_DHCP4CALLBACK_H */ #endif
/* EOF - PxeDhcp4Callback.h */

24
MdeModulePkg/Include/Protocol/Tcp.h
View File

@ -20,10 +20,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/PxeBaseCode.h> #include <Protocol/PxeBaseCode.h>
// ///
// PXE Base Code protocol /// EFI Transmission Control Protocol
// ///
#define EFI_TCP_PROTOCOL_GUID \ #define EFI_TCP_PROTOCOL_GUID \
{ 0x02b3d5f2, 0xac28, 0x11d3, { 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} { 0x02b3d5f2, 0xac28, 0x11d3, { 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
@ -44,7 +43,7 @@ typedef struct {
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TCP_WRITE)( (EFIAPI *EFI_TCP_WRITE)(
IN EFI_PXE_BASE_CODE_PROTOCOL *This, IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN UINT16 OpFlags, IN UINT16 OpFlags,
IN UINT16 *UrgentPointer, IN UINT16 *UrgentPointer,
IN UINT32 *SequenceNumber, IN UINT32 *SequenceNumber,
@ -65,7 +64,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TCP_READ)( (EFIAPI *EFI_TCP_READ)(
IN EFI_PXE_BASE_CODE_PROTOCOL *This, IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN UINT16 OpFlags, IN UINT16 OpFlags,
IN OUT EFI_IP_ADDRESS *DestIp, OPTIONAL IN OUT EFI_IP_ADDRESS *DestIp, OPTIONAL
IN OUT UINT16 *DestPort, OPTIONAL IN OUT UINT16 *DestPort, OPTIONAL
@ -80,13 +79,13 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TCP_SET_PORT_FILTER)( (EFIAPI *EFI_TCP_SET_PORT_FILTER)(
IN EFI_PXE_BASE_CODE_PROTOCOL *This, IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN EFI_TCP_PORT_FILTER *NewFilter IN EFI_TCP_PORT_FILTER *NewFilter
); );
// ///
// TCP Protocol structure /// TCP Protocol structure
// ///
typedef struct _EFI_TCP_PROTOCOL { typedef struct _EFI_TCP_PROTOCOL {
EFI_TCP_WRITE TcpWrite; EFI_TCP_WRITE TcpWrite;
EFI_TCP_READ TcpRead; EFI_TCP_READ TcpRead;
@ -95,4 +94,5 @@ typedef struct _EFI_TCP_PROTOCOL {
extern EFI_GUID gEfiTcpProtocolGuid; extern EFI_GUID gEfiTcpProtocolGuid;
#endif /* _EFITCP_H */ #endif

5
MdeModulePkg/Include/VariableFormat.h
View File

@ -99,11 +99,6 @@ typedef struct {
#define VAR_HEADER_VALID_ONLY 0x7f ///< Variable header has been valid #define VAR_HEADER_VALID_ONLY 0x7f ///< Variable header has been valid
#define VAR_ADDED 0x3f ///< Variable has been completely added #define VAR_ADDED 0x3f ///< Variable has been completely added
///
/// Removed
///
#define IS_VARIABLE_STATE(_c, _Mask) (BOOLEAN) (((~_c) & (~_Mask)) != 0)
/// ///
/// Variable Data Header Structure /// Variable Data Header Structure
/// ///