fixed more issues by scrubbing.

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

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h
index 4e5c806b7b7828502e1d955de45c9ca5e4c934c0..9639136a38dd8e5863d99ab6461dc9a2ee9ed80b 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h
@@ -10,13 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-  PxeArch.h\r
-\r
-Abstract:\r
-  Defines PXE Arch type\r
-\r
-\r
 **/\r
 \r
 #ifndef _EFI_PXE_ARCH_H_\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index 76ebaca143dd7893fc502145e645d1b1af205660..0abfb62e67f1c6a754bdb7e975a6bd56e05d114e 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
@@ -309,8 +309,7 @@ VOID
 PxeBcInitSeedPacket (\r
   IN EFI_DHCP4_PACKET  *Seed,\r
   IN EFI_UDP4_PROTOCOL *Udp4\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -318,18 +317,17 @@ PxeBcInitSeedPacket (
 \r
   @param  CachedPacket  Pointer to cached dhcp packet.\r
 \r
-  @retval TRUE          Success to parse and validation.\r
+  @retval TRUE          Succeed to parse and validation.\r
   @retval FALSE         Fail to parse or validation.\r
 \r
 **/\r
 BOOLEAN\r
 PxeBcParseCachedDhcpPacket (\r
   IN PXEBC_CACHED_DHCP4_PACKET  *CachedPacket\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
-  This function is to check the selected proxy offer(include BINL dhcp offer and\r
+  This function is to check the selected proxy offer (include BINL dhcp offer and\r
   DHCP_ONLY offer ) and set the flag and copy the DHCP packets to the Pxe base code\r
   mode structure.\r
 \r
@@ -342,8 +340,7 @@ PxeBcParseCachedDhcpPacket (
 EFI_STATUS\r
 PxeBcCheckSelectedOffer (\r
   IN PXEBC_PRIVATE_DATA  *Private\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -383,8 +380,7 @@ PxeBcDhcpCallBack (
   IN EFI_DHCP4_EVENT                   Dhcp4Event,\r
   IN EFI_DHCP4_PACKET                  * Packet OPTIONAL,\r
   OUT EFI_DHCP4_PACKET                 **NewPacket OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -393,14 +389,14 @@ PxeBcDhcpCallBack (
   @param  Private               Pointer to PxeBc private data.\r
   @param  Type                  PxeBc option boot item type\r
   @param  Layer                 PxeBc option boot item layer\r
-  @param  UseBis                use bios or not\r
-  @param  DestIp                ip address for server      \r
-  @param  IpCount               the total of the server ip address    \r
-  @param  SrvList               server list\r
-  @param  IsDiscv               discover the vendor or not\r
-  @param  Reply                 the dhcp4 packet of Pxe reply\r
-\r
-  @retval EFI_SUCCESS           operational success.\r
+  @param  UseBis                Use BIS or not\r
+  @param  DestIp                Ip address for server      \r
+  @param  IpCount               The total count of the server ip address    \r
+  @param  SrvList               Server list\r
+  @param  IsDiscv               Discover the vendor or not\r
+  @param  Reply                 The dhcp4 packet of Pxe reply\r
+\r
+  @retval EFI_SUCCESS           Operation succeeds.\r
   @retval EFI_OUT_OF_RESOURCES  Allocate memory pool failed.\r
   @retval EFI_NOT_FOUND         There is no vendor option exists.\r
   @retval EFI_TIMEOUT           Send Pxe Discover time out. \r
@@ -417,8 +413,7 @@ PxeBcDiscvBootService (
   IN EFI_PXE_BASE_CODE_SRVLIST         * SrvList,\r
   IN BOOLEAN                           IsDiscv,\r
   OUT EFI_DHCP4_PACKET                 * Reply OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -437,8 +432,7 @@ PxeBcBuildDhcpOptions (
   IN PXEBC_PRIVATE_DATA            *Private,\r
   IN EFI_DHCP4_PACKET_OPTION       **OptList,\r
   IN BOOLEAN                       IsDhcpDiscover\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -458,18 +452,17 @@ PxeBcCreateBootOptions (
   IN  UINT16                           Type,\r
   IN  UINT16                           *Layer,\r
   OUT UINT32                           *OptLen\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
   Parse interested dhcp options.\r
 \r
   @param  Buffer     Pointer to the dhcp options packet.\r
-  @param  Length     the length of the dhcp options.\r
-  @param  OptTag     the option OpCode.\r
+  @param  Length     The length of the dhcp options.\r
+  @param  OptTag     The option OpCode.\r
 \r
-  @return Return NULL if the buffer length is 0 and OpCode is not \r
+  @return NULL if the buffer length is 0 and OpCode is not \r
           PXEBC_DHCP4_TAG_EOP, or the pointer to the buffer.\r
 \r
 **/\r
@@ -478,8 +471,7 @@ PxeBcParseExtendOptions (
   IN UINT8                         *Buffer,\r
   IN UINT32                        Length,\r
   IN UINT8                         OptTag\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -488,15 +480,14 @@ PxeBcParseExtendOptions (
   @param  Dhcp4Option           Pointer to dhcp options\r
   @param  VendorOption          Pointer to vendor options\r
 \r
-  @return Return TRUE if valid for vendor options, or FALSE.\r
+  @return TRUE if valid for vendor options, or FALSE.\r
 \r
 **/\r
 BOOLEAN\r
 PxeBcParseVendorOptions (\r
   IN EFI_DHCP4_PACKET_OPTION       *Dhcp4Option,\r
-  IN PXEBC_VENDOR_OPTION          *VendorOption\r
-  )\r
-;\r
+  IN PXEBC_VENDOR_OPTION           *VendorOption\r
+  );\r
 \r
 \r
 /**\r
@@ -514,8 +505,7 @@ PxeBcParseVendorOptions (
 EFI_STATUS\r
 PxeBcSelectBootPrompt (\r
   IN PXEBC_PRIVATE_DATA              *Private\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -535,8 +525,7 @@ PxeBcSelectBootMenu (
   IN  PXEBC_PRIVATE_DATA              *Private,\r
   OUT UINT16                          *Type,\r
   IN  BOOLEAN                         UseDefaultItem\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index f6845bfb35eb4546fea9cf7163e82706f95e9b59..82a19d75177abcf4c654aa6f7eae927a2b1d6906 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -1,5 +1,5 @@
 /** @file\r
-  The driver binding for IP4 CONFIG protocol.\r
+  The driver binding for UEFI PXEBC protocol.\r
   \r
 Copyright (c) 2007 - 2008, Intel Corporation.<BR>\r
 All rights reserved. This program and the accompanying materials\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
index 8c2ce37e1ef89b090ac955f6324926e772828412..2ef04506264b10c35abbd37539259e18107bd0c3 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
@@ -46,8 +46,7 @@ PxeBcTftpGetFileSize (
   IN UINT8                      *Filename,\r
   IN UINTN                      *BlockSize,\r
   IN OUT UINT64                 *BufferSize\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -64,6 +63,7 @@ PxeBcTftpGetFileSize (
   @retval EFI_SUCCESS        Read the data success from the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Read data from file failed.\r
+  \r
 **/\r
 EFI_STATUS\r
 PxeBcTftpReadFile (\r
@@ -74,8 +74,7 @@ PxeBcTftpReadFile (
   IN UINT8                      *BufferPtr,\r
   IN OUT UINT64                 *BufferSize,\r
   IN BOOLEAN                    DontUseBuffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -92,7 +91,7 @@ PxeBcTftpReadFile (
   @retval EFI_SUCCESS        Write the data success into the special file.\r
   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.\r
   @retval other              Write data into file failed.\r
-\r
+  \r
 **/\r
 EFI_STATUS\r
 PxeBcTftpWriteFile (\r
@@ -103,8 +102,7 @@ PxeBcTftpWriteFile (
   IN UINTN                      *BlockSize,\r
   IN UINT8                      *BufferPtr,\r
   IN OUT UINT64                 *BufferSize\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -132,8 +130,7 @@ PxeBcTftpReadDirectory (
   IN UINT8                         *BufferPtr,\r
   IN OUT UINT64                    *BufferSize,\r
   IN BOOLEAN                       DontUseBuffer\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
index fd6429ea5ab4657f2a94bc6e54e4847cc4c291c5..82a0030d67449de43258b7aec7597bf7c11d40ad 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
@@ -45,8 +45,7 @@ VOID
 PxeBcCommonNotify (\r
   IN EFI_EVENT           Event,\r
   IN VOID                *Context\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
@@ -101,8 +100,8 @@ CvtNum (
 /**\r
   Convert unsigned int number to decimal number.\r
 \r
-  @param  Number      The unsigned int number will be converted.\r
-  @param  Buffer      Pointer to the buffer to store the decimal number after transform.\r
+  @param  Number   The unsigned int number will be converted.\r
+  @param  Buffer   Pointer to the buffer to store the decimal number after transform.\r
 \r
   @return the length of the number after transform.\r
 \r
@@ -111,23 +110,21 @@ UINTN
 UtoA10 (\r
   IN UINTN Number,\r
   IN CHAR8 *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 /**\r
   Convert ASCII numeric string to a UINTN value.\r
 \r
   @param  Buffer  Pointer to the 8-byte unsigned int value.\r
-  \r
+\r
   @return UINTN value of the ASCII string.\r
 \r
 **/\r
 UINT64\r
 AtoU64 (\r
   IN UINT8 *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 \r
 #endif\r