fixed more issues by scrubbing.

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

5 files changed, 39 insertions, 63 deletions

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/Ipf/PxeArch.h
index 4e5c806b7b..9639136a38 100644
--- 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,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-Module Name:

-  PxeArch.h

-

-Abstract:

-  Defines PXE Arch type

-

-

 **/

 

 #ifndef _EFI_PXE_ARCH_H_

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index 76ebaca143..0abfb62e67 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
@@ -309,8 +309,7 @@ VOID
 PxeBcInitSeedPacket (

   IN EFI_DHCP4_PACKET  *Seed,

   IN EFI_UDP4_PROTOCOL *Udp4

-  )

-;

+  );

 

 

 /**

@@ -318,18 +317,17 @@ PxeBcInitSeedPacket (
 

   @param  CachedPacket  Pointer to cached dhcp packet.

 

-  @retval TRUE          Success to parse and validation.

+  @retval TRUE          Succeed to parse and validation.

   @retval FALSE         Fail to parse or validation.

 

 **/

 BOOLEAN

 PxeBcParseCachedDhcpPacket (

   IN PXEBC_CACHED_DHCP4_PACKET  *CachedPacket

-  )

-;

+  );

 

 /**

-  This function is to check the selected proxy offer(include BINL dhcp offer and

+  This function is to check the selected proxy offer (include BINL dhcp offer and

   DHCP_ONLY offer ) and set the flag and copy the DHCP packets to the Pxe base code

   mode structure.

 

@@ -342,8 +340,7 @@ PxeBcParseCachedDhcpPacket (
 EFI_STATUS

 PxeBcCheckSelectedOffer (

   IN PXEBC_PRIVATE_DATA  *Private

-  )

-;

+  );

 

 

 /**

@@ -383,8 +380,7 @@ PxeBcDhcpCallBack (
   IN EFI_DHCP4_EVENT                   Dhcp4Event,

   IN EFI_DHCP4_PACKET                  * Packet OPTIONAL,

   OUT EFI_DHCP4_PACKET                 **NewPacket OPTIONAL

-  )

-;

+  );

 

 

 /**

@@ -393,14 +389,14 @@ PxeBcDhcpCallBack (
   @param  Private               Pointer to PxeBc private data.

   @param  Type                  PxeBc option boot item type

   @param  Layer                 PxeBc option boot item layer

-  @param  UseBis                use bios or not

-  @param  DestIp                ip address for server      

-  @param  IpCount               the total of the server ip address    

-  @param  SrvList               server list

-  @param  IsDiscv               discover the vendor or not

-  @param  Reply                 the dhcp4 packet of Pxe reply

-

-  @retval EFI_SUCCESS           operational success.

+  @param  UseBis                Use BIS or not

+  @param  DestIp                Ip address for server      

+  @param  IpCount               The total count of the server ip address    

+  @param  SrvList               Server list

+  @param  IsDiscv               Discover the vendor or not

+  @param  Reply                 The dhcp4 packet of Pxe reply

+

+  @retval EFI_SUCCESS           Operation succeeds.

   @retval EFI_OUT_OF_RESOURCES  Allocate memory pool failed.

   @retval EFI_NOT_FOUND         There is no vendor option exists.

   @retval EFI_TIMEOUT           Send Pxe Discover time out. 

@@ -417,8 +413,7 @@ PxeBcDiscvBootService (
   IN EFI_PXE_BASE_CODE_SRVLIST         * SrvList,

   IN BOOLEAN                           IsDiscv,

   OUT EFI_DHCP4_PACKET                 * Reply OPTIONAL

-  )

-;

+  );

 

 

 /**

@@ -437,8 +432,7 @@ PxeBcBuildDhcpOptions (
   IN PXEBC_PRIVATE_DATA            *Private,

   IN EFI_DHCP4_PACKET_OPTION       **OptList,

   IN BOOLEAN                       IsDhcpDiscover

-  )

-;

+  );

 

 

 /**

@@ -458,18 +452,17 @@ PxeBcCreateBootOptions (
   IN  UINT16                           Type,

   IN  UINT16                           *Layer,

   OUT UINT32                           *OptLen

-  )

-;

+  );

 

 

 /**

   Parse interested dhcp options.

 

   @param  Buffer     Pointer to the dhcp options packet.

-  @param  Length     the length of the dhcp options.

-  @param  OptTag     the option OpCode.

+  @param  Length     The length of the dhcp options.

+  @param  OptTag     The option OpCode.

 

-  @return Return NULL if the buffer length is 0 and OpCode is not 

+  @return NULL if the buffer length is 0 and OpCode is not 

           PXEBC_DHCP4_TAG_EOP, or the pointer to the buffer.

 

 **/

@@ -478,8 +471,7 @@ PxeBcParseExtendOptions (
   IN UINT8                         *Buffer,

   IN UINT32                        Length,

   IN UINT8                         OptTag

-  )

-;

+  );

 

 

 /**

@@ -488,15 +480,14 @@ PxeBcParseExtendOptions (
   @param  Dhcp4Option           Pointer to dhcp options

   @param  VendorOption          Pointer to vendor options

 

-  @return Return TRUE if valid for vendor options, or FALSE.

+  @return TRUE if valid for vendor options, or FALSE.

 

 **/

 BOOLEAN

 PxeBcParseVendorOptions (

   IN EFI_DHCP4_PACKET_OPTION       *Dhcp4Option,

-  IN PXEBC_VENDOR_OPTION          *VendorOption

-  )

-;

+  IN PXEBC_VENDOR_OPTION           *VendorOption

+  );

 

 

 /**

@@ -514,8 +505,7 @@ PxeBcParseVendorOptions (
 EFI_STATUS

 PxeBcSelectBootPrompt (

   IN PXEBC_PRIVATE_DATA              *Private

-  )

-;

+  );

 

 

 /**

@@ -535,8 +525,7 @@ PxeBcSelectBootMenu (
   IN  PXEBC_PRIVATE_DATA              *Private,

   OUT UINT16                          *Type,

   IN  BOOLEAN                         UseDefaultItem

-  )

-;

+  );

 

 #endif

 

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index f6845bfb35..82a19d7517 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -1,5 +1,5 @@
 /** @file

-  The driver binding for IP4 CONFIG protocol.

+  The driver binding for UEFI PXEBC protocol.

   

 Copyright (c) 2007 - 2008, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
index 8c2ce37e1e..2ef0450626 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
@@ -46,8 +46,7 @@ PxeBcTftpGetFileSize (
   IN UINT8                      *Filename,

   IN UINTN                      *BlockSize,

   IN OUT UINT64                 *BufferSize

-  )

-;

+  );

 

 

 /**

@@ -64,6 +63,7 @@ PxeBcTftpGetFileSize (
   @retval EFI_SUCCESS        Read the data success from the special file.

   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.

   @retval other              Read data from file failed.

+  

 **/

 EFI_STATUS

 PxeBcTftpReadFile (

@@ -74,8 +74,7 @@ PxeBcTftpReadFile (
   IN UINT8                      *BufferPtr,

   IN OUT UINT64                 *BufferSize,

   IN BOOLEAN                    DontUseBuffer

-  )

-;

+  );

 

 

 /**

@@ -92,7 +91,7 @@ PxeBcTftpReadFile (
   @retval EFI_SUCCESS        Write the data success into the special file.

   @retval EFI_DEVICE_ERROR   The network device encountered an error during this operation.

   @retval other              Write data into file failed.

-

+  

 **/

 EFI_STATUS

 PxeBcTftpWriteFile (

@@ -103,8 +102,7 @@ PxeBcTftpWriteFile (
   IN UINTN                      *BlockSize,

   IN UINT8                      *BufferPtr,

   IN OUT UINT64                 *BufferSize

-  )

-;

+  );

 

 

 /**

@@ -132,8 +130,7 @@ PxeBcTftpReadDirectory (
   IN UINT8                         *BufferPtr,

   IN OUT UINT64                    *BufferSize,

   IN BOOLEAN                       DontUseBuffer

-  )

-;

+  );

 

 #endif

 

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
index fd6429ea5a..82a0030d67 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
@@ -45,8 +45,7 @@ VOID
 PxeBcCommonNotify (

   IN EFI_EVENT           Event,

   IN VOID                *Context

-  )

-;

+  );

 

 

 /**

@@ -101,8 +100,8 @@ CvtNum (
 /**

   Convert unsigned int number to decimal number.

 

-  @param  Number      The unsigned int number will be converted.

-  @param  Buffer      Pointer to the buffer to store the decimal number after transform.

+  @param  Number   The unsigned int number will be converted.

+  @param  Buffer   Pointer to the buffer to store the decimal number after transform.

 

   @return the length of the number after transform.

 

@@ -111,23 +110,21 @@ UINTN
 UtoA10 (

   IN UINTN Number,

   IN CHAR8 *Buffer

-  )

-;

+  );

 

 

 /**

   Convert ASCII numeric string to a UINTN value.

 

   @param  Buffer  Pointer to the 8-byte unsigned int value.

-  

+

   @return UINTN value of the ASCII string.

 

 **/

 UINT64

 AtoU64 (

   IN UINT8 *Buffer

-  )

-;

+  );

 

 

 #endif