clean-up MdeModulePkg/Include/Protocol.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7192 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Include/Protocol/DiskInfo.h b/MdeModulePkg/Include/Protocol/DiskInfo.h
index cbbea8f9967fc048571237727dc87561246b497c..9b0bbcfce522b13e17b8e7638feaa760d2578fc2 100644 (file)
--- a/MdeModulePkg/Include/Protocol/DiskInfo.h
+++ b/MdeModulePkg/Include/Protocol/DiskInfo.h
@@ -45,7 +45,7 @@ EFI_STATUS
 (EFIAPI *EFI_DISK_INFO_INQUIRY)(\r
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   IN OUT VOID                         *InquiryData,\r
-  IN OUT UINT32                       *IntquiryDataSize\r
+  IN OUT UINT32                       *InquiryDataSize\r
   );\r
 \r
 \r

diff --git a/MdeModulePkg/Include/Protocol/Dpc.h b/MdeModulePkg/Include/Protocol/Dpc.h
index 40276f1012597c1b7e9f61642c5e2a9768324b3b..4b667d10ecbeba28f06f056c2d4b2fb679d73574 100644 (file)
--- a/MdeModulePkg/Include/Protocol/Dpc.h
+++ b/MdeModulePkg/Include/Protocol/Dpc.h
@@ -87,17 +87,17 @@ EFI_STATUS
   IN EFI_DPC_PROTOCOL  *This\r
   );\r
 \r
-//\r
-// DPC Protocol structure\r
-//\r
+///\r
+/// DPC Protocol structure\r
+///\r
 struct _EFI_DPC_PROTOCOL {\r
   EFI_DPC_QUEUE_DPC     QueueDpc;\r
   EFI_DPC_DISPATCH_DPC  DispatchDpc;\r
 };\r
 \r
-//\r
-// DPC Protocol GUID variable\r
-//\r
+///\r
+/// DPC Protocol GUID variable\r
+///\r
 extern EFI_GUID gEfiDpcProtocolGuid;\r
 \r
 #endif\r

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

diff --git a/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h b/MdeModulePkg/Include/Protocol/PxeDhcp4CallBack.h
index c9c7db6f681b1678309109f1643885ab536e8ab5..59ea79ad4dddd91921a1a5bea914ede67a2e453a 100644 (file)
--- 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__\r
 \r
 #include <Protocol/PxeDhcp4.h>\r
-//\r
-// GUID definition\r
-//\r
 \r
 #define EFI_PXE_DHCP4_CALLBACK_PROTOCOL_GUID \\r
 { 0xc1544c01, 0x92a4, 0x4198, {0x8a, 0x84, 0x77, 0x85, 0x83, 0xc2, 0x36, 0x21 } }\r
 \r
-\r
-//\r
-// Revision number\r
-//\r
-\r
 #define EFI_PXE_DHCP4_CALLBACK_INTERFACE_REVISION   0x00010000\r
 \r
-//\r
-// Interface definition\r
-//\r
-\r
 typedef struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL EFI_PXE_DHCP4_CALLBACK_PROTOCOL;\r
 \r
 typedef enum {\r
@@ -70,11 +58,7 @@ struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL {
   EFI_PXE_DHCP4_CALLBACK      Callback;\r
 };\r
 \r
-//\r
-// GUID declaration\r
-//\r
-\r
 extern EFI_GUID gEfiPxeDhcp4CallbackProtocolGuid;\r
 \r
-#endif /* _PXE_DHCP4CALLBACK_H */\r
-/* EOF - PxeDhcp4Callback.h */\r
+#endif\r
+\r

diff --git a/MdeModulePkg/Include/Protocol/Tcp.h b/MdeModulePkg/Include/Protocol/Tcp.h
index d59bc8eb74562cc03fc25c5669ff37fa6a0e8895..a148b7d27b54f2bff164e687cc6a7b17a0996e92 100644 (file)
--- 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.
 \r
 #include <Protocol/PxeBaseCode.h>\r
 \r
-//\r
-// PXE Base Code protocol\r
-//\r
-\r
+///\r
+/// EFI Transmission Control Protocol\r
+///\r
 #define EFI_TCP_PROTOCOL_GUID \\r
     { 0x02b3d5f2, 0xac28, 0x11d3, { 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }}\r
 \r
@@ -44,7 +43,7 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCP_WRITE)(\r
-    IN EFI_PXE_BASE_CODE_PROTOCOL        *This,\r
+    IN EFI_PXE_BASE_CODE_PROTOCOL                *This,\r
     IN UINT16                                    OpFlags,\r
     IN UINT16                                    *UrgentPointer,\r
     IN UINT32                                    *SequenceNumber,\r
@@ -65,7 +64,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCP_READ)(\r
-    IN EFI_PXE_BASE_CODE_PROTOCOL        *This,\r
+    IN EFI_PXE_BASE_CODE_PROTOCOL                *This,\r
     IN UINT16                                    OpFlags,\r
     IN OUT EFI_IP_ADDRESS                        *DestIp,      OPTIONAL\r
     IN OUT UINT16                                *DestPort,    OPTIONAL\r
@@ -80,13 +79,13 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCP_SET_PORT_FILTER)(\r
-    IN EFI_PXE_BASE_CODE_PROTOCOL    *This,\r
-    IN EFI_TCP_PORT_FILTER                   *NewFilter\r
+    IN EFI_PXE_BASE_CODE_PROTOCOL                *This,\r
+    IN EFI_TCP_PORT_FILTER                       *NewFilter\r
     );\r
 \r
-//\r
-// TCP Protocol structure\r
-//\r
+///\r
+/// TCP Protocol structure\r
+///\r
 typedef struct _EFI_TCP_PROTOCOL {\r
     EFI_TCP_WRITE             TcpWrite;\r
     EFI_TCP_READ              TcpRead;\r
@@ -95,4 +94,5 @@ typedef struct _EFI_TCP_PROTOCOL {
 \r
 extern EFI_GUID gEfiTcpProtocolGuid;\r
 \r
-#endif /* _EFITCP_H */\r
+#endif\r
+\r

diff --git a/MdeModulePkg/Include/VariableFormat.h b/MdeModulePkg/Include/VariableFormat.h
index 7c0bf1a3eb1188c71c4b80530e188cfc9c847bf1..2f7c7c6663b70483d08132cfce2138fb768b1ee1 100644 (file)
--- a/MdeModulePkg/Include/VariableFormat.h
+++ b/MdeModulePkg/Include/VariableFormat.h
@@ -99,11 +99,6 @@ typedef struct {
 #define VAR_HEADER_VALID_ONLY         0x7f  ///< Variable header has been valid\r
 #define VAR_ADDED                     0x3f  ///< Variable has been completely added\r
 \r
-///\r
-/// Removed\r
-///\r
-#define IS_VARIABLE_STATE(_c, _Mask)  (BOOLEAN) (((~_c) & (~_Mask)) != 0)\r
-\r
 ///\r
 /// Variable Data Header Structure\r
 ///\r