diff options
Diffstat (limited to 'MdeModulePkg')
-rw-r--r-- | MdeModulePkg/Include/Protocol/DiskInfo.h | 2 | ||||
-rw-r--r-- | MdeModulePkg/Include/Protocol/Dpc.h | 12 | ||||
-rw-r--r-- | MdeModulePkg/Include/Protocol/PxeDhcp4.h | 30 | ||||
-rw-r--r-- | MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h | 20 | ||||
-rw-r--r-- | MdeModulePkg/Include/Protocol/Tcp.h | 24 | ||||
-rw-r--r-- | MdeModulePkg/Include/VariableFormat.h | 5 |
6 files changed, 22 insertions, 71 deletions
diff --git a/MdeModulePkg/Include/Protocol/DiskInfo.h b/MdeModulePkg/Include/Protocol/DiskInfo.h index cbbea8f996..9b0bbcfce5 100644 --- a/MdeModulePkg/Include/Protocol/DiskInfo.h +++ b/MdeModulePkg/Include/Protocol/DiskInfo.h @@ -45,7 +45,7 @@ EFI_STATUS (EFIAPI *EFI_DISK_INFO_INQUIRY)(
IN EFI_DISK_INFO_PROTOCOL * This,
IN OUT VOID *InquiryData,
- IN OUT UINT32 *IntquiryDataSize
+ IN OUT UINT32 *InquiryDataSize
);
diff --git a/MdeModulePkg/Include/Protocol/Dpc.h b/MdeModulePkg/Include/Protocol/Dpc.h index 40276f1012..4b667d10ec 100644 --- a/MdeModulePkg/Include/Protocol/Dpc.h +++ b/MdeModulePkg/Include/Protocol/Dpc.h @@ -87,17 +87,17 @@ EFI_STATUS IN EFI_DPC_PROTOCOL *This
);
-//
-// DPC Protocol structure
-//
+///
+/// DPC Protocol structure
+///
struct _EFI_DPC_PROTOCOL {
EFI_DPC_QUEUE_DPC QueueDpc;
EFI_DPC_DISPATCH_DPC DispatchDpc;
};
-//
-// DPC Protocol GUID variable
-//
+///
+/// DPC Protocol GUID variable
+///
extern EFI_GUID gEfiDpcProtocolGuid;
#endif
diff --git a/MdeModulePkg/Include/Protocol/PxeDhcp4.h b/MdeModulePkg/Include/Protocol/PxeDhcp4.h index a01aaa8a29..894285c7b1 100644 --- a/MdeModulePkg/Include/Protocol/PxeDhcp4.h +++ b/MdeModulePkg/Include/Protocol/PxeDhcp4.h @@ -24,19 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define EFI_PXE_DHCP4_PROTOCOL_GUID \
{ 0x03c4e624, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x29, 0x3f, 0xc1, 0x4d } }
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
//
// Interface definition
//
-
typedef struct _EFI_PXE_DHCP4_PROTOCOL EFI_PXE_DHCP4_PROTOCOL;
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
//
// Descriptions of the DHCP version 4 header and options can be found
// in RFC-2131 and RFC-2132 at www.ietf.org
//
-
#pragma pack(1)
typedef struct {
@@ -90,12 +86,10 @@ typedef struct { } DHCP4_HEADER;
#pragma pack()
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
//
// DHCPv4 packet definition. Room for 576 bytes including IP and
// UDP header.
//
-
#define DHCP4_MAX_PACKET_SIZE 576
#define DHCP4_UDP_HEADER_SIZE 8
#define DHCP4_IP_HEADER_SIZE 20
@@ -113,11 +107,9 @@ typedef union _DHCP4_PACKET { #define DHCP4_SERVER_PORT 67
#define DHCP4_CLIENT_PORT 68
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
//
// DHCPv4 and PXE option numbers.
//
-
#define DHCP4_PAD 0
#define DHCP4_END 255
#define DHCP4_SUBNET_MASK 1
@@ -230,11 +222,6 @@ typedef union _DHCP4_PACKET { #define DHCP4_NETWORK_ARCHITECTURE 94
#define DHCP4_PLATFORM_ID 97
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-//
-// DHCP4 option format.
-//
-
#pragma pack(1)
typedef struct {
UINT8 op;
@@ -243,7 +230,6 @@ typedef struct { } DHCP4_OP;
#pragma pack()
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef struct {
DHCP4_PACKET Discover;
@@ -257,7 +243,6 @@ typedef struct { BOOLEAN IsAck;
} EFI_PXE_DHCP4_DATA;
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RUN)(
@@ -266,7 +251,6 @@ EFI_STATUS IN OPTIONAL VOID *OpList
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_SETUP)(
@@ -274,7 +258,6 @@ EFI_STATUS IN OPTIONAL EFI_PXE_DHCP4_DATA * NewData
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_INIT)(
@@ -287,7 +270,6 @@ EFI_STATUS #define DHCP4_MIN_SECONDS 1
#define DHCP4_MAX_SECONDS 60
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_SELECT)(
@@ -296,7 +278,6 @@ EFI_STATUS IN DHCP4_PACKET * offer
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RENEW)(
@@ -304,7 +285,6 @@ EFI_STATUS UINTN seconds_timeout
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_REBIND)(
@@ -312,15 +292,12 @@ EFI_STATUS UINTN seconds_timeout
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef
EFI_STATUS
(EFIAPI *EFI_PXE_DHCP4_RELEASE)(
IN EFI_PXE_DHCP4_PROTOCOL * This
);
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
#define EFI_PXE_DHCP4_PROTOCOL_REVISION 0x00010000
struct _EFI_PXE_DHCP4_PROTOCOL {
@@ -335,11 +312,6 @@ struct _EFI_PXE_DHCP4_PROTOCOL { EFI_PXE_DHCP4_DATA *Data;
};
-//
-//
-//
-
extern EFI_GUID gEfiPxeDhcp4ProtocolGuid;
-#endif /* _PXEDHCP4_H_ */
-/* EOF - PxeDhcp4.h */
+#endif
diff --git a/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h b/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h index c9c7db6f68..59ea79ad4d 100644 --- a/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h +++ b/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h @@ -16,24 +16,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define __PXE_DHCP4CALLBACK_H__
#include <Protocol/PxeDhcp4.h>
-//
-// GUID definition
-//
#define EFI_PXE_DHCP4_CALLBACK_PROTOCOL_GUID \
{ 0xc1544c01, 0x92a4, 0x4198, {0x8a, 0x84, 0x77, 0x85, 0x83, 0xc2, 0x36, 0x21 } }
-
-//
-// Revision number
-//
-
#define EFI_PXE_DHCP4_CALLBACK_INTERFACE_REVISION 0x00010000
-//
-// Interface definition
-//
-
typedef struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL EFI_PXE_DHCP4_CALLBACK_PROTOCOL;
typedef enum {
@@ -70,11 +58,7 @@ struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL { EFI_PXE_DHCP4_CALLBACK Callback;
};
-//
-// GUID declaration
-//
-
extern EFI_GUID gEfiPxeDhcp4CallbackProtocolGuid;
-#endif /* _PXE_DHCP4CALLBACK_H */
-/* EOF - PxeDhcp4Callback.h */
+#endif
+
diff --git a/MdeModulePkg/Include/Protocol/Tcp.h b/MdeModulePkg/Include/Protocol/Tcp.h index d59bc8eb74..a148b7d27b 100644 --- a/MdeModulePkg/Include/Protocol/Tcp.h +++ b/MdeModulePkg/Include/Protocol/Tcp.h @@ -20,10 +20,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/PxeBaseCode.h>
-//
-// PXE Base Code protocol
-//
-
+///
+/// EFI Transmission Control Protocol
+///
#define EFI_TCP_PROTOCOL_GUID \
{ 0x02b3d5f2, 0xac28, 0x11d3, { 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}
@@ -44,7 +43,7 @@ typedef struct { typedef
EFI_STATUS
(EFIAPI *EFI_TCP_WRITE)(
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN UINT16 OpFlags,
IN UINT16 *UrgentPointer,
IN UINT32 *SequenceNumber,
@@ -65,7 +64,7 @@ EFI_STATUS typedef
EFI_STATUS
(EFIAPI *EFI_TCP_READ)(
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,
IN UINT16 OpFlags,
IN OUT EFI_IP_ADDRESS *DestIp, OPTIONAL
IN OUT UINT16 *DestPort, OPTIONAL
@@ -80,13 +79,13 @@ EFI_STATUS typedef
EFI_STATUS
(EFIAPI *EFI_TCP_SET_PORT_FILTER)(
- IN EFI_PXE_BASE_CODE_PROTOCOL *This,
- IN EFI_TCP_PORT_FILTER *NewFilter
+ IN EFI_PXE_BASE_CODE_PROTOCOL *This,
+ IN EFI_TCP_PORT_FILTER *NewFilter
);
-//
-// TCP Protocol structure
-//
+///
+/// TCP Protocol structure
+///
typedef struct _EFI_TCP_PROTOCOL {
EFI_TCP_WRITE TcpWrite;
EFI_TCP_READ TcpRead;
@@ -95,4 +94,5 @@ typedef struct _EFI_TCP_PROTOCOL { extern EFI_GUID gEfiTcpProtocolGuid;
-#endif /* _EFITCP_H */
+#endif
+
diff --git a/MdeModulePkg/Include/VariableFormat.h b/MdeModulePkg/Include/VariableFormat.h index 7c0bf1a3eb..2f7c7c6663 100644 --- a/MdeModulePkg/Include/VariableFormat.h +++ b/MdeModulePkg/Include/VariableFormat.h @@ -100,11 +100,6 @@ typedef struct { #define VAR_ADDED 0x3f ///< Variable has been completely added
///
-/// Removed
-///
-#define IS_VARIABLE_STATE(_c, _Mask) (BOOLEAN) (((~_c) & (~_Mask)) != 0)
-
-///
/// Variable Data Header Structure
///
typedef struct {
|