clean up the un-suitable ';' location when declaring the functions.

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

diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h
index 0ef0260652580de9a522ccf96f973fedd4d960ca..58b9c220c0aa9557c946082e122c8ac32556d8db 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLdr.h
+++ b/DuetPkg/EfiLdr/EfiLdr.h
@@ -87,7 +87,6 @@ typedef
 VOID\r
 (* EFI_MAIN_ENTRYPOINT) (\r
     IN EFILDRHANDOFF  *Handoff\r
 VOID\r
 (* EFI_MAIN_ENTRYPOINT) (\r
     IN EFILDRHANDOFF  *Handoff\r

-    )\r
-;\r
+    );\r

 \r
 #endif //_DUET_EFI_LOADER_H_
\ No newline at end of file
 \r
 #endif //_DUET_EFI_LOADER_H_
\ No newline at end of file

diff --git a/DuetPkg/FSVariable/FSVariable.h b/DuetPkg/FSVariable/FSVariable.h
index 434c302783a204b76ce14ad72f1089c847c81c5c..c046fe91ea3a75a7324227310cb82c05afa7fa6d 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.h
+++ b/DuetPkg/FSVariable/FSVariable.h
@@ -105,16 +105,14 @@ EFIAPI
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -124,8 +122,7 @@ GetVariable (
   OUT     UINT32            *Attributes OPTIONAL,\r
   IN OUT  UINTN             *DataSize,\r
   OUT     VOID              *Data\r
   OUT     UINT32            *Attributes OPTIONAL,\r
   IN OUT  UINTN             *DataSize,\r
   OUT     VOID              *Data\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -133,8 +130,7 @@ GetNextVariableName (
   IN OUT  UINTN             *VariableNameSize,\r
   IN OUT  CHAR16            *VariableName,\r
   IN OUT  EFI_GUID          *VendorGuid\r
   IN OUT  UINTN             *VariableNameSize,\r
   IN OUT  CHAR16            *VariableName,\r
   IN OUT  EFI_GUID          *VendorGuid\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -144,8 +140,7 @@ SetVariable (
   IN UINT32                  Attributes,\r
   IN UINTN                   DataSize,\r
   IN VOID                    *Data\r
   IN UINT32                  Attributes,\r
   IN UINTN                   DataSize,\r
   IN VOID                    *Data\r

-  )\r
-;\r
+  );\r

 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 EFI_STATUS\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 EFI_STATUS\r


@@ -155,8 +150,7 @@ QueryVariableInfo (
   OUT UINT64                 *MaximumVariableStorageSize,\r
   OUT UINT64                 *RemainingVariableStorageSize,\r
   OUT UINT64                 *MaximumVariableSize\r
   OUT UINT64                 *MaximumVariableStorageSize,\r
   OUT UINT64                 *RemainingVariableStorageSize,\r
   OUT UINT64                 *MaximumVariableSize\r

-  )\r
-;\r
+  );\r

 #endif // EFI_SPECIFICATION_VERSION >= 0x00020000\r
 \r
 #endif\r
 #endif // EFI_SPECIFICATION_VERSION >= 0x00020000\r
 \r
 #endif\r

diff --git a/DuetPkg/FvbRuntimeService/FwBlockService.h b/DuetPkg/FvbRuntimeService/FwBlockService.h
index 1e01cd9007e34d86402f02dbce96705275b1a9e8..47f70acc73be93f0e9425d7188dfacb0bae89e43 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FwBlockService.h
+++ b/DuetPkg/FvbRuntimeService/FwBlockService.h
@@ -132,34 +132,29 @@ EFI_STATUS
 GetFvbInfo (\r
   IN  EFI_PHYSICAL_ADDRESS              FvBaseAddress,\r
   OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r
 GetFvbInfo (\r
   IN  EFI_PHYSICAL_ADDRESS              FvBaseAddress,\r
   OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EnableFvbWrites (\r
   IN  BOOLEAN   EnableWrites\r
 \r
 EFI_STATUS\r
 EnableFvbWrites (\r
   IN  BOOLEAN   EnableWrites\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformGetFvbWriteBase (\r
   IN  UINTN     CurrentBaseAddress,\r
   IN  UINTN     *NewBaseAddress,\r
   IN  BOOLEAN   *WriteEnabled\r
 \r
 EFI_STATUS\r
 PlatformGetFvbWriteBase (\r
   IN  UINTN     CurrentBaseAddress,\r
   IN  UINTN     *NewBaseAddress,\r
   IN  BOOLEAN   *WriteEnabled\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EnablePlatformFvb (\r
   VOID\r
 \r
 EFI_STATUS\r
 EnablePlatformFvb (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 BOOLEAN\r
 SetPlatformFvbLock (\r
   IN UINTN  LbaAddress\r
 \r
 BOOLEAN\r
 SetPlatformFvbLock (\r
   IN UINTN  LbaAddress\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbReadBlock (\r
 \r
 EFI_STATUS\r
 FvbReadBlock (\r


@@ -170,8 +165,7 @@ FvbReadBlock (
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbWriteBlock (\r
 \r
 EFI_STATUS\r
 FvbWriteBlock (\r


@@ -182,8 +176,7 @@ FvbWriteBlock (
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbEraseBlock (\r
 \r
 EFI_STATUS\r
 FvbEraseBlock (\r


@@ -191,8 +184,7 @@ FvbEraseBlock (
   IN EFI_LBA                              Lba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN EFI_LBA                              Lba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r


@@ -200,8 +192,7 @@ FvbSetVolumeAttributes (
   IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r


@@ -209,8 +200,7 @@ FvbGetVolumeAttributes (
   OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r
 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r


@@ -218,30 +208,26 @@ FvbGetPhysicalAddress (
   OUT EFI_PHYSICAL_ADDRESS                *Address,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   OUT EFI_PHYSICAL_ADDRESS                *Address,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 EFIAPI\r
 FvbClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
 \r
 VOID\r
 EFIAPI\r
 FvbClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbSpecificInitialize (\r
   IN  ESAL_FWB_GLOBAL   *mFvbModuleGlobal\r
 \r
 EFI_STATUS\r
 FvbSpecificInitialize (\r
   IN  ESAL_FWB_GLOBAL   *mFvbModuleGlobal\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r
 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r


@@ -252,8 +238,7 @@ FvbGetLbaAddress (
   OUT UINTN                               *NumOfBlocks,\r
   IN  ESAL_FWB_GLOBAL                     *Global,\r
   IN  BOOLEAN                             Virtual\r
   OUT UINTN                               *NumOfBlocks,\r
   IN  ESAL_FWB_GLOBAL                     *Global,\r
   IN  BOOLEAN                             Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbEraseCustomBlockRange (\r
 \r
 EFI_STATUS\r
 FvbEraseCustomBlockRange (\r


@@ -264,8 +249,7 @@ FvbEraseCustomBlockRange (
   IN UINTN                                OffsetLastLba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN UINTN                                OffsetLastLba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Protocol APIs\r
 \r
 //\r
 // Protocol APIs\r


@@ -275,24 +259,21 @@ EFIAPI
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT      EFI_FVB_ATTRIBUTES_2                        *Attributes\r
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT      EFI_FVB_ATTRIBUTES_2                        *Attributes\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL       *This,\r
   IN OUT   EFI_FVB_ATTRIBUTES_2                     *Attributes\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL       *This,\r
   IN OUT   EFI_FVB_ATTRIBUTES_2                     *Attributes\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
   IN  CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT       EFI_PHYSICAL_ADDRESS                        *Address\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
   IN  CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT       EFI_PHYSICAL_ADDRESS                        *Address\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -301,8 +282,7 @@ FvbProtocolGetBlockSize (
   IN  EFI_LBA                                     Lba,\r
   OUT UINTN                                       *BlockSize,\r
   OUT UINTN                                       *NumOfBlocks\r
   IN  EFI_LBA                                     Lba,\r
   OUT UINTN                                       *BlockSize,\r
   OUT UINTN                                       *NumOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -312,8 +292,7 @@ FvbProtocolRead (
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -323,16 +302,14 @@ FvbProtocolWrite (
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
   ...  \r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
   ...  \r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -342,7 +319,6 @@ FvbExtendProtocolEraseCustomBlockRange (
   IN UINTN                                OffsetStartLba,\r
   IN EFI_LBA                              LastLba,\r
   IN UINTN                                OffsetLastLba\r
   IN UINTN                                OffsetStartLba,\r
   IN EFI_LBA                              LastLba,\r
   IN UINTN                                OffsetLastLba\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 9d1a3a25d5c8cd214608b318172d74665dd88c1d..1110529c9dcf10cc03d58e297f2bc70ddfe9a6ae 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -203,28 +203,24 @@ extern PLATFORM_ROOT_BRIDGE_DEVICE_PATH  gPlatformRootBridge0;
 VOID\r
 PlatformBdsInit (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
 VOID\r
 PlatformBdsInit (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsPolicyBehavior (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                  *DriverOptionList,\r
   IN LIST_ENTRY                  *BootOptionList\r
 \r
 VOID\r
 PlatformBdsPolicyBehavior (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                  *DriverOptionList,\r
   IN LIST_ENTRY                  *BootOptionList\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY               *BdsDriverLists\r
 \r
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY               *BdsDriverLists\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r
 \r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformBdsShowProgress (\r
 \r
 EFI_STATUS\r
 PlatformBdsShowProgress (\r


@@ -234,14 +230,12 @@ PlatformBdsShowProgress (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ProgressColor,\r
   UINTN                         Progress,\r
   UINTN                         PreviousValue\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ProgressColor,\r
   UINTN                         Progress,\r
   UINTN                         PreviousValue\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsConnectSequence (\r
   VOID\r
 \r
 VOID\r
 PlatformBdsConnectSequence (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsBootFail (\r
 \r
 VOID\r
 PlatformBdsBootFail (\r


@@ -249,64 +243,54 @@ PlatformBdsBootFail (
   IN  EFI_STATUS         Status,\r
   IN  CHAR16             *ExitData,\r
   IN  UINTN              ExitDataSize\r
   IN  EFI_STATUS         Status,\r
   IN  CHAR16             *ExitData,\r
   IN  UINTN              ExitDataSize\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r
 \r
 VOID\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r
 \r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformBdsConnectConsole (\r
   IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
 \r
 EFI_STATUS\r
 PlatformBdsConnectConsole (\r
   IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformBdsNoConsoleAction (\r
   VOID\r
 \r
 EFI_STATUS\r
 PlatformBdsNoConsoleAction (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 ConvertMpsTable (\r
   IN OUT  VOID     **Table\r
 \r
 EFI_STATUS\r
 ConvertMpsTable (\r
   IN OUT  VOID     **Table\r

-  )\r
-;\r
+  );\r

   \r
 EFI_STATUS\r
 ConvertSmbiosTable (\r
   IN OUT VOID       **Table\r
   \r
 EFI_STATUS\r
 ConvertSmbiosTable (\r
   IN OUT VOID       **Table\r

-  )\r
-;\r
+  );\r

   \r
 EFI_STATUS\r
 ConvertAcpiTable (\r
  IN      UINTN      TableLen,\r
  IN OUT  VOID       **Table\r
   \r
 EFI_STATUS\r
 ConvertAcpiTable (\r
  IN      UINTN      TableLen,\r
  IN OUT  VOID       **Table\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 ConvertSystemTable (\r
  IN     EFI_GUID   *TableGuid,\r
  IN OUT VOID       **Table\r
 \r
 EFI_STATUS\r
 ConvertSystemTable (\r
  IN     EFI_GUID   *TableGuid,\r
  IN OUT VOID       **Table\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsEnterFrontPage (\r
   IN UINT16                 TimeoutDefault,\r
   IN BOOLEAN                ConnectAllHappened\r
 \r
 VOID\r
 PlatformBdsEnterFrontPage (\r
   IN UINT16                 TimeoutDefault,\r
   IN BOOLEAN                ConnectAllHappened\r

-  )\r
-;\r
+  );\r

 \r
 #endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r
 \r
 #endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
index 520a41aa45ec3d38a295581f36828be6afaebb66..8983ab15c259c2394d0c007a3a0824963f93c4f7 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppy.h
@@ -508,8 +508,7 @@ FdcControllerDriverSupported (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create floppy control instance on controller.\r
 \r
 /**\r
   Create floppy control instance on controller.\r


@@ -526,8 +525,7 @@ FdcControllerDriverStart (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop this driver on ControllerHandle. Support stoping any child handles\r
 \r
 /**\r
   Stop this driver on ControllerHandle. Support stoping any child handles\r


@@ -550,8 +548,7 @@ FdcControllerDriverStop (
   IN EFI_HANDLE                   Controller,\r
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r
   IN EFI_HANDLE                   Controller,\r
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI Block I/O Protocol Functions\r
 \r
 //\r
 // EFI Block I/O Protocol Functions\r


@@ -573,8 +570,7 @@ EFIAPI
 FdcReset (\r
   IN EFI_BLOCK_IO_PROTOCOL  *This,\r
   IN BOOLEAN                ExtendedVerification\r
 FdcReset (\r
   IN EFI_BLOCK_IO_PROTOCOL  *This,\r
   IN BOOLEAN                ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Flush block via fdd controller\r
 \r
 /**\r
   Flush block via fdd controller\r


@@ -587,8 +583,7 @@ EFI_STATUS
 EFIAPI\r
 FddFlushBlocks (\r
   IN EFI_BLOCK_IO_PROTOCOL  *This\r
 EFIAPI\r
 FddFlushBlocks (\r
   IN EFI_BLOCK_IO_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read the requested number of blocks from the device   \r
 \r
 /**\r
   Read the requested number of blocks from the device   \r


@@ -618,8 +613,7 @@ FddReadBlocks (
   IN  EFI_LBA                LBA,\r
   IN  UINTN                  BufferSize,\r
   OUT VOID                   *Buffer\r
   IN  EFI_LBA                LBA,\r
   IN  UINTN                  BufferSize,\r
   OUT VOID                   *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write a specified number of blocks to the device   \r
 \r
 /**\r
   Write a specified number of blocks to the device   \r


@@ -649,8 +643,7 @@ FddWriteBlocks (
   IN EFI_LBA                LBA,\r
   IN UINTN                  BufferSize,\r
   IN VOID                   *Buffer\r
   IN EFI_LBA                LBA,\r
   IN UINTN                  BufferSize,\r
   IN VOID                   *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Prototypes of internal functions\r
 \r
 //\r
 // Prototypes of internal functions\r


@@ -667,8 +660,7 @@ FddWriteBlocks (
 EFI_STATUS\r
 DiscoverFddDevice (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 DiscoverFddDevice (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -682,8 +674,7 @@ DiscoverFddDevice (
 EFI_STATUS\r
 FddIdentify (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 FddIdentify (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -699,8 +690,7 @@ FddIdentify (
 EFI_STATUS\r
 FddReset (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 FddReset (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -717,8 +707,7 @@ FddReset (
 EFI_STATUS\r
 MotorOn (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 MotorOn (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -734,8 +723,7 @@ MotorOn (
 EFI_STATUS\r
 MotorOff (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 MotorOff (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Detect the disk in the drive is changed or not\r
 \r
 /**\r
   Detect the disk in the drive is changed or not\r


@@ -751,8 +739,7 @@ MotorOff (
 EFI_STATUS\r
 DisketChanged (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 DisketChanged (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Do the Specify command, this command sets DMA operation\r
 \r
 /**\r
   Do the Specify command, this command sets DMA operation\r


@@ -768,8 +755,7 @@ DisketChanged (
 EFI_STATUS\r
 Specify (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 Specify (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the head of floppy drive to track 0\r
 \r
 /**\r
   Set the head of floppy drive to track 0\r


@@ -782,8 +768,7 @@ Specify (
 EFI_STATUS\r
 Recalibrate (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 Recalibrate (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the head of floppy drive to the new cylinder\r
 \r
 /**\r
   Set the head of floppy drive to the new cylinder\r


@@ -799,8 +784,7 @@ EFI_STATUS
 Seek (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         Lba\r
 Seek (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Do the Sense Interrupt Status command, this command\r
 \r
 /**\r
   Do the Sense Interrupt Status command, this command\r


@@ -820,8 +804,7 @@ SenseIntStatus (
   IN     FDC_BLK_IO_DEV  *FdcDev,\r
   IN OUT UINT8           *StatusRegister0,\r
   IN OUT UINT8           *PresentCylinderNumber\r
   IN     FDC_BLK_IO_DEV  *FdcDev,\r
   IN OUT UINT8           *StatusRegister0,\r
   IN OUT UINT8           *PresentCylinderNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Do the Sense Drive Status command\r
 \r
 /**\r
   Do the Sense Drive Status command\r


@@ -838,8 +821,7 @@ EFI_STATUS
 SenseDrvStatus (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         Lba\r
 SenseDrvStatus (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update the disk media properties and if necessary\r
 \r
 /**\r
   Update the disk media properties and if necessary\r


@@ -854,8 +836,7 @@ SenseDrvStatus (
 EFI_STATUS\r
 DetectMedia (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 DetectMedia (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the data rate and so on\r
 \r
 /**\r
   Set the data rate and so on\r


@@ -867,8 +848,7 @@ DetectMedia (
 EFI_STATUS\r
 Setup (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r
 EFI_STATUS\r
 Setup (\r
   IN FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read or Write a number of blocks in the same cylinder\r
 \r
 /**\r
   Read or Write a number of blocks in the same cylinder\r


@@ -889,8 +869,7 @@ ReadWriteDataSector (
   IN EFI_LBA         Lba,\r
   IN UINTN           NumberOfBlocks,\r
   IN BOOLEAN         Read\r
   IN EFI_LBA         Lba,\r
   IN UINTN           NumberOfBlocks,\r
   IN BOOLEAN         Read\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Fill in FDD command's parameter\r
 \r
 /**\r
   Fill in FDD command's parameter\r


@@ -905,8 +884,7 @@ FillPara (
   IN FDC_BLK_IO_DEV       *FdcDev,\r
   IN EFI_LBA              Lba,\r
   IN FDD_COMMAND_PACKET1  *Command\r
   IN FDC_BLK_IO_DEV       *FdcDev,\r
   IN EFI_LBA              Lba,\r
   IN FDD_COMMAND_PACKET1  *Command\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read result byte from Data Register of FDC\r
 \r
 /**\r
   Read result byte from Data Register of FDC\r


@@ -923,8 +901,7 @@ EFI_STATUS
 DataInByte (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT8           *Pointer\r
 DataInByte (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT8           *Pointer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write command byte to Data Register of FDC\r
 \r
 /**\r
   Write command byte to Data Register of FDC\r


@@ -940,8 +917,7 @@ EFI_STATUS
 DataOutByte (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT8           *Pointer\r
 DataOutByte (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT8           *Pointer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Detect the specified floppy logic drive is busy or\r
 \r
 /**\r
   Detect the specified floppy logic drive is busy or\r


@@ -959,8 +935,7 @@ EFI_STATUS
 FddWaitForBSYClear (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINTN           TimeoutInSeconds\r
 FddWaitForBSYClear (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINTN           TimeoutInSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -979,8 +954,7 @@ FddDRQReady (
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN BOOLEAN         Dio,\r
   IN UINTN           TimeoutInSeconds\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN BOOLEAN         Dio,\r
   IN UINTN           TimeoutInSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set FDC control structure's attribute according to\r
 \r
 /**\r
   Set FDC control structure's attribute according to\r


@@ -999,8 +973,7 @@ EFI_STATUS
 CheckResult (\r
   IN     FDD_RESULT_PACKET  *Result,\r
   IN OUT FDC_BLK_IO_DEV     *FdcDev\r
 CheckResult (\r
   IN     FDD_RESULT_PACKET  *Result,\r
   IN OUT FDC_BLK_IO_DEV     *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check the drive status information\r
 \r
 /**\r
   Check the drive status information\r


@@ -1014,8 +987,7 @@ CheckResult (
 EFI_STATUS\r
 CheckStatus3 (\r
   IN UINT8 StatusRegister3\r
 EFI_STATUS\r
 CheckStatus3 (\r
   IN UINT8 StatusRegister3\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Calculate the number of block in the same cylinder\r
 \r
 /**\r
   Calculate the number of block in the same cylinder\r


@@ -1034,8 +1006,7 @@ GetTransferBlockCount (
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         LBA,\r
   IN UINTN           NumberOfBlocks\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN EFI_LBA         LBA,\r
   IN UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   When the Timer(2s) off, turn the drive's motor off\r
 \r
 /**\r
   When the Timer(2s) off, turn the drive's motor off\r


@@ -1050,8 +1021,7 @@ EFIAPI
 FddTimerProc (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r
 FddTimerProc (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read I/O port for FDC\r
 \r
 /**\r
   Read I/O port for FDC\r


@@ -1064,8 +1034,7 @@ UINT8
 FdcReadPort (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT32          Offset\r
 FdcReadPort (\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT32          Offset\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write I/O port for FDC\r
 \r
 /**\r
   Write I/O port for FDC\r


@@ -1080,8 +1049,7 @@ FdcWritePort (
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT32          Offset,\r
   IN UINT8           Data\r
   IN FDC_BLK_IO_DEV  *FdcDev,\r
   IN UINT32          Offset,\r
   IN UINT8           Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read or Write a number of blocks to floppy device\r
 \r
 /**\r
   Read or Write a number of blocks to floppy device\r


@@ -1117,8 +1085,7 @@ FddReadWriteBlocks (
   IN  UINTN                  BufferSize,\r
   IN  BOOLEAN                Operation,\r
   OUT VOID                   *Buffer\r
   IN  UINTN                  BufferSize,\r
   IN  BOOLEAN                Operation,\r
   OUT VOID                   *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Common interface for free cache \r
 \r
 /**\r
   Common interface for free cache \r


@@ -1129,8 +1096,7 @@ FddReadWriteBlocks (
 VOID\r
 FdcFreeCache (\r
   IN    FDC_BLK_IO_DEV  *FdcDev\r
 VOID\r
 FdcFreeCache (\r
   IN    FDC_BLK_IO_DEV  *FdcDev\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index 17bbcc3136f6bb2d347be13c0bd235a34bc6f828..b22c659c7353956da7737bb13dab5812ffa96827 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -60,8 +60,7 @@ BOOLEAN
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r
   IN EFI_KEY_DATA  *InputData\r
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r
   IN EFI_KEY_DATA  *InputData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
     Reads the next keystroke from the input device. The WaitForKey Event can \r
 \r
 /**\r
     Reads the next keystroke from the input device. The WaitForKey Event can \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index 7953b2bc745998098b126eff7523b5a349cbc19c..95c036d7405ca11b4fee263065fb978d7a5506f5 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -146,8 +146,7 @@ EFIAPI
 InstallPs2KeyboardDriver (\r
   IN EFI_HANDLE           ImageHandle,\r
   IN EFI_SYSTEM_TABLE     *SystemTable\r
 InstallPs2KeyboardDriver (\r
   IN EFI_HANDLE           ImageHandle,\r
   IN EFI_SYSTEM_TABLE     *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #define KEYBOARD_8042_DATA_REGISTER     0x60\r
 #define KEYBOARD_8042_STATUS_REGISTER   0x64\r
 \r
 #define KEYBOARD_8042_DATA_REGISTER     0x60\r
 #define KEYBOARD_8042_STATUS_REGISTER   0x64\r


@@ -197,8 +196,7 @@ InstallPs2KeyboardDriver (
 EFI_STATUS\r
 UpdateStatusLights (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
 EFI_STATUS\r
 UpdateStatusLights (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   write key to keyboard\r
 \r
 /**\r
   write key to keyboard\r


@@ -214,8 +212,7 @@ EFI_STATUS
 KeyboardRead (\r
   IN KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
   OUT UINT8                   *Data\r
 KeyboardRead (\r
   IN KEYBOARD_CONSOLE_IN_DEV  *ConsoleIn,\r
   OUT UINT8                   *Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get scancode from scancode buffer\r
 \r
 /**\r
   Get scancode from scancode buffer\r


@@ -231,8 +228,7 @@ KeyboardRead (
 EFI_STATUS\r
 KeyGetchar (\r
   IN OUT KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
 EFI_STATUS\r
 KeyGetchar (\r
   IN OUT KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Perform 8042 controller and keyboard Initialization\r
 \r
 /**\r
   Perform 8042 controller and keyboard Initialization\r


@@ -249,8 +245,7 @@ EFI_STATUS
 InitKeyboard (\r
   IN OUT KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN BOOLEAN                     ExtendedVerification\r
 InitKeyboard (\r
   IN OUT KEYBOARD_CONSOLE_IN_DEV *ConsoleIn,\r
   IN BOOLEAN                     ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Disable the keyboard interface of the 8042 controller\r
 \r
 /**\r
   Disable the keyboard interface of the 8042 controller\r


@@ -263,8 +258,7 @@ InitKeyboard (
 EFI_STATUS\r
 DisableKeyboard (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
 EFI_STATUS\r
 DisableKeyboard (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Timer event handler: read a series of scancodes from 8042\r
 \r
 /**\r
   Timer event handler: read a series of scancodes from 8042\r


@@ -282,8 +276,7 @@ EFIAPI
 KeyboardTimerHandler (\r
   IN EFI_EVENT    Event,\r
   IN VOID         *Context\r
 KeyboardTimerHandler (\r
   IN EFI_EVENT    Event,\r
   IN VOID         *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   logic reset keyboard\r
 \r
 /**\r
   logic reset keyboard\r


@@ -301,8 +294,7 @@ EFIAPI
 KeyboardEfiReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   IN  BOOLEAN                         ExtendedVerification\r
 KeyboardEfiReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   IN  BOOLEAN                         ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implement SIMPLE_TEXT_IN.ReadKeyStroke().\r
 \r
 /**\r
   Implement SIMPLE_TEXT_IN.ReadKeyStroke().\r


@@ -318,8 +310,7 @@ EFIAPI
 KeyboardReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   OUT EFI_INPUT_KEY                   *Key\r
 KeyboardReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   OUT EFI_INPUT_KEY                   *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Event notification function for SIMPLE_TEXT_IN.WaitForKey event\r
 \r
 /**\r
   Event notification function for SIMPLE_TEXT_IN.WaitForKey event\r


@@ -334,8 +325,7 @@ EFIAPI
 KeyboardWaitForKey (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r
 KeyboardWaitForKey (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read status register\r
 \r
 /**\r
   Read status register\r


@@ -348,8 +338,7 @@ KeyboardWaitForKey (
 UINT8\r
 KeyReadStatusRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
 UINT8\r
 KeyReadStatusRegister (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard Command\r
 \r
 /**\r
   Check whether there is Ps/2 Keyboard device in system by 0xF4 Keyboard Command\r


@@ -365,8 +354,7 @@ BOOLEAN
 EFIAPI\r
 CheckKeyboardConnect (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r
 EFIAPI\r
 CheckKeyboardConnect (\r
   IN KEYBOARD_CONSOLE_IN_DEV *ConsoleIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Event notification function for SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r
 \r
 /**\r
   Event notification function for SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r


@@ -381,8 +369,7 @@ EFIAPI
 KeyboardWaitForKeyEx (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r
 KeyboardWaitForKeyEx (\r
   IN  EFI_EVENT               Event,\r
   IN  VOID                    *Context\r

-  )\r
-;  \r
+  );  \r

 \r
 //\r
 // Simple Text Input Ex protocol function prototypes\r
 \r
 //\r
 // Simple Text Input Ex protocol function prototypes\r


@@ -404,8 +391,7 @@ EFIAPI
 KeyboardEfiResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r
 KeyboardEfiResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
     Reads the next keystroke from the input device. The WaitForKey Event can \r
 \r
 /**\r
     Reads the next keystroke from the input device. The WaitForKey Event can \r


@@ -428,8 +414,7 @@ EFIAPI
 KeyboardReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r
 KeyboardReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set certain state for the input device.\r
 \r
 /**\r
   Set certain state for the input device.\r


@@ -450,8 +435,7 @@ EFIAPI
 KeyboardSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r
 KeyboardSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
     Register a notification function for a particular keystroke for the input device.\r
 \r
 /**\r
     Register a notification function for a particular keystroke for the input device.\r


@@ -475,8 +459,7 @@ KeyboardRegisterKeyNotify (
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
     Remove a registered notification function from a particular keystroke.\r
 \r
 /**\r
     Remove a registered notification function from a particular keystroke.\r


@@ -495,7 +478,6 @@ EFIAPI
 KeyboardUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
 KeyboardUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
index 0a914655012d4363cc8678cfd78b397f3b08e481..fb2bbac75077ae761c3bef5f452bdfd03c726acd 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.h
@@ -113,8 +113,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 KbcSelfTest (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcSelfTest (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable keyboard AUX functionality.\r
 \r
 /**\r
   Issue command to enable keyboard AUX functionality.\r


@@ -126,8 +125,7 @@ KbcSelfTest (
 EFI_STATUS\r
 KbcEnableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcEnableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to disable keyboard AUX functionality.\r
 \r
 /**\r
   Issue command to disable keyboard AUX functionality.\r


@@ -139,8 +137,7 @@ KbcEnableAux (
 EFI_STATUS\r
 KbcDisableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcDisableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable keyboard.\r
 \r
 /**\r
   Issue command to enable keyboard.\r


@@ -152,8 +149,7 @@ KbcDisableAux (
 EFI_STATUS\r
 KbcEnableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcEnableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to disable keyboard.\r
 \r
 /**\r
   Issue command to disable keyboard.\r


@@ -165,8 +161,7 @@ KbcEnableKb (
 EFI_STATUS\r
 KbcDisableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcDisableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to check keyboard status.\r
 \r
 /**\r
   Issue command to check keyboard status.\r


@@ -180,8 +175,7 @@ EFI_STATUS
 CheckKbStatus (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   OUT BOOLEAN                             *KeyboardEnable\r
 CheckKbStatus (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   OUT BOOLEAN                             *KeyboardEnable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to reset keyboard.\r
 \r
 /**\r
   Issue command to reset keyboard.\r


@@ -193,8 +187,7 @@ CheckKbStatus (
 EFI_STATUS\r
 PS2MouseReset (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 PS2MouseReset (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's sample rate\r
 \r
 /**\r
   Issue command to set mouse's sample rate\r


@@ -208,8 +201,7 @@ EFI_STATUS
 PS2MouseSetSampleRate (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SR                             SampleRate\r
 PS2MouseSetSampleRate (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SR                             SampleRate\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's resolution.\r
 \r
 /**\r
   Issue command to set mouse's resolution.\r


@@ -223,8 +215,7 @@ EFI_STATUS
 PS2MouseSetResolution (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_RE                             Resolution\r
 PS2MouseSetResolution (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_RE                             Resolution\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's scaling.\r
 \r
 /**\r
   Issue command to set mouse's scaling.\r


@@ -238,8 +229,7 @@ EFI_STATUS
 PS2MouseSetScaling (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SF                             Scaling\r
 PS2MouseSetScaling (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SF                             Scaling\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable Ps2 mouse.\r
 \r
 /**\r
   Issue command to enable Ps2 mouse.\r


@@ -251,8 +241,7 @@ PS2MouseSetScaling (
 EFI_STATUS\r
 PS2MouseEnable (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 PS2MouseEnable (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get mouse packet . Only care first 3 bytes\r
 \r
 /**\r
   Get mouse packet . Only care first 3 bytes\r


@@ -266,8 +255,7 @@ PS2MouseEnable (
 EFI_STATUS\r
 PS2MouseGetPacket (\r
   PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r
 EFI_STATUS\r
 PS2MouseGetPacket (\r
   PS2_MOUSE_ABSOLUTE_POINTER_DEV     *MouseAbsolutePointerDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read data via IsaIo protocol with given number.\r
 \r
 /**\r
   Read data via IsaIo protocol with given number.\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
index 1796b09b4d2dcc663f8c5d59430b2b535e5cb4eb..c92a1c57ed520ac065498e1b5947cb7a5229e421 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
@@ -114,8 +114,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 KbcSelfTest (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcSelfTest (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable keyboard AUX functionality.\r
 \r
 /**\r
   Issue command to enable keyboard AUX functionality.\r


@@ -127,8 +126,7 @@ KbcSelfTest (
 EFI_STATUS\r
 KbcEnableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcEnableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to disable keyboard AUX functionality.\r
 \r
 /**\r
   Issue command to disable keyboard AUX functionality.\r


@@ -140,8 +138,7 @@ KbcEnableAux (
 EFI_STATUS\r
 KbcDisableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcDisableAux (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable keyboard.\r
 \r
 /**\r
   Issue command to enable keyboard.\r


@@ -153,8 +150,7 @@ KbcDisableAux (
 EFI_STATUS\r
 KbcEnableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcEnableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to disable keyboard.\r
 \r
 /**\r
   Issue command to disable keyboard.\r


@@ -166,8 +162,7 @@ KbcEnableKb (
 EFI_STATUS\r
 KbcDisableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 KbcDisableKb (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to check keyboard status.\r
 \r
 /**\r
   Issue command to check keyboard status.\r


@@ -181,8 +176,7 @@ EFI_STATUS
 CheckKbStatus (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   OUT BOOLEAN                             *KeyboardEnable\r
 CheckKbStatus (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   OUT BOOLEAN                             *KeyboardEnable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to reset keyboard.\r
 \r
 /**\r
   Issue command to reset keyboard.\r


@@ -194,8 +188,7 @@ CheckKbStatus (
 EFI_STATUS\r
 PS2MouseReset (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 PS2MouseReset (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's sample rate\r
 \r
 /**\r
   Issue command to set mouse's sample rate\r


@@ -209,8 +202,7 @@ EFI_STATUS
 PS2MouseSetSampleRate (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SR                             SampleRate\r
 PS2MouseSetSampleRate (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SR                             SampleRate\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's resolution.\r
 \r
 /**\r
   Issue command to set mouse's resolution.\r


@@ -224,8 +216,7 @@ EFI_STATUS
 PS2MouseSetResolution (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_RE                             Resolution\r
 PS2MouseSetResolution (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_RE                             Resolution\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to set mouse's scaling.\r
 \r
 /**\r
   Issue command to set mouse's scaling.\r


@@ -239,8 +230,7 @@ EFI_STATUS
 PS2MouseSetScaling (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SF                             Scaling\r
 PS2MouseSetScaling (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo,\r
   IN MOUSE_SF                             Scaling\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Issue command to enable Ps2 mouse.\r
 \r
 /**\r
   Issue command to enable Ps2 mouse.\r


@@ -252,8 +242,7 @@ PS2MouseSetScaling (
 EFI_STATUS\r
 PS2MouseEnable (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r
 EFI_STATUS\r
 PS2MouseEnable (\r
   IN EFI_ISA_IO_PROTOCOL                  *IsaIo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get mouse packet . Only care first 3 bytes\r
 \r
 /**\r
   Get mouse packet . Only care first 3 bytes\r


@@ -267,8 +256,7 @@ PS2MouseEnable (
 EFI_STATUS\r
 PS2MouseGetPacket (\r
   PS2_MOUSE_DEV     *MouseDev\r
 EFI_STATUS\r
 PS2MouseGetPacket (\r
   PS2_MOUSE_DEV     *MouseDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read data via IsaIo protocol with given number.\r
 \r
 /**\r
   Read data via IsaIo protocol with given number.\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h
index d52de4c80cec25139a8c844e57a6dfd0f134e1c4..f8cb60d5dc1be551f777977ff1ced22030c107a6 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ComponentName.h
@@ -160,7 +160,6 @@ IDEBusComponentNameGetControllerName (
 VOID\r
 AddName (\r
   IN  IDE_BLK_IO_DEV               *IdeBlkIoDevicePtr\r
 VOID\r
 AddName (\r
   IN  IDE_BLK_IO_DEV               *IdeBlkIoDevicePtr\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
index 856e4a1dbf70196e8901f024b1d02c8a29499d20..9fd43f551a37f16a03c509d0c95056ca9ed08579 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h
@@ -39,8 +39,7 @@ DeRegisterIdeDevice (
   IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN  EFI_HANDLE                     Controller,\r
   IN  EFI_HANDLE                     Handle\r
   IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN  EFI_HANDLE                     Controller,\r
   IN  EFI_HANDLE                     Handle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -59,8 +58,7 @@ EnableIdeDevice (
   IN EFI_PCI_IO_PROTOCOL                 *PciIo,\r
   IN EFI_DEVICE_PATH_PROTOCOL            *ParentDevicePath,\r
   IN EFI_DEVICE_PATH_PROTOCOL            *RemainingDevicePath\r
   IN EFI_PCI_IO_PROTOCOL                 *PciIo,\r
   IN EFI_DEVICE_PATH_PROTOCOL            *ParentDevicePath,\r
   IN EFI_DEVICE_PATH_PROTOCOL            *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -75,8 +73,7 @@ UINT8
 IDEReadPortB (\r
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port\r
 IDEReadPortB (\r
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -95,8 +92,7 @@ IDEReadPortWMultiple (
   IN  UINT16                Port,\r
   IN  UINTN                 Count,\r
   OUT  VOID                 *Buffer\r
   IN  UINT16                Port,\r
   IN  UINTN                 Count,\r
   OUT  VOID                 *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -113,8 +109,7 @@ IDEWritePortB (
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port,\r
   IN  UINT8                 Data\r
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port,\r
   IN  UINT8                 Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -131,8 +126,7 @@ IDEWritePortW (
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port,\r
   IN  UINT16                Data\r
   IN  EFI_PCI_IO_PROTOCOL   *PciIo,\r
   IN  UINT16                Port,\r
   IN  UINT16                Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -151,8 +145,7 @@ IDEWritePortWMultiple (
   IN  UINT16                Port,\r
   IN  UINTN                 Count,\r
   IN  VOID                  *Buffer\r
   IN  UINT16                Port,\r
   IN  UINTN                 Count,\r
   IN  VOID                  *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -167,8 +160,7 @@ EFI_STATUS
 GetIdeRegistersBaseAddr (\r
   IN  EFI_PCI_IO_PROTOCOL         *PciIo,\r
   OUT IDE_REGISTERS_BASE_ADDR     *IdeRegsBaseAddr\r
 GetIdeRegistersBaseAddr (\r
   IN  EFI_PCI_IO_PROTOCOL         *PciIo,\r
   OUT IDE_REGISTERS_BASE_ADDR     *IdeRegsBaseAddr\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -181,8 +173,7 @@ GetIdeRegistersBaseAddr (
 EFI_STATUS\r
 ReassignIdeResources (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 ReassignIdeResources (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -195,8 +186,7 @@ ReassignIdeResources (
 EFI_STATUS\r
 DiscoverIdeDevice (\r
   IN IDE_BLK_IO_DEV *IdeDev\r
 EFI_STATUS\r
 DiscoverIdeDevice (\r
   IN IDE_BLK_IO_DEV *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This interface is used to initialize all state data related to the\r
 \r
 /**\r
   This interface is used to initialize all state data related to the\r


@@ -208,8 +198,7 @@ DiscoverIdeDevice (
 EFI_STATUS\r
 InitializeIDEChannelData (\r
   VOID\r
 EFI_STATUS\r
 InitializeIDEChannelData (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -222,8 +211,7 @@ InitializeIDEChannelData (
 EFI_STATUS\r
 DetectIDEController (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 DetectIDEController (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -238,8 +226,7 @@ EFI_STATUS
 DRQClear (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 DRQClear (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -254,8 +241,7 @@ EFI_STATUS
 DRQClear2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 DRQClear2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -270,8 +256,7 @@ EFI_STATUS
 DRQReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 DRQReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -286,8 +271,7 @@ EFI_STATUS
 DRQReady2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 DRQReady2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -302,8 +286,7 @@ EFI_STATUS
 WaitForBSYClear (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 WaitForBSYClear (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -318,8 +301,7 @@ EFI_STATUS
 WaitForBSYClear2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r
 WaitForBSYClear2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           TimeoutInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -334,8 +316,7 @@ EFI_STATUS
 DRDYReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           DelayInMilliSeconds\r
 DRDYReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           DelayInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -350,8 +331,7 @@ EFI_STATUS
 DRDYReady2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           DelayInMilliSeconds\r
 DRDYReady2 (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   IN  UINTN           DelayInMilliSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -368,8 +348,7 @@ SwapStringChars (
   IN CHAR8  *Destination,\r
   IN CHAR8  *Source,\r
   IN UINT32 Size\r
   IN CHAR8  *Destination,\r
   IN CHAR8  *Source,\r
   IN UINT32 Size\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 //  ATA device functions' prototype\r
 \r
 //\r
 //  ATA device functions' prototype\r


@@ -385,8 +364,7 @@ SwapStringChars (
 EFI_STATUS\r
 ATAIdentify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 ATAIdentify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -399,8 +377,7 @@ ATAIdentify (
 VOID\r
 PrintAtaModuleName (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 VOID\r
 PrintAtaModuleName (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -429,8 +406,7 @@ AtaPioDataIn (
   IN  UINT8           SectorNumber,\r
   IN  UINT8           CylinderLsb,\r
   IN  UINT8           CylinderMsb\r
   IN  UINT8           SectorNumber,\r
   IN  UINT8           CylinderLsb,\r
   IN  UINT8           CylinderMsb\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -459,8 +435,7 @@ AtaPioDataOut (
   IN  UINT8           SectorNumber,\r
   IN  UINT8           CylinderLsb,\r
   IN  UINT8           CylinderMsb\r
   IN  UINT8           SectorNumber,\r
   IN  UINT8           CylinderLsb,\r
   IN  UINT8           CylinderMsb\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -473,8 +448,7 @@ AtaPioDataOut (
 EFI_STATUS\r
 CheckErrorStatus (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 CheckErrorStatus (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -493,8 +467,7 @@ AtaReadSectors (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -513,8 +486,7 @@ AtaWriteSectors (
   IN  VOID            *BufferData,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *BufferData,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -527,8 +499,7 @@ AtaWriteSectors (
 EFI_STATUS\r
 AtaSoftReset (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 AtaSoftReset (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -549,8 +520,7 @@ AtaBlkIoReadBlocks (
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -571,8 +541,7 @@ AtaBlkIoWriteBlocks (
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // ATAPI device functions' prototype\r
 \r
 //\r
 // ATAPI device functions' prototype\r


@@ -588,8 +557,7 @@ AtaBlkIoWriteBlocks (
 EFI_STATUS\r
 ATAPIIdentify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 ATAPIIdentify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -602,8 +570,7 @@ ATAPIIdentify (
 EFI_STATUS\r
 AtapiInquiry (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 AtapiInquiry (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -624,8 +591,7 @@ AtapiPacketCommandIn (
   IN  UINT16                *Buffer,\r
   IN  UINT32                ByteCount,\r
   IN  UINTN                 TimeOut\r
   IN  UINT16                *Buffer,\r
   IN  UINT32                ByteCount,\r
   IN  UINTN                 TimeOut\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -646,8 +612,7 @@ AtapiPacketCommandOut (
   IN  UINT16                *Buffer,\r
   IN  UINT32                ByteCount,\r
   IN  UINTN                 TimeOut\r
   IN  UINT16                *Buffer,\r
   IN  UINT32                ByteCount,\r
   IN  UINTN                 TimeOut\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -668,8 +633,7 @@ PioReadWriteData (
   IN  UINT32          ByteCount,\r
   IN  BOOLEAN         Read,\r
   IN  UINTN           TimeOut\r
   IN  UINT32          ByteCount,\r
   IN  BOOLEAN         Read,\r
   IN  UINTN           TimeOut\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -684,8 +648,7 @@ EFI_STATUS
 AtapiTestUnitReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT SENSE_RESULT       *SResult  \r
 AtapiTestUnitReady (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT SENSE_RESULT       *SResult  \r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -700,8 +663,7 @@ EFI_STATUS
 AtapiRequestSense (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT UINTN           *SenseCounts\r
 AtapiRequestSense (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT UINTN           *SenseCounts\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -716,8 +678,7 @@ EFI_STATUS
 AtapiReadCapacity (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT SENSE_RESULT       *SResult  \r
 AtapiReadCapacity (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT SENSE_RESULT       *SResult  \r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -732,8 +693,7 @@ EFI_STATUS
 AtapiDetectMedia (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT BOOLEAN         *MediaChange\r
 AtapiDetectMedia (\r
   IN  IDE_BLK_IO_DEV  *IdeDev,\r
   OUT BOOLEAN         *MediaChange\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -752,8 +712,7 @@ AtapiReadSectors (
   IN  VOID            *Buffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *Buffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -772,8 +731,7 @@ AtapiWriteSectors (
   IN  VOID            *Buffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *Buffer,\r
   IN  EFI_LBA         Lba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -786,8 +744,7 @@ AtapiWriteSectors (
 EFI_STATUS\r
 AtapiSoftReset (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 AtapiSoftReset (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -808,8 +765,7 @@ AtapiBlkIoReadBlocks (
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -830,8 +786,7 @@ AtapiBlkIoWriteBlocks (
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r
   IN EFI_LBA          LBA,\r
   IN UINTN            BufferSize,\r
   OUT VOID            *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -848,8 +803,7 @@ ParseSenseData (
   IN IDE_BLK_IO_DEV     *IdeDev,\r
   IN UINTN              SenseCount,\r
   OUT SENSE_RESULT      *Result\r
   IN IDE_BLK_IO_DEV     *IdeDev,\r
   IN UINTN              SenseCount,\r
   OUT SENSE_RESULT      *Result\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -862,8 +816,7 @@ ParseSenseData (
 EFI_STATUS\r
 AtapiReadPendingData (\r
   IN IDE_BLK_IO_DEV     *IdeDev\r
 EFI_STATUS\r
 AtapiReadPendingData (\r
   IN IDE_BLK_IO_DEV     *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -878,8 +831,7 @@ EFI_STATUS
 IsLS120orZipWriteProtected (\r
   IN  IDE_BLK_IO_DEV    *IdeDev,\r
   OUT BOOLEAN           *WriteProtected\r
 IsLS120orZipWriteProtected (\r
   IN  IDE_BLK_IO_DEV    *IdeDev,\r
   OUT BOOLEAN           *WriteProtected\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -892,8 +844,7 @@ IsLS120orZipWriteProtected (
 VOID\r
 ReleaseIdeResources (\r
   IN  IDE_BLK_IO_DEV  *IdeBlkIoDevice\r
 VOID\r
 ReleaseIdeResources (\r
   IN  IDE_BLK_IO_DEV  *IdeBlkIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -908,8 +859,7 @@ EFI_STATUS
 SetDeviceTransferMode (\r
   IN IDE_BLK_IO_DEV       *IdeDev,\r
   IN ATA_TRANSFER_MODE    *TransferMode\r
 SetDeviceTransferMode (\r
   IN IDE_BLK_IO_DEV       *IdeDev,\r
   IN ATA_TRANSFER_MODE    *TransferMode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -924,8 +874,7 @@ EFI_STATUS
 ReadNativeMaxAddress (\r
   IN  IDE_BLK_IO_DEV                *IdeDev,\r
   OUT EFI_LBA                       *NativeMaxAddress\r
 ReadNativeMaxAddress (\r
   IN  IDE_BLK_IO_DEV                *IdeDev,\r
   OUT EFI_LBA                       *NativeMaxAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -942,8 +891,7 @@ SetMaxAddress (
   IN  IDE_BLK_IO_DEV                *IdeDev,\r
   IN  EFI_LBA                       MaxAddress,\r
   IN  BOOLEAN                       bVolatile\r
   IN  IDE_BLK_IO_DEV                *IdeDev,\r
   IN  EFI_LBA                       MaxAddress,\r
   IN  BOOLEAN                       bVolatile\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -970,8 +918,7 @@ AtaNonDataCommandIn (
   IN  UINT8           LbaLow,\r
   IN  UINT8           LbaMiddle,\r
   IN  UINT8           LbaHigh\r
   IN  UINT8           LbaLow,\r
   IN  UINT8           LbaMiddle,\r
   IN  UINT8           LbaHigh\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -994,8 +941,7 @@ AtaNonDataCommandInExt (
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1014,8 +960,7 @@ AtaReadSectorsExt (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1034,8 +979,7 @@ AtaWriteSectorsExt (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1054,8 +998,7 @@ AtaUdmaReadExt (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1074,8 +1017,7 @@ AtaUdmaRead (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1094,8 +1036,7 @@ AtaUdmaWriteExt (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Perform an ATA Udma operation (Read, ReadExt, Write, WriteExt).\r
 \r
 /**\r
   Perform an ATA Udma operation (Read, ReadExt, Write, WriteExt).\r


@@ -1129,8 +1070,7 @@ DoAtaUdma (
   IN  EFI_LBA             StartLba,\r
   IN  UINTN               NumberOfBlocks,\r
   IN  ATA_UDMA_OPERATION  UdmaOp\r
   IN  EFI_LBA             StartLba,\r
   IN  UINTN               NumberOfBlocks,\r
   IN  ATA_UDMA_OPERATION  UdmaOp\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1150,8 +1090,7 @@ AtaUdmaWrite (
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r
   IN  VOID            *DataBuffer,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINTN           NumberOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1174,8 +1113,7 @@ AtaCommandIssueExt (
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1198,8 +1136,7 @@ AtaCommandIssue (
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r
   IN  UINT16          Feature,\r
   IN  UINT16          SectorCount,\r
   IN  EFI_LBA         LbaAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1212,8 +1149,7 @@ AtaCommandIssue (
 EFI_STATUS\r
 AtaAtapi6Identify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 EFI_STATUS\r
 AtaAtapi6Identify (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1227,8 +1163,7 @@ AtaAtapi6Identify (
 VOID\r
 AtaSMARTSupport (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r
 VOID\r
 AtaSMARTSupport (\r
   IN  IDE_BLK_IO_DEV  *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1251,8 +1186,7 @@ AtaPioDataInExt (
   IN  UINT8           AtaCommand,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINT16          SectorCount\r
   IN  UINT8           AtaCommand,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINT16          SectorCount\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1275,8 +1209,7 @@ AtaPioDataOutExt (
   IN  UINT8           AtaCommand,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINT16          SectorCount\r
   IN  UINT8           AtaCommand,\r
   IN  EFI_LBA         StartLba,\r
   IN  UINT16          SectorCount\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1291,8 +1224,7 @@ EFI_STATUS
 SetDriveParameters (\r
   IN IDE_BLK_IO_DEV       *IdeDev,\r
   IN ATA_DRIVE_PARMS      *DriveParameters\r
 SetDriveParameters (\r
   IN IDE_BLK_IO_DEV       *IdeDev,\r
   IN ATA_DRIVE_PARMS      *DriveParameters\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -1305,8 +1237,7 @@ SetDriveParameters (
 EFI_STATUS\r
 EnableInterrupt (\r
   IN IDE_BLK_IO_DEV       *IdeDev\r
 EFI_STATUS\r
 EnableInterrupt (\r
   IN IDE_BLK_IO_DEV       *IdeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clear pending IDE interrupt before OS loader/kernel take control of the IDE device.\r
 \r
 /**\r
   Clear pending IDE interrupt before OS loader/kernel take control of the IDE device.\r


@@ -1322,7 +1253,6 @@ EFIAPI
 ClearInterrupt (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r
 ClearInterrupt (\r
   IN EFI_EVENT  Event,\r
   IN VOID       *Context\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
index eece09ad0255f9e0a97524cd961fa5104a306c5c..8e998cb4cda79f43995e9eee897e4ae09fc21414 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@@ -135,8 +135,7 @@ EFIAPI
 IDEBusControllerDriverEntryPoint (\r
   IN EFI_HANDLE                   ImageHandle,\r
   IN EFI_SYSTEM_TABLE             *SystemTable\r
 IDEBusControllerDriverEntryPoint (\r
   IN EFI_HANDLE                   ImageHandle,\r
   IN EFI_SYSTEM_TABLE             *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -154,8 +153,7 @@ IDEBusDriverBindingSupported (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -173,8 +171,7 @@ IDEBusDriverBindingStart (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -194,8 +191,7 @@ IDEBusDriverBindingStop (
   IN  EFI_HANDLE                  Controller,\r
   IN  UINTN                       NumberOfChildren,\r
   IN  EFI_HANDLE                  *ChildHandleBuffer\r
   IN  EFI_HANDLE                  Controller,\r
   IN  UINTN                       NumberOfChildren,\r
   IN  EFI_HANDLE                  *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI Driver Configuration Functions\r
 \r
 //\r
 // EFI Driver Configuration Functions\r


@@ -257,8 +253,7 @@ EFIAPI
 IDEBlkIoReset (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This,\r
   IN  BOOLEAN                     ExtendedVerification\r
 IDEBlkIoReset (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This,\r
   IN  BOOLEAN                     ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -280,8 +275,7 @@ IDEBlkIoReadBlocks (
   IN  EFI_LBA                     LBA,\r
   IN  UINTN                       BufferSize,\r
   OUT VOID                        *Buffer\r
   IN  EFI_LBA                     LBA,\r
   IN  UINTN                       BufferSize,\r
   OUT VOID                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -303,8 +297,7 @@ IDEBlkIoWriteBlocks (
   IN  EFI_LBA                     LBA,\r
   IN  UINTN                       BufferSize,\r
   IN  VOID                        *Buffer\r
   IN  EFI_LBA                     LBA,\r
   IN  UINTN                       BufferSize,\r
   IN  VOID                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -318,8 +311,7 @@ EFI_STATUS
 EFIAPI\r
 IDEBlkIoFlushBlocks (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This\r
 EFIAPI\r
 IDEBlkIoFlushBlocks (\r
   IN  EFI_BLOCK_IO_PROTOCOL       *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -334,8 +326,7 @@ EFI_STATUS
 IDERegisterDecodeEnableorDisable (\r
   IN  EFI_PCI_IO_PROTOCOL         *PciIo,\r
   IN  BOOLEAN                     Enable\r
 IDERegisterDecodeEnableorDisable (\r
   IN  EFI_PCI_IO_PROTOCOL         *PciIo,\r
   IN  BOOLEAN                     Enable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -353,8 +344,7 @@ IDEDiskInfoInquiry (
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   IN OUT VOID                     *InquiryData,\r
   IN OUT UINT32                   *IntquiryDataSize\r
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   IN OUT VOID                     *InquiryData,\r
   IN OUT UINT32                   *IntquiryDataSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -372,8 +362,7 @@ IDEDiskInfoIdentify (
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   IN OUT VOID                     *IdentifyData,\r
   IN OUT UINT32                   *IdentifyDataSize\r
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   IN OUT VOID                     *IdentifyData,\r
   IN OUT UINT32                   *IdentifyDataSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -393,8 +382,7 @@ IDEDiskInfoSenseData (
   IN OUT VOID                     *SenseData,\r
   IN OUT UINT32                   *SenseDataSize,\r
   OUT UINT8                       *SenseDataNumber\r
   IN OUT VOID                     *SenseData,\r
   IN OUT UINT32                   *SenseDataSize,\r
   OUT UINT8                       *SenseDataNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -412,7 +400,6 @@ IDEDiskInfoWhichIde (
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   OUT UINT32                      *IdeChannel,\r
   OUT UINT32                      *IdeDevice\r
   IN EFI_DISK_INFO_PROTOCOL       *This,\r
   OUT UINT32                      *IdeChannel,\r
   OUT UINT32                      *IdeDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
index f838395ea8b83a97a3e134831f81a1ab0b030e19..624ec50b17ecdbeb2f50b8f82ba509c9fbf651a2 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
@@ -79,8 +79,7 @@ PciOperateRegister (
   IN  UINT8         Offset,\r
   IN  UINT8         Operation,\r
   OUT UINT16        *PtrCommand\r
   IN  UINT8         Offset,\r
   IN  UINT8         Operation,\r
   OUT UINT16        *PtrCommand\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   check the cpability of this device supports\r
 \r
 /**\r
   check the cpability of this device supports\r


@@ -93,8 +92,7 @@ PciOperateRegister (
 BOOLEAN\r
 PciCapabilitySupport (\r
   IN PCI_IO_DEVICE  *PciIoDevice\r
 BOOLEAN\r
 PciCapabilitySupport (\r
   IN PCI_IO_DEVICE  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Locate cap reg.\r
 \r
 /**\r
   Locate cap reg.\r


@@ -114,8 +112,7 @@ LocateCapabilityRegBlock (
   IN UINT8          CapId,\r
   IN OUT UINT8      *Offset,\r
   OUT UINT8         *NextRegBlock OPTIONAL\r
   IN UINT8          CapId,\r
   IN OUT UINT8      *Offset,\r
   OUT UINT8         *NextRegBlock OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 #define PciReadCommandRegister(a,b) \\r
 \r
 \r
 #define PciReadCommandRegister(a,b) \\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
index 41251ef3aba11e4b6eea02a2c3cb5c6459606928..059077a89abf0b86b9fbbbe7ab43ff36a49f2c07 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
@@ -20,8 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 InitializePciDevicePool (\r
   VOID\r
 EFI_STATUS\r
 InitializePciDevicePool (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Insert a root bridge into PCI device pool\r
 \r
 /**\r
   Insert a root bridge into PCI device pool\r


@@ -32,8 +31,7 @@ InitializePciDevicePool (
 EFI_STATUS\r
 InsertRootBridge (\r
   PCI_IO_DEVICE *RootBridge\r
 EFI_STATUS\r
 InsertRootBridge (\r
   PCI_IO_DEVICE *RootBridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to insert a PCI device node under\r
 \r
 /**\r
   This function is used to insert a PCI device node under\r


@@ -47,8 +45,7 @@ EFI_STATUS
 InsertPciDevice (\r
   PCI_IO_DEVICE *Bridge,\r
   PCI_IO_DEVICE *PciDeviceNode\r
 InsertPciDevice (\r
   PCI_IO_DEVICE *Bridge,\r
   PCI_IO_DEVICE *PciDeviceNode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroy root bridge and remove it from deivce tree.\r
 \r
 /**\r
   Destroy root bridge and remove it from deivce tree.\r


@@ -59,8 +56,7 @@ InsertPciDevice (
 EFI_STATUS\r
 DestroyRootBridge (\r
   IN PCI_IO_DEVICE *RootBridge\r
 EFI_STATUS\r
 DestroyRootBridge (\r
   IN PCI_IO_DEVICE *RootBridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroy all the pci device node under the bridge.\r
 \r
 /**\r
   Destroy all the pci device node under the bridge.\r


@@ -72,8 +68,7 @@ DestroyRootBridge (
 EFI_STATUS\r
 DestroyPciDeviceTree (\r
   IN PCI_IO_DEVICE *Bridge\r
 EFI_STATUS\r
 DestroyPciDeviceTree (\r
   IN PCI_IO_DEVICE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroy all device nodes under the root bridge\r
 \r
 /**\r
   Destroy all device nodes under the root bridge\r


@@ -86,8 +81,7 @@ DestroyPciDeviceTree (
 EFI_STATUS\r
 DestroyRootBridgeByHandle (\r
   EFI_HANDLE Controller\r
 EFI_STATUS\r
 DestroyRootBridgeByHandle (\r
   EFI_HANDLE Controller\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function registers the PCI IO device. It creates a handle for this PCI IO device\r
 \r
 /**\r
   This function registers the PCI IO device. It creates a handle for this PCI IO device\r


@@ -107,8 +101,7 @@ RegisterPciDevice (
   IN  EFI_HANDLE                     Controller,\r
   IN  PCI_IO_DEVICE                  *PciIoDevice,\r
   OUT EFI_HANDLE                     *Handle OPTIONAL\r
   IN  EFI_HANDLE                     Controller,\r
   IN  PCI_IO_DEVICE                  *PciIoDevice,\r
   OUT EFI_HANDLE                     *Handle OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to remove the whole PCI devices from the bridge.\r
 \r
 /**\r
   This function is used to remove the whole PCI devices from the bridge.\r


@@ -122,8 +115,7 @@ EFI_STATUS
 RemoveAllPciDeviceOnBridge (\r
   EFI_HANDLE               RootBridgeHandle,\r
   PCI_IO_DEVICE            *Bridge\r
 RemoveAllPciDeviceOnBridge (\r
   EFI_HANDLE               RootBridgeHandle,\r
   PCI_IO_DEVICE            *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -140,8 +132,7 @@ EFI_STATUS
 DeRegisterPciDevice (\r
   IN  EFI_HANDLE                     Controller,\r
   IN  EFI_HANDLE                     Handle\r
 DeRegisterPciDevice (\r
   IN  EFI_HANDLE                     Controller,\r
   IN  EFI_HANDLE                     Handle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start to manage the PCI device on specified the root bridge or PCI-PCI Bridge\r
 \r
 /**\r
   Start to manage the PCI device on specified the root bridge or PCI-PCI Bridge\r


@@ -165,8 +156,7 @@ StartPciDevicesOnBridge (
   IN EFI_DEVICE_PATH_PROTOCOL            *RemainingDevicePath,\r
   IN OUT UINT8                           *NumberOfChildren,\r
   IN OUT EFI_HANDLE                      *ChildHandleBuffer\r
   IN EFI_DEVICE_PATH_PROTOCOL            *RemainingDevicePath,\r
   IN OUT UINT8                           *NumberOfChildren,\r
   IN OUT EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start to manage all the PCI devices it found previously under \r
 \r
 /**\r
   Start to manage all the PCI devices it found previously under \r


@@ -178,8 +168,7 @@ StartPciDevicesOnBridge (
 EFI_STATUS\r
 StartPciDevices (\r
   IN EFI_HANDLE                         Controller\r
 EFI_STATUS\r
 StartPciDevices (\r
   IN EFI_HANDLE                         Controller\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create root bridge device\r
 \r
 /**\r
   Create root bridge device\r


@@ -191,8 +180,7 @@ StartPciDevices (
 PCI_IO_DEVICE *\r
 CreateRootBridge (\r
   IN EFI_HANDLE RootBridgeHandle\r
 PCI_IO_DEVICE *\r
 CreateRootBridge (\r
   IN EFI_HANDLE RootBridgeHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get root bridge device instance by specific handle\r
 \r
 /**\r
   Get root bridge device instance by specific handle\r


@@ -204,14 +192,12 @@ CreateRootBridge (
 PCI_IO_DEVICE *\r
 GetRootBridgeByHandle (\r
   EFI_HANDLE RootBridgeHandle\r
 PCI_IO_DEVICE *\r
 GetRootBridgeByHandle (\r
   EFI_HANDLE RootBridgeHandle\r

-  )\r
-;\r
+  );\r

 \r
 BOOLEAN\r
 RootBridgeExisted (\r
   IN EFI_HANDLE RootBridgeHandle\r
 \r
 BOOLEAN\r
 RootBridgeExisted (\r
   IN EFI_HANDLE RootBridgeHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Judege whether Pci device existed\r
 \r
 /**\r
   Judege whether Pci device existed\r


@@ -225,8 +211,7 @@ BOOLEAN
 PciDeviceExisted (\r
   IN PCI_IO_DEVICE    *Bridge,\r
   IN PCI_IO_DEVICE    *PciIoDevice\r
 PciDeviceExisted (\r
   IN PCI_IO_DEVICE    *Bridge,\r
   IN PCI_IO_DEVICE    *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Active VGA device\r
 \r
 /**\r
   Active VGA device\r


@@ -238,8 +223,7 @@ PciDeviceExisted (
 PCI_IO_DEVICE *\r
 ActiveVGADeviceOnTheSameSegment (\r
   IN PCI_IO_DEVICE        *VgaDevice\r
 PCI_IO_DEVICE *\r
 ActiveVGADeviceOnTheSameSegment (\r
   IN PCI_IO_DEVICE        *VgaDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Active VGA device on root bridge\r
 \r
 /**\r
   Active VGA device on root bridge\r


@@ -251,8 +235,7 @@ ActiveVGADeviceOnTheSameSegment (
 PCI_IO_DEVICE *\r
 ActiveVGADeviceOnTheRootBridge (\r
   IN PCI_IO_DEVICE        *RootBridge\r
 PCI_IO_DEVICE *\r
 ActiveVGADeviceOnTheRootBridge (\r
   IN PCI_IO_DEVICE        *RootBridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get HPC PCI address according to its device path\r
 \r
 /**\r
   Get HPC PCI address according to its device path\r


@@ -268,8 +251,7 @@ GetHpcPciAddress (
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *PciRootBridgeIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL         *HpcDevicePath,\r
   OUT UINT64                           *PciAddress\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *PciRootBridgeIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL         *HpcDevicePath,\r
   OUT UINT64                           *PciAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get HPC PCI address according to its device path\r
 \r
 /**\r
   Get HPC PCI address according to its device path\r


@@ -284,8 +266,7 @@ GetHpcPciAddressFromRootBridge (
   IN  PCI_IO_DEVICE                    *RootBridge,\r
   IN  EFI_DEVICE_PATH_PROTOCOL         *RemainingDevicePath,\r
   OUT UINT64                           *PciAddress\r
   IN  PCI_IO_DEVICE                    *RootBridge,\r
   IN  EFI_DEVICE_PATH_PROTOCOL         *RemainingDevicePath,\r
   OUT UINT64                           *PciAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroy a pci device node.\r
 \r
 /**\r
   Destroy a pci device node.\r


@@ -297,7 +278,6 @@ GetHpcPciAddressFromRootBridge (
 EFI_STATUS\r
 FreePciDevice (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 FreePciDevice (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
index e32858bfc1906414fe756fd2c65d9927e717c63d..318df6045c27153345eb824035b67310d8c22006 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
@@ -37,8 +37,7 @@ typedef struct {
 EFI_STATUS\r
 InitializePciDriverOverrideInstance (\r
   PCI_IO_DEVICE  *PciIoDevice\r
 EFI_STATUS\r
 InitializePciDriverOverrideInstance (\r
   PCI_IO_DEVICE  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add an overriding driver image\r
 \r
 /**\r
   Add an overriding driver image\r


@@ -53,8 +52,7 @@ EFI_STATUS
 AddDriver (\r
   IN PCI_IO_DEVICE     *PciIoDevice,\r
   IN EFI_HANDLE        DriverImageHandle\r
 AddDriver (\r
   IN PCI_IO_DEVICE     *PciIoDevice,\r
   IN EFI_HANDLE        DriverImageHandle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -71,7 +69,6 @@ EFIAPI
 GetDriver (\r
   IN EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL              *This,\r
   IN OUT EFI_HANDLE                                         *DriverImageHandle\r
 GetDriver (\r
   IN EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL              *This,\r
   IN OUT EFI_HANDLE                                         *DriverImageHandle\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
index 029e16eb260da50878ba25b4d4ea43471e50b6a9..e1f2a22b30327233a2e3137cd158d8dcfb759638 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
@@ -29,8 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 PciEnumerator (\r
   IN EFI_HANDLE                    Controller\r
 EFI_STATUS\r
 PciEnumerator (\r
   IN EFI_HANDLE                    Controller\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Enumerate PCI root bridge\r
 \r
 /**\r
   Enumerate PCI root bridge\r


@@ -46,8 +45,7 @@ EFI_STATUS
 PciRootBridgeEnumerator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL  *PciResAlloc,\r
   IN PCI_IO_DEVICE                                     *RootBridgeDev\r
 PciRootBridgeEnumerator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL  *PciResAlloc,\r
   IN PCI_IO_DEVICE                                     *RootBridgeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to process option rom on a certain root bridge\r
 \r
 /**\r
   This routine is used to process option rom on a certain root bridge\r


@@ -63,8 +61,7 @@ ProcessOptionRom (
   IN PCI_IO_DEVICE *Bridge,\r
   IN UINT64        RomBase,\r
   IN UINT64        MaxLength\r
   IN PCI_IO_DEVICE *Bridge,\r
   IN UINT64        RomBase,\r
   IN UINT64        MaxLength\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to assign bus number to the given PCI bus system\r
 \r
 /**\r
   This routine is used to assign bus number to the given PCI bus system\r


@@ -80,8 +77,7 @@ PciAssignBusNumber (
   IN PCI_IO_DEVICE                      *Bridge,\r
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber\r
   IN PCI_IO_DEVICE                      *Bridge,\r
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to determine the root bridge attribute by interfacing\r
 \r
 /**\r
   This routine is used to determine the root bridge attribute by interfacing\r


@@ -97,8 +93,7 @@ EFI_STATUS
 DetermineRootBridgeAttributes (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc,\r
   IN PCI_IO_DEVICE                                    *RootBridgeDev\r
 DetermineRootBridgeAttributes (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc,\r
   IN PCI_IO_DEVICE                                    *RootBridgeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Max Option Rom size on this bridge\r
 \r
 /**\r
   Get Max Option Rom size on this bridge\r


@@ -109,8 +104,7 @@ DetermineRootBridgeAttributes (
 UINT64\r
 GetMaxOptionRomSize (\r
   IN PCI_IO_DEVICE   *Bridge\r
 UINT64\r
 GetMaxOptionRomSize (\r
   IN PCI_IO_DEVICE   *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process attributes of devices on this host bridge\r
 \r
 /**\r
   Process attributes of devices on this host bridge\r


@@ -124,8 +118,7 @@ GetMaxOptionRomSize (
 EFI_STATUS\r
 PciHostBridgeDeviceAttribute (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 EFI_STATUS\r
 PciHostBridgeDeviceAttribute (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get resource allocation status from the ACPI pointer\r
 \r
 /**\r
   Get resource allocation status from the ACPI pointer\r


@@ -147,8 +140,7 @@ GetResourceAllocationStatus (
   OUT UINT64  *PMem32ResStatus,\r
   OUT UINT64  *Mem64ResStatus,\r
   OUT UINT64  *PMem64ResStatus\r
   OUT UINT64  *PMem32ResStatus,\r
   OUT UINT64  *Mem64ResStatus,\r
   OUT UINT64  *PMem64ResStatus\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove a PCI device from device pool and mark its bar\r
 \r
 /**\r
   Remove a PCI device from device pool and mark its bar\r


@@ -161,8 +153,7 @@ GetResourceAllocationStatus (
 EFI_STATUS\r
 RejectPciDevice (\r
   IN PCI_IO_DEVICE       *PciDevice\r
 EFI_STATUS\r
 RejectPciDevice (\r
   IN PCI_IO_DEVICE       *PciDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Determine whethter a PCI device can be rejected\r
 \r
 /**\r
   Determine whethter a PCI device can be rejected\r


@@ -174,8 +165,7 @@ RejectPciDevice (
 BOOLEAN\r
 IsRejectiveDevice (\r
   IN  PCI_RESOURCE_NODE   *PciResNode\r
 BOOLEAN\r
 IsRejectiveDevice (\r
   IN  PCI_RESOURCE_NODE   *PciResNode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Compare two resource node and get the larger resource consumer\r
 \r
 /**\r
   Compare two resource node and get the larger resource consumer\r


@@ -189,8 +179,7 @@ PCI_RESOURCE_NODE *
 GetLargerConsumerDevice (\r
   IN  PCI_RESOURCE_NODE   *PciResNode1,\r
   IN  PCI_RESOURCE_NODE   *PciResNode2\r
 GetLargerConsumerDevice (\r
   IN  PCI_RESOURCE_NODE   *PciResNode1,\r
   IN  PCI_RESOURCE_NODE   *PciResNode2\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the max resource consumer in the host resource pool\r
 \r
 /**\r
   Get the max resource consumer in the host resource pool\r


@@ -202,8 +191,7 @@ GetLargerConsumerDevice (
 PCI_RESOURCE_NODE *\r
 GetMaxResourceConsumerDevice (\r
   IN  PCI_RESOURCE_NODE   *ResPool\r
 PCI_RESOURCE_NODE *\r
 GetMaxResourceConsumerDevice (\r
   IN  PCI_RESOURCE_NODE   *ResPool\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Adjust host bridge allocation so as to reduce resource requirement\r
 \r
 /**\r
   Adjust host bridge allocation so as to reduce resource requirement\r


@@ -231,8 +219,7 @@ PciHostBridgeAdjustAllocation (
   IN  UINT64              PMem32ResStatus,\r
   IN  UINT64              Mem64ResStatus,\r
   IN  UINT64              PMem64ResStatus\r
   IN  UINT64              PMem32ResStatus,\r
   IN  UINT64              Mem64ResStatus,\r
   IN  UINT64              PMem64ResStatus\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Summary requests for all resource type, and contruct ACPI resource\r
 \r
 /**\r
   Summary requests for all resource type, and contruct ACPI resource\r


@@ -255,8 +242,7 @@ ConstructAcpiResourceRequestor (
   IN PCI_RESOURCE_NODE  *Mem64Node,\r
   IN PCI_RESOURCE_NODE  *PMem64Node,\r
   OUT VOID              **pConfig\r
   IN PCI_RESOURCE_NODE  *Mem64Node,\r
   IN PCI_RESOURCE_NODE  *PMem64Node,\r
   OUT VOID              **pConfig\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get resource base from a acpi configuration descriptor.\r
 \r
 /**\r
   Get resource base from a acpi configuration descriptor.\r


@@ -278,8 +264,7 @@ GetResourceBase (
   OUT UINT64  *PMem32Base,\r
   OUT UINT64  *Mem64Base,\r
   OUT UINT64  *PMem64Base\r
   OUT UINT64  *PMem32Base,\r
   OUT UINT64  *Mem64Base,\r
   OUT UINT64  *PMem64Base\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Enumerate pci bridge, allocate resource and determine attribute\r
 \r
 /**\r
   Enumerate pci bridge, allocate resource and determine attribute\r


@@ -293,8 +278,7 @@ GetResourceBase (
 EFI_STATUS\r
 PciBridgeEnumerator (\r
   IN PCI_IO_DEVICE                                     *BridgeDev\r
 EFI_STATUS\r
 PciBridgeEnumerator (\r
   IN PCI_IO_DEVICE                                     *BridgeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Allocate all kinds of resource for bridge\r
 \r
 /**\r
   Allocate all kinds of resource for bridge\r


@@ -307,8 +291,7 @@ PciBridgeEnumerator (
 EFI_STATUS\r
 PciBridgeResourceAllocator (\r
   IN PCI_IO_DEVICE  *Bridge\r
 EFI_STATUS\r
 PciBridgeResourceAllocator (\r
   IN PCI_IO_DEVICE  *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get resource base address for a pci bridge device\r
 \r
 /**\r
   Get resource base address for a pci bridge device\r


@@ -330,8 +313,7 @@ GetResourceBaseFromBridge (
   OUT UINT64        *PMem32Base,\r
   OUT UINT64        *Mem64Base,\r
   OUT UINT64        *PMem64Base\r
   OUT UINT64        *PMem32Base,\r
   OUT UINT64        *Mem64Base,\r
   OUT UINT64        *PMem64Base\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process Option Rom on this host bridge\r
 \r
 /**\r
   Process Option Rom on this host bridge\r


@@ -344,8 +326,7 @@ GetResourceBaseFromBridge (
 EFI_STATUS\r
 PciHostBridgeP2CProcess (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 EFI_STATUS\r
 PciHostBridgeP2CProcess (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
    These are the notifications from the PCI bus driver that it is about to enter a certain \r
 \r
 /**\r
    These are the notifications from the PCI bus driver that it is about to enter a certain \r


@@ -413,8 +394,7 @@ EFI_STATUS
 NotifyPhase (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc,\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PHASE       Phase\r
 NotifyPhase (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc,\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PHASE       Phase\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
    Provides the hooks from the PCI bus driver to every PCI controller (device/function) at various\r
 \r
 /**\r
    Provides the hooks from the PCI bus driver to every PCI controller (device/function) at various\r


@@ -450,8 +430,7 @@ PreprocessController (
   IN UINT8                                          Device,\r
   IN UINT8                                          Func,\r
   IN EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE   Phase\r
   IN UINT8                                          Device,\r
   IN UINT8                                          Func,\r
   IN EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE   Phase\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Hot plug request notify.\r
 \r
 /**\r
   Hot plug request notify.\r


@@ -475,8 +454,7 @@ PciHotPlugRequestNotify (
   IN EFI_DEVICE_PATH_PROTOCOL         * RemainingDevicePath OPTIONAL,\r
   IN OUT UINT8                        *NumberOfChildren,\r
   IN OUT EFI_HANDLE                   * ChildHandleBuffer\r
   IN EFI_DEVICE_PATH_PROTOCOL         * RemainingDevicePath OPTIONAL,\r
   IN OUT UINT8                        *NumberOfChildren,\r
   IN OUT EFI_HANDLE                   * ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Search hostbridge according to given handle\r
 \r
 /**\r
   Search hostbridge according to given handle\r


@@ -486,8 +464,7 @@ PciHotPlugRequestNotify (
 BOOLEAN\r
 SearchHostBridgeHandle (\r
   IN EFI_HANDLE RootBridgeHandle\r
 BOOLEAN\r
 SearchHostBridgeHandle (\r
   IN EFI_HANDLE RootBridgeHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add host bridge handle to global variable for enumating.\r
 \r
 /**\r
   Add host bridge handle to global variable for enumating.\r


@@ -497,7 +474,6 @@ SearchHostBridgeHandle (
 EFI_STATUS\r
 AddHostBridgeEnumerator (\r
   IN EFI_HANDLE HostBridgeHandle\r
 EFI_STATUS\r
 AddHostBridgeEnumerator (\r
   IN EFI_HANDLE HostBridgeHandle\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
index 19adc047548870ed3e8d0e279c77a779de8fb56f..ab46b5ac8a48f7a74d7714561e8938659547c4ca 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
@@ -34,8 +34,7 @@ PciDevicePresent (
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Collect all the resource information under this root bridge\r
 \r
 /**\r
   Collect all the resource information under this root bridge\r


@@ -49,8 +48,7 @@ EFI_STATUS
 PciPciDeviceInfoCollector (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
   UINT8                                 StartBusNumber\r
 PciPciDeviceInfoCollector (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
   UINT8                                 StartBusNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Seach required device and get PCI device info block\r
 \r
 /**\r
   Seach required device and get PCI device info block\r


@@ -70,8 +68,7 @@ PciSearchDevice (
   UINT8                                 Device,\r
   UINT8                                 Func,\r
   PCI_IO_DEVICE                         **PciDevice\r
   UINT8                                 Device,\r
   UINT8                                 Func,\r
   PCI_IO_DEVICE                         **PciDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create PCI private data for PCI device\r
 \r
 /**\r
   Create PCI private data for PCI device\r


@@ -91,8 +88,7 @@ GatherDeviceInfo (
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create private data for bridge device's PPB.\r
 \r
 /**\r
   Create private data for bridge device's PPB.\r


@@ -112,8 +108,7 @@ GatherPpbInfo (
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create private data for hotplug bridge device\r
 \r
 /**\r
   Create private data for hotplug bridge device\r


@@ -133,8 +128,7 @@ GatherP2CInfo (
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create device path for pci deivce\r
 \r
 /**\r
   Create device path for pci deivce\r


@@ -148,8 +142,7 @@ EFI_DEVICE_PATH_PROTOCOL  *
 CreatePciDevicePath (\r
   IN  EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,\r
   IN  PCI_IO_DEVICE            *PciIoDevice\r
 CreatePciDevicePath (\r
   IN  EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,\r
   IN  PCI_IO_DEVICE            *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check the bar is existed or not.\r
 \r
 /**\r
   Check the bar is existed or not.\r


@@ -169,8 +162,7 @@ BarExisted (
   IN UINTN         Offset,\r
   OUT UINT32       *BarLengthValue,\r
   OUT UINT32       *OriginalBarValue\r
   IN UINTN         Offset,\r
   OUT UINT32       *BarLengthValue,\r
   OUT UINT32       *OriginalBarValue\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether the device can support attributes \r
 \r
 /**\r
   Test whether the device can support attributes \r


@@ -190,8 +182,7 @@ PciTestSupportedAttribute (
   IN UINT16                             *BridgeControl,\r
   IN UINT16                             *OldCommand,\r
   IN UINT16                             *OldBridgeControl\r
   IN UINT16                             *BridgeControl,\r
   IN UINT16                             *OldCommand,\r
   IN UINT16                             *OldBridgeControl\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the supported or current attributes of a PCI device\r
 \r
 /**\r
   Set the supported or current attributes of a PCI device\r


@@ -208,8 +199,7 @@ PciSetDeviceAttribute (
   IN UINT16                             Command,\r
   IN UINT16                             BridgeControl,\r
   IN UINTN                              Option\r
   IN UINT16                             Command,\r
   IN UINT16                             BridgeControl,\r
   IN UINTN                              Option\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Determine if the device can support Fast Back to Back attribute\r
 \r
 /**\r
   Determine if the device can support Fast Back to Back attribute\r


@@ -221,8 +211,7 @@ EFI_STATUS
 GetFastBackToBackSupport (\r
   IN PCI_IO_DEVICE                      *PciIoDevice,\r
   IN UINT8                              StatusIndex\r
 GetFastBackToBackSupport (\r
   IN PCI_IO_DEVICE                      *PciIoDevice,\r
   IN UINT8                              StatusIndex\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
  Determine the related attributes of all devices under a Root Bridge\r
 \r
 /**\r
  Determine the related attributes of all devices under a Root Bridge\r


@@ -233,8 +222,7 @@ GetFastBackToBackSupport (
 EFI_STATUS\r
 DetermineDeviceAttribute (\r
   IN PCI_IO_DEVICE                      *PciIoDevice\r
 EFI_STATUS\r
 DetermineDeviceAttribute (\r
   IN PCI_IO_DEVICE                      *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to update the bar information for those incompatible PCI device\r
 \r
 /**\r
   This routine is used to update the bar information for those incompatible PCI device\r


@@ -245,8 +233,7 @@ DetermineDeviceAttribute (
 EFI_STATUS\r
 UpdatePciInfo (\r
   IN PCI_IO_DEVICE  *PciIoDevice\r
 EFI_STATUS\r
 UpdatePciInfo (\r
   IN PCI_IO_DEVICE  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine will update the alignment with the new alignment\r
 \r
 /**\r
   This routine will update the alignment with the new alignment\r


@@ -259,8 +246,7 @@ VOID
 SetNewAlign (\r
   IN UINT64 *Alignment,\r
   IN UINT64 NewAlignment\r
 SetNewAlign (\r
   IN UINT64 *Alignment,\r
   IN UINT64 NewAlignment\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Parse PCI bar bit.\r
 \r
 /**\r
   Parse PCI bar bit.\r


@@ -276,8 +262,7 @@ PciParseBar (
   IN PCI_IO_DEVICE  *PciIoDevice,\r
   IN UINTN          Offset,\r
   IN UINTN          BarIndex\r
   IN PCI_IO_DEVICE  *PciIoDevice,\r
   IN UINTN          Offset,\r
   IN UINTN          BarIndex\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to initialize the bar of a PCI device\r
 \r
 /**\r
   This routine is used to initialize the bar of a PCI device\r


@@ -288,8 +273,7 @@ PciParseBar (
 EFI_STATUS\r
 InitializePciDevice (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 InitializePciDevice (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Init PPB for bridge device\r
 \r
 /**\r
   Init PPB for bridge device\r


@@ -299,8 +283,7 @@ InitializePciDevice (
 EFI_STATUS\r
 InitializePpb (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 InitializePpb (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Init private data for Hotplug bridge device\r
 \r
 /**\r
   Init private data for Hotplug bridge device\r


@@ -310,8 +293,7 @@ InitializePpb (
 EFI_STATUS\r
 InitializeP2C (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 InitializeP2C (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create and initiliaze general PCI I/O device instance for\r
 \r
 /**\r
   Create and initiliaze general PCI I/O device instance for\r


@@ -332,8 +314,7 @@ CreatePciIoDevice (
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r
   UINT8                               Bus,\r
   UINT8                               Device,\r
   UINT8                               Func\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to enumerate entire pci bus system\r
 \r
 /**\r
   This routine is used to enumerate entire pci bus system\r


@@ -347,8 +328,7 @@ CreatePciIoDevice (
 EFI_STATUS\r
 PciEnumeratorLight (\r
   IN EFI_HANDLE                    Controller\r
 EFI_STATUS\r
 PciEnumeratorLight (\r
   IN EFI_HANDLE                    Controller\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get bus range.\r
 \r
 /**\r
   Get bus range.\r


@@ -367,14 +347,12 @@ PciGetBusRange (
   OUT    UINT16                             *MinBus,\r
   OUT    UINT16                             *MaxBus,\r
   OUT    UINT16                             *BusRange\r
   OUT    UINT16                             *MinBus,\r
   OUT    UINT16                             *MaxBus,\r
   OUT    UINT16                             *BusRange\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 StartManagingRootBridge (\r
   IN PCI_IO_DEVICE *RootBridgeDev\r
 \r
 EFI_STATUS\r
 StartManagingRootBridge (\r
   IN PCI_IO_DEVICE *RootBridgeDev\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine can be used to check whether a PCI device should be rejected when light enumeration\r
 \r
 /**\r
   This routine can be used to check whether a PCI device should be rejected when light enumeration\r


@@ -388,7 +366,6 @@ StartManagingRootBridge (
 BOOLEAN\r
 IsPciDeviceRejected (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 BOOLEAN\r
 IsPciDeviceRejected (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
index 4f5037136c5fb7dcba1e38b3fc6e25dfe51490d3..bc1253d7a13817b271a04a603695ffdafd6e23ab 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
@@ -43,8 +43,7 @@ EFIAPI
 PciHPCInitialized (\r
   IN EFI_EVENT    Event,\r
   IN VOID         *Context\r
 PciHPCInitialized (\r
   IN EFI_EVENT    Event,\r
   IN VOID         *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Compare two device path\r
 \r
 /**\r
   Compare two device path\r


@@ -59,8 +58,7 @@ BOOLEAN
 EfiCompareDevicePath (\r
   IN EFI_DEVICE_PATH_PROTOCOL *DevicePath1,\r
   IN EFI_DEVICE_PATH_PROTOCOL *DevicePath2\r
 EfiCompareDevicePath (\r
   IN EFI_DEVICE_PATH_PROTOCOL *DevicePath1,\r
   IN EFI_DEVICE_PATH_PROTOCOL *DevicePath2\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Init hot plug support and root hot plug private data.\r
 \r
 /**\r
   Init hot plug support and root hot plug private data.\r


@@ -69,8 +67,7 @@ EfiCompareDevicePath (
 EFI_STATUS\r
 InitializeHotPlugSupport (\r
   VOID\r
 EFI_STATUS\r
 InitializeHotPlugSupport (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether PCI device is hot plug bus.\r
 \r
 /**\r
   Test whether PCI device is hot plug bus.\r


@@ -83,8 +80,7 @@ InitializeHotPlugSupport (
 EFI_STATUS\r
 IsPciHotPlugBus (\r
   PCI_IO_DEVICE                       *PciIoDevice\r
 EFI_STATUS\r
 IsPciHotPlugBus (\r
   PCI_IO_DEVICE                       *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether device path is for root pci hot plug bus\r
 \r
 /**\r
   Test whether device path is for root pci hot plug bus\r


@@ -99,8 +95,7 @@ BOOLEAN
 IsRootPciHotPlugBus (\r
   IN EFI_DEVICE_PATH_PROTOCOL         *HpbDevicePath,\r
   OUT UINTN                           *HpIndex\r
 IsRootPciHotPlugBus (\r
   IN EFI_DEVICE_PATH_PROTOCOL         *HpbDevicePath,\r
   OUT UINTN                           *HpIndex\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether device path is for root pci hot plug controller\r
 \r
 /**\r
   Test whether device path is for root pci hot plug controller\r


@@ -115,8 +110,7 @@ BOOLEAN
 IsRootPciHotPlugController (\r
   IN EFI_DEVICE_PATH_PROTOCOL         *HpcDevicePath,\r
   OUT UINTN                           *HpIndex\r
 IsRootPciHotPlugController (\r
   IN EFI_DEVICE_PATH_PROTOCOL         *HpcDevicePath,\r
   OUT UINTN                           *HpIndex\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper for creating event object for HPC \r
 \r
 /**\r
   Wrapper for creating event object for HPC \r


@@ -130,8 +124,7 @@ EFI_STATUS
 CreateEventForHpc (\r
   IN UINTN       HpIndex,\r
   OUT EFI_EVENT  *Event\r
 CreateEventForHpc (\r
   IN UINTN       HpIndex,\r
   OUT EFI_EVENT  *Event\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wait for all root HPC initialized.\r
 \r
 /**\r
   Wait for all root HPC initialized.\r


@@ -141,8 +134,7 @@ CreateEventForHpc (
 EFI_STATUS\r
 AllRootHPCInitialized (\r
   IN  UINTN           TimeoutInMicroSeconds\r
 EFI_STATUS\r
 AllRootHPCInitialized (\r
   IN  UINTN           TimeoutInMicroSeconds\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check HPC capability register block\r
 \r
 /**\r
   Check HPC capability register block\r


@@ -155,8 +147,7 @@ AllRootHPCInitialized (
 EFI_STATUS\r
 IsSHPC (\r
   PCI_IO_DEVICE                       *PciIoDevice\r
 EFI_STATUS\r
 IsSHPC (\r
   PCI_IO_DEVICE                       *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get resource padding for hot plug bus\r
 \r
 /**\r
   Get resource padding for hot plug bus\r


@@ -169,7 +160,6 @@ IsSHPC (
 EFI_STATUS\r
 GetResourcePaddingForHpb (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 GetResourcePaddingForHpb (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h
index 216ee402fd5cc6a5fc1a89150a44853b03cbeec3..f1ac6ed58c8e2b295a3addf7451b96a55e3c3809 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.h
@@ -25,8 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 InitializePciIoInstance (\r
   PCI_IO_DEVICE  *PciIoDevice\r
 EFI_STATUS\r
 InitializePciIoInstance (\r
   PCI_IO_DEVICE  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Verifies access to a PCI Base Address Register (BAR)\r
 \r
 /**\r
   Verifies access to a PCI Base Address Register (BAR)\r


@@ -50,8 +49,7 @@ PciIoVerifyBarAccess (
   IN EFI_PCI_IO_PROTOCOL_WIDTH    Width,\r
   IN UINTN                        Count,\r
   UINT64                          *Offset\r
   IN EFI_PCI_IO_PROTOCOL_WIDTH    Width,\r
   IN UINTN                        Count,\r
   UINT64                          *Offset\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Verifies access to a PCI Config Header\r
 \r
 /**\r
   Verifies access to a PCI Config Header\r


@@ -71,8 +69,7 @@ PciIoVerifyConfigAccess (
   IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,\r
   IN UINTN                      Count,\r
   IN UINT64                     *Offset\r
   IN EFI_PCI_IO_PROTOCOL_WIDTH  Width,\r
   IN UINTN                      Count,\r
   IN UINT64                     *Offset\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r
 \r
 /**\r
   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r


@@ -104,8 +101,7 @@ PciIoPollMem (
   IN  UINT64                     Value,\r
   IN  UINT64                     Delay,\r
   OUT UINT64                     *Result\r
   IN  UINT64                     Value,\r
   IN  UINT64                     Delay,\r
   OUT UINT64                     *Result\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r
 \r
 /**                                                                 \r
   Reads from the I/O space of a PCI Root Bridge. Returns when either the polling exit criteria is\r


@@ -136,8 +132,7 @@ PciIoPollIo (
   IN  UINT64                     Value,\r
   IN  UINT64                     Delay,\r
   OUT UINT64                     *Result\r
   IN  UINT64                     Value,\r
   IN  UINT64                     Delay,\r
   OUT UINT64                     *Result\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r


@@ -168,8 +163,7 @@ PciIoMemRead (
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r


@@ -200,8 +194,7 @@ PciIoMemWrite (
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r


@@ -232,8 +225,7 @@ PciIoIoRead (
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in the PCI memory or I/O space.\r


@@ -264,8 +256,7 @@ PciIoIoWrite (
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT64                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r


@@ -293,8 +284,7 @@ PciIoConfigRead (
   IN     UINT32                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT32                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r
 \r
 /**                                                                 \r
   Enable a PCI driver to access PCI controller registers in PCI configuration space.\r


@@ -322,8 +312,7 @@ PciIoConfigWrite (
   IN     UINT32                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r
   IN     UINT32                     Offset,\r
   IN     UINTN                      Count,\r
   IN OUT VOID                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Enables a PCI driver to copy one region of PCI memory space to another region of PCI\r
 \r
 /**                                                                 \r
   Enables a PCI driver to copy one region of PCI memory space to another region of PCI\r


@@ -363,8 +352,7 @@ PciIoCopyMem (
   IN     UINT8                        SrcBarIndex,\r
   IN     UINT64                       SrcOffset,\r
   IN     UINTN                        Count\r
   IN     UINT8                        SrcBarIndex,\r
   IN     UINT64                       SrcOffset,\r
   IN     UINTN                        Count\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Provides the PCI controller-Cspecific addresses needed to access system memory.\r
 \r
 /**                                                                 \r
   Provides the PCI controller-Cspecific addresses needed to access system memory.\r


@@ -394,8 +382,7 @@ PciIoMap (
   IN OUT UINTN                          *NumberOfBytes,\r
   OUT    EFI_PHYSICAL_ADDRESS           *DeviceAddress,\r
   OUT    VOID                           **Mapping\r
   IN OUT UINTN                          *NumberOfBytes,\r
   OUT    EFI_PHYSICAL_ADDRESS           *DeviceAddress,\r
   OUT    VOID                           **Mapping\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Completes the Map() operation and releases any corresponding resources.\r
 \r
 /**                                                                 \r
   Completes the Map() operation and releases any corresponding resources.\r


@@ -412,8 +399,7 @@ EFIAPI
 PciIoUnmap (\r
   IN  EFI_PCI_IO_PROTOCOL  *This,\r
   IN  VOID                 *Mapping\r
 PciIoUnmap (\r
   IN  EFI_PCI_IO_PROTOCOL  *This,\r
   IN  VOID                 *Mapping\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Allocates pages that are suitable for an EfiPciIoOperationBusMasterCommonBuffer\r
 \r
 /**                                                                 \r
   Allocates pages that are suitable for an EfiPciIoOperationBusMasterCommonBuffer\r


@@ -444,8 +430,7 @@ PciIoAllocateBuffer (
   IN  UINTN                 Pages,\r
   OUT VOID                  **HostAddress,\r
   IN  UINT64                Attributes\r
   IN  UINTN                 Pages,\r
   OUT VOID                  **HostAddress,\r
   IN  UINT64                Attributes\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Frees memory that was allocated with AllocateBuffer().\r
 \r
 /**                                                                 \r
   Frees memory that was allocated with AllocateBuffer().\r


@@ -465,8 +450,7 @@ PciIoFreeBuffer (
   IN  EFI_PCI_IO_PROTOCOL   *This,\r
   IN  UINTN                 Pages,\r
   IN  VOID                  *HostAddress\r
   IN  EFI_PCI_IO_PROTOCOL   *This,\r
   IN  UINTN                 Pages,\r
   IN  VOID                  *HostAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r
 \r
 /**                                                                 \r
   Flushes all PCI posted write transactions from a PCI host bridge to system memory.\r


@@ -483,8 +467,7 @@ EFI_STATUS
 EFIAPI\r
 PciIoFlush (\r
   IN  EFI_PCI_IO_PROTOCOL  *This\r
 EFIAPI\r
 PciIoFlush (\r
   IN  EFI_PCI_IO_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Retrieves this PCI controller's current PCI bus number, device number, and function number.\r
 \r
 /**                                                                 \r
   Retrieves this PCI controller's current PCI bus number, device number, and function number.\r


@@ -507,8 +490,7 @@ PciIoGetLocation (
   OUT UINTN                *Bus,\r
   OUT UINTN                *Device,\r
   OUT UINTN                *Function\r
   OUT UINTN                *Bus,\r
   OUT UINTN                *Device,\r
   OUT UINTN                *Function\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check BAR type for PCI resource.\r
 \r
 /**\r
   Check BAR type for PCI resource.\r


@@ -525,8 +507,7 @@ CheckBarType (
   IN PCI_IO_DEVICE       *PciIoDevice,\r
   UINT8                  BarIndex,\r
   PCI_BAR_TYPE           BarType\r
   IN PCI_IO_DEVICE       *PciIoDevice,\r
   UINT8                  BarIndex,\r
   PCI_BAR_TYPE           BarType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set/Disable new attributes to a Root Bridge\r
 \r
 /**\r
   Set/Disable new attributes to a Root Bridge\r


@@ -543,8 +524,7 @@ ModifyRootBridgeAttributes (
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  UINT64                                   Attributes,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation\r
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  UINT64                                   Attributes,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check whether this device can be enable/disable to snoop\r
 \r
 /**\r
   Check whether this device can be enable/disable to snoop\r


@@ -559,8 +539,7 @@ EFI_STATUS
 SupportPaletteSnoopAttributes (\r
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation\r
 SupportPaletteSnoopAttributes (\r
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Performs an operation on the attributes that this PCI controller supports. The operations include\r
 \r
 /**                                                                 \r
   Performs an operation on the attributes that this PCI controller supports. The operations include\r


@@ -588,8 +567,7 @@ PciIoAttributes (
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation,\r
   IN  UINT64                                   Attributes,\r
   OUT UINT64                                   *Result OPTIONAL\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation,\r
   IN  UINT64                                   Attributes,\r
   OUT UINT64                                   *Result OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Gets the attributes that this PCI controller supports setting on a BAR using\r
 \r
 /**                                                                 \r
   Gets the attributes that this PCI controller supports setting on a BAR using\r


@@ -620,8 +598,7 @@ PciIoGetBarAttributes (
   IN  UINT8                          BarIndex,\r
   OUT UINT64                         *Supports, OPTIONAL\r
   OUT VOID                           **Resources OPTIONAL\r
   IN  UINT8                          BarIndex,\r
   OUT UINT64                         *Supports, OPTIONAL\r
   OUT VOID                           **Resources OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**                                                                 \r
   Sets the attributes for a range of a BAR on a PCI controller.\r
 \r
 /**                                                                 \r
   Sets the attributes for a range of a BAR on a PCI controller.\r


@@ -655,8 +632,7 @@ PciIoSetBarAttributes (
   IN     UINT8                        BarIndex,\r
   IN OUT UINT64                       *Offset,\r
   IN OUT UINT64                       *Length\r
   IN     UINT8                        BarIndex,\r
   IN OUT UINT64                       *Offset,\r
   IN OUT UINT64                       *Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Program parent bridge's attribute recurrently.\r
 \r
 /**\r
   Program parent bridge's attribute recurrently.\r


@@ -678,8 +654,7 @@ UpStreamBridgesAttributes (
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation,\r
   IN  UINT64                                   Attributes\r
   IN  PCI_IO_DEVICE                            *PciIoDevice,\r
   IN  EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION  Operation,\r
   IN  UINT64                                   Attributes\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether two Pci device has same parent bridge.\r
 \r
 /**\r
   Test whether two Pci device has same parent bridge.\r


@@ -693,7 +668,6 @@ BOOLEAN
 PciDevicesOnTheSamePath (\r
   IN PCI_IO_DEVICE        *PciDevice1,\r
   IN PCI_IO_DEVICE        *PciDevice2\r
 PciDevicesOnTheSamePath (\r
   IN PCI_IO_DEVICE        *PciDevice1,\r
   IN PCI_IO_DEVICE        *PciDevice2\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
index 639da70be8253d3439445ac7936adf987c8b2ce2..80c3af6c6cf94abd7c4b3e4fa22e00f7f0a4e1d4 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciLib.h
@@ -56,8 +56,7 @@ typedef struct {
 void\r
 InstallHotPlugRequestProtocol (\r
   IN  EFI_STATUS                    *Status\r
 void\r
 InstallHotPlugRequestProtocol (\r
   IN  EFI_STATUS                    *Status\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Install protocol gEfiPciHotplugDeviceGuid into hotplug device\r
 \r
 /**\r
   Install protocol gEfiPciHotplugDeviceGuid into hotplug device\r


@@ -69,8 +68,7 @@ InstallHotPlugRequestProtocol (
 VOID\r
 InstallPciHotplugGuid (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r
 VOID\r
 InstallPciHotplugGuid (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device\r
 \r
 /**\r
   UnInstall protocol gEfiPciHotplugDeviceGuid into hotplug device\r


@@ -82,8 +80,7 @@ InstallPciHotplugGuid (
 VOID\r
 UninstallPciHotplugGuid (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r
 VOID\r
 UninstallPciHotplugGuid (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieve the BAR information via PciIo interface\r
 \r
 /**\r
   Retrieve the BAR information via PciIo interface\r


@@ -93,8 +90,7 @@ UninstallPciHotplugGuid (
 VOID\r
 GetBackPcCardBar (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r
 VOID\r
 GetBackPcCardBar (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove rejected pci device from specific root bridge\r
 \r
 /**\r
   Remove rejected pci device from specific root bridge\r


@@ -109,8 +105,7 @@ EFI_STATUS
 RemoveRejectedPciDevices (\r
   EFI_HANDLE        RootBridgeHandle,\r
   IN PCI_IO_DEVICE  *Bridge\r
 RemoveRejectedPciDevices (\r
   EFI_HANDLE        RootBridgeHandle,\r
   IN PCI_IO_DEVICE  *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for allocating resource for pci host bridge.\r
 \r
 /**\r
   Wrapper function for allocating resource for pci host bridge.\r


@@ -121,20 +116,17 @@ RemoveRejectedPciDevices (
 EFI_STATUS\r
 PciHostBridgeResourceAllocator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 EFI_STATUS\r
 PciHostBridgeResourceAllocator (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PciHostBridgeResourceAllocator_WithoutHotPlugDeviceSupport (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 \r
 EFI_STATUS\r
 PciHostBridgeResourceAllocator_WithoutHotPlugDeviceSupport (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PciHostBridgeResourceAllocator_WithHotPlugDeviceSupport (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 \r
 EFI_STATUS\r
 PciHostBridgeResourceAllocator_WithHotPlugDeviceSupport (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wapper function of scanning pci bus and assign bus number to the given PCI bus system\r
 \r
 /**\r
   Wapper function of scanning pci bus and assign bus number to the given PCI bus system\r


@@ -154,8 +146,7 @@ PciScanBus (
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PciScanBus_WithHotPlugDeviceSupport (\r
 \r
 EFI_STATUS\r
 PciScanBus_WithHotPlugDeviceSupport (\r


@@ -163,8 +154,7 @@ PciScanBus_WithHotPlugDeviceSupport (
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PciScanBus_WithoutHotPlugDeviceSupport (\r
 \r
 EFI_STATUS\r
 PciScanBus_WithoutHotPlugDeviceSupport (\r


@@ -172,8 +162,7 @@ PciScanBus_WithoutHotPlugDeviceSupport (
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r
   IN UINT8                              StartBusNumber,\r
   OUT UINT8                             *SubBusNumber,\r
   OUT UINT8                             *PaddedBusRange\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process Option Rom on this host bridge\r
 \r
 /**\r
   Process Option Rom on this host bridge\r


@@ -186,8 +175,7 @@ PciScanBus_WithoutHotPlugDeviceSupport (
 EFI_STATUS\r
 PciRootBridgeP2CProcess (\r
   IN PCI_IO_DEVICE *Bridge\r
 EFI_STATUS\r
 PciRootBridgeP2CProcess (\r
   IN PCI_IO_DEVICE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process Option Rom on this host bridge\r
 \r
 /**\r
   Process Option Rom on this host bridge\r


@@ -200,8 +188,7 @@ PciRootBridgeP2CProcess (
 EFI_STATUS\r
 PciHostBridgeP2CProcess (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r
 EFI_STATUS\r
 PciHostBridgeP2CProcess (\r
   IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to enumerate the entire host bridge\r
 \r
 /**\r
   This function is used to enumerate the entire host bridge\r


@@ -217,8 +204,7 @@ PciHostBridgeP2CProcess (
 EFI_STATUS\r
 PciHostBridgeEnumerator (\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL  *PciResAlloc\r
 EFI_STATUS\r
 PciHostBridgeEnumerator (\r
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL  *PciResAlloc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read PCI configuration space through EFI_PCI_IO_PROTOCOL.\r
 \r
 /**\r
   Read PCI configuration space through EFI_PCI_IO_PROTOCOL.\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
index c2ed590b670db56320fbbe87701d1cd2b87a8fa9..0bb9444e787d08f7180266cac51ea0d55859ca2f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
@@ -23,8 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 GetOpRomInfo (\r
   IN PCI_IO_DEVICE    *PciIoDevice\r
 EFI_STATUS\r
 GetOpRomInfo (\r
   IN PCI_IO_DEVICE    *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Load option rom image for specified PCI device\r
 \r
 /**\r
   Load option rom image for specified PCI device\r


@@ -39,8 +38,7 @@ EFI_STATUS
 LoadOpRomImage (\r
   IN PCI_IO_DEVICE   *PciDevice,\r
   IN UINT64          RomBase\r
 LoadOpRomImage (\r
   IN PCI_IO_DEVICE   *PciDevice,\r
   IN UINT64          RomBase\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   enable/disable oprom decode\r
 \r
 /**\r
   enable/disable oprom decode\r


@@ -59,8 +57,7 @@ RomDecode (
   IN UINT8           RomBarIndex,\r
   IN UINT32          RomBar,\r
   IN BOOLEAN         Enable\r
   IN UINT8           RomBarIndex,\r
   IN UINT32          RomBar,\r
   IN BOOLEAN         Enable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process the oprom image.\r
 \r
 /**\r
   Process the oprom image.\r


@@ -70,7 +67,6 @@ RomDecode (
 EFI_STATUS\r
 ProcessOpRomImage (\r
   PCI_IO_DEVICE   *PciDevice\r
 EFI_STATUS\r
 ProcessOpRomImage (\r
   PCI_IO_DEVICE   *PciDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
index c7dff8c91b0c3ec124c3e3868179e35fd8807f7d..1f15e7403a8df77e745ccebd1cb9f22cf4c35293 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
@@ -27,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 ResetPowerManagementFeature (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
 EFI_STATUS\r
 ResetPowerManagementFeature (\r
   IN PCI_IO_DEVICE *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
index b255dc9ca96a849a27713f9576871c784c8454ec..028071419da105d1be00db748762624e50079c6c 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
@@ -71,8 +71,7 @@ EFI_STATUS
 SkipVGAAperture (\r
   OUT UINT64   *Start,\r
   IN  UINT64   Length\r
 SkipVGAAperture (\r
   OUT UINT64   *Start,\r
   IN  UINT64   Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to skip ISA aliasing aperture\r
 \r
 /**\r
   This function is used to skip ISA aliasing aperture\r


@@ -86,8 +85,7 @@ EFI_STATUS
 SkipIsaAliasAperture (\r
   OUT UINT64   *Start,\r
   IN  UINT64   Length\r
 SkipIsaAliasAperture (\r
   OUT UINT64   *Start,\r
   IN  UINT64   Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function inserts a resource node into the resource list.\r
 \r
 /**\r
   This function inserts a resource node into the resource list.\r


@@ -102,8 +100,7 @@ EFI_STATUS
 InsertResourceNode (\r
   PCI_RESOURCE_NODE *Bridge,\r
   PCI_RESOURCE_NODE *ResNode\r
 InsertResourceNode (\r
   PCI_RESOURCE_NODE *Bridge,\r
   PCI_RESOURCE_NODE *ResNode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -130,8 +127,7 @@ MergeResourceTree (
   PCI_RESOURCE_NODE *Dst,\r
   PCI_RESOURCE_NODE *Res,\r
   BOOLEAN           TypeMerge\r
   PCI_RESOURCE_NODE *Dst,\r
   PCI_RESOURCE_NODE *Res,\r
   BOOLEAN           TypeMerge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to calculate the IO16 aperture\r
 \r
 /**\r
   This function is used to calculate the IO16 aperture\r


@@ -144,8 +140,7 @@ MergeResourceTree (
 EFI_STATUS\r
 CalculateApertureIo16 (\r
   IN PCI_RESOURCE_NODE *Bridge\r
 EFI_STATUS\r
 CalculateApertureIo16 (\r
   IN PCI_RESOURCE_NODE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to calculate the resource aperture\r
 \r
 /**\r
   This function is used to calculate the resource aperture\r


@@ -158,8 +153,7 @@ CalculateApertureIo16 (
 EFI_STATUS\r
 CalculateResourceAperture (\r
   IN PCI_RESOURCE_NODE *Bridge\r
 EFI_STATUS\r
 CalculateResourceAperture (\r
   IN PCI_RESOURCE_NODE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get IO/Memory resource infor for given PCI device\r
 \r
 /**\r
   Get IO/Memory resource infor for given PCI device\r


@@ -181,8 +175,7 @@ GetResourceFromDevice (
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to create a resource node\r
 \r
 /**\r
   This function is used to create a resource node\r


@@ -202,8 +195,7 @@ CreateResourceNode (
   IN UINT8                 Bar,\r
   IN PCI_BAR_TYPE          ResType,\r
   IN PCI_RESOURCE_USAGE    ResUsage\r
   IN UINT8                 Bar,\r
   IN PCI_BAR_TYPE          ResType,\r
   IN PCI_RESOURCE_USAGE    ResUsage\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine is used to extract resource request from\r
 \r
 /**\r
   This routine is used to extract resource request from\r


@@ -226,8 +218,7 @@ CreateResourceMap (
   IN PCI_RESOURCE_NODE *PMem32Node,\r
   IN PCI_RESOURCE_NODE *Mem64Node,\r
   IN PCI_RESOURCE_NODE *PMem64Node\r
   IN PCI_RESOURCE_NODE *PMem32Node,\r
   IN PCI_RESOURCE_NODE *Mem64Node,\r
   IN PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to do the resource padding for a specific platform\r
 \r
 /**\r
   This function is used to do the resource padding for a specific platform\r


@@ -249,8 +240,7 @@ ResourcePaddingPolicy (
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to degrade resource if the upstream bridge \r
 \r
 /**\r
   This function is used to degrade resource if the upstream bridge \r


@@ -275,8 +265,7 @@ DegradeResource (
   IN PCI_RESOURCE_NODE *PMem32Node,\r
   IN PCI_RESOURCE_NODE *Mem64Node,\r
   IN PCI_RESOURCE_NODE *PMem64Node\r
   IN PCI_RESOURCE_NODE *PMem32Node,\r
   IN PCI_RESOURCE_NODE *Mem64Node,\r
   IN PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether bridge device support decode resource\r
 \r
 /**\r
   Test whether bridge device support decode resource\r


@@ -291,8 +280,7 @@ BOOLEAN
 BridgeSupportResourceDecode (\r
   IN PCI_IO_DEVICE *Bridge,\r
   IN UINT32        Decode\r
 BridgeSupportResourceDecode (\r
   IN PCI_IO_DEVICE *Bridge,\r
   IN UINT32        Decode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is used to program the resource allocated \r
 \r
 /**\r
   This function is used to program the resource allocated \r


@@ -308,8 +296,7 @@ EFI_STATUS
 ProgramResource (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Bridge\r
 ProgramResource (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Program Bar register.\r
 \r
 /**\r
   Program Bar register.\r


@@ -323,8 +310,7 @@ EFI_STATUS
 ProgramBar (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r
 ProgramBar (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Program PPB apperture\r
 \r
 /**\r
   Program PPB apperture\r


@@ -338,8 +324,7 @@ EFI_STATUS
 ProgramPpbApperture (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r
 ProgramPpbApperture (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Program parent bridge for oprom\r
 \r
 /**\r
   Program parent bridge for oprom\r


@@ -355,8 +340,7 @@ ProgrameUpstreamBridgeForRom (
   IN PCI_IO_DEVICE   *PciDevice,\r
   IN UINT32          OptionRomBase,\r
   IN BOOLEAN         Enable\r
   IN PCI_IO_DEVICE   *PciDevice,\r
   IN UINT32          OptionRomBase,\r
   IN BOOLEAN         Enable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test whether resource exists for a bridge\r
 \r
 /**\r
   Test whether resource exists for a bridge\r


@@ -368,8 +352,7 @@ ProgrameUpstreamBridgeForRom (
 BOOLEAN\r
 ResourceRequestExisted (\r
   IN PCI_RESOURCE_NODE *Bridge\r
 BOOLEAN\r
 ResourceRequestExisted (\r
   IN PCI_RESOURCE_NODE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize resource pool structure.\r
 \r
 /**\r
   Initialize resource pool structure.\r


@@ -381,8 +364,7 @@ EFI_STATUS
 InitializeResourcePool (\r
   PCI_RESOURCE_NODE   *ResourcePool,\r
   PCI_BAR_TYPE        ResourceType\r
 InitializeResourcePool (\r
   PCI_RESOURCE_NODE   *ResourcePool,\r
   PCI_BAR_TYPE        ResourceType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get all resource information for given Pci device\r
 \r
 /**\r
   Get all resource information for given Pci device\r


@@ -414,8 +396,7 @@ GetResourceMap (
   PCI_RESOURCE_NODE  *PMem32Pool,\r
   PCI_RESOURCE_NODE  *Mem64Pool,\r
   PCI_RESOURCE_NODE  *PMem64Pool\r
   PCI_RESOURCE_NODE  *PMem32Pool,\r
   PCI_RESOURCE_NODE  *Mem64Pool,\r
   PCI_RESOURCE_NODE  *PMem64Pool\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destory given resource tree\r
 \r
 /**\r
   Destory given resource tree\r


@@ -427,8 +408,7 @@ GetResourceMap (
 EFI_STATUS\r
 DestroyResourceTree (\r
   IN PCI_RESOURCE_NODE *Bridge\r
 EFI_STATUS\r
 DestroyResourceTree (\r
   IN PCI_RESOURCE_NODE *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Record the reserved resource and insert to reserved list.\r
 \r
 /**\r
   Record the reserved resource and insert to reserved list.\r


@@ -444,8 +424,7 @@ RecordReservedResource (
   IN UINT64         Length,\r
   IN PCI_BAR_TYPE   ResType,\r
   IN PCI_IO_DEVICE  *Bridge\r
   IN UINT64         Length,\r
   IN PCI_BAR_TYPE   ResType,\r
   IN PCI_IO_DEVICE  *Bridge\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Insert resource padding for P2C\r
 \r
 /**\r
   Insert resource padding for P2C\r


@@ -467,8 +446,7 @@ ResourcePaddingForCardBusBridge (
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Program P2C register for given resource node\r
 \r
 /**\r
   Program P2C register for given resource node\r


@@ -482,8 +460,7 @@ EFI_STATUS
 ProgramP2C (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r
 ProgramP2C (\r
   IN UINT64            Base,\r
   IN PCI_RESOURCE_NODE *Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create padding resource node.\r
 \r
 /**\r
   Create padding resource node.\r


@@ -506,8 +483,7 @@ ApplyResourcePadding (
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r
   PCI_RESOURCE_NODE *PMem32Node,\r
   PCI_RESOURCE_NODE *Mem64Node,\r
   PCI_RESOURCE_NODE *PMem64Node\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get padding resource for PPB\r
 \r
 /**\r
   Get padding resource for PPB\r


@@ -519,8 +495,7 @@ ApplyResourcePadding (
 VOID\r
 GetResourcePaddingPpb (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r
 VOID\r
 GetResourcePaddingPpb (\r
   IN  PCI_IO_DEVICE                  *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reset and all bus number from specific bridge.\r
 \r
 /**\r
   Reset and all bus number from specific bridge.\r


@@ -532,7 +507,6 @@ EFI_STATUS
 ResetAllPpbBusNumber (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
   IN UINT8                              StartBusNumber\r
 ResetAllPpbBusNumber (\r
   IN PCI_IO_DEVICE                      *Bridge,\r
   IN UINT8                              StartBusNumber\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
index 59bff9279f6c5e8a8e3cb20732d8ec633b0ffeaf..4e01012d64441268fb8c85e92a07a304347b52d3 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
@@ -35,8 +35,7 @@ PciRomAddImageMapping (
   IN UINT8       Func,\r
   IN UINT64      RomAddress,\r
   IN UINT64      RomLength\r
   IN UINT8       Func,\r
   IN UINT64      RomAddress,\r
   IN UINT64      RomLength\r

-  )\r
-;\r
+  );\r

 /**\r
   Load all option rom image to PCI driver list.\r
   \r
 /**\r
   Load all option rom image to PCI driver list.\r
   \r


@@ -49,8 +48,7 @@ PciRomGetRomResourceFromPciOptionRomTable (
   IN EFI_DRIVER_BINDING_PROTOCOL      *This,\r
   IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *PciRootBridgeIo,\r
   PCI_IO_DEVICE                       *PciIoDevice\r
   IN EFI_DRIVER_BINDING_PROTOCOL      *This,\r
   IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *PciRootBridgeIo,\r
   PCI_IO_DEVICE                       *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Option rom driver's mapping for PCI device.\r
 \r
 /**\r
   Get Option rom driver's mapping for PCI device.\r


@@ -61,7 +59,6 @@ PciRomGetRomResourceFromPciOptionRomTable (
 EFI_STATUS\r
 PciRomGetImageMapping (\r
   PCI_IO_DEVICE                       *PciIoDevice\r
 EFI_STATUS\r
 PciRomGetImageMapping (\r
   PCI_IO_DEVICE                       *PciIoDevice\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
index 54d06bd2db05c2cd024fc5d337ddd36de9b8b499..389ee6d001cf07e7010f2abdea07260f3cbd1ac8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
@@ -64,8 +64,7 @@ EFIAPI
 PeimInitializeVariableServices (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
 PeimInitializeVariableServices (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -76,8 +75,7 @@ PeiGetVariable (
   OUT UINT32                      *Attributes OPTIONAL,\r
   IN OUT UINTN                    *DataSize,\r
   OUT VOID                        *Data\r
   OUT UINT32                      *Attributes OPTIONAL,\r
   IN OUT UINTN                    *DataSize,\r
   OUT VOID                        *Data\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -88,8 +86,7 @@ PeiGetVariable2 (
   OUT       UINT32                          *Attributes,\r
   IN OUT    UINTN                           *DataSize,\r
   OUT       VOID                            *Data\r
   OUT       UINT32                          *Attributes,\r
   IN OUT    UINTN                           *DataSize,\r
   OUT       VOID                            *Data\r

-  )\r
-;  \r
+  );  \r

   \r
 EFI_STATUS\r
 EFIAPI\r
   \r
 EFI_STATUS\r
 EFIAPI\r


@@ -98,8 +95,7 @@ PeiGetNextVariableName2 (
   IN OUT UINTN                              *VariableNameSize,\r
   IN OUT CHAR16                             *VariableName,\r
   IN OUT EFI_GUID                           *VariableGuid\r
   IN OUT UINTN                              *VariableNameSize,\r
   IN OUT CHAR16                             *VariableName,\r
   IN OUT EFI_GUID                           *VariableGuid\r

-  )\r
-;\r
+  );\r

   \r
 EFI_STATUS\r
 EFIAPI\r
   \r
 EFI_STATUS\r
 EFIAPI\r


@@ -108,8 +104,7 @@ PeiGetNextVariableName (
   IN OUT UINTN                    *VariableNameSize,\r
   IN OUT CHAR16                   *VariableName,\r
   IN OUT EFI_GUID                 *VendorGuid\r
   IN OUT UINTN                    *VariableNameSize,\r
   IN OUT CHAR16                   *VariableName,\r
   IN OUT EFI_GUID                 *VendorGuid\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get one variable by the index count.\r
 \r
 /**\r
   Get one variable by the index count.\r

diff --git a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
index 771d70cad0092fbf63d91bd6c07494859d49d6d5..b6bd85a0cf13af0d0335b69a820a4877224c2128 100644 (file)
--- a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
@@ -46,7 +46,6 @@ PreparePackages (
   IN UINTN           NumberOfPackages,\r
   IN CONST EFI_GUID  *Guid OPTIONAL,\r
   ...\r
   IN UINTN           NumberOfPackages,\r
   IN CONST EFI_GUID  *Guid OPTIONAL,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
index 24c345b1522141ab25aff4f9406b11f9727d04a1..32f5742cc6180ad3c853b331e4427eb89c97ab86 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -79,8 +79,7 @@ EFI_STATUS
   IN  EFI_HANDLE                                     HostBridge,\r
   IN  EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PHASE  Phase,\r
   IN  EFI_PCI_CHIPSET_EXECUTION_PHASE                ChipsetPhase\r
   IN  EFI_HANDLE                                     HostBridge,\r
   IN  EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PHASE  Phase,\r
   IN  EFI_PCI_CHIPSET_EXECUTION_PHASE                ChipsetPhase\r

-)\r
-;\r
+);\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -115,8 +114,7 @@ EFI_STATUS
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS    PciAddress,\r
   IN  EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE   Phase,\r
   IN  EFI_PCI_CHIPSET_EXECUTION_PHASE                ChipsetPhase\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS    PciAddress,\r
   IN  EFI_PCI_CONTROLLER_RESOURCE_ALLOCATION_PHASE   Phase,\r
   IN  EFI_PCI_CHIPSET_EXECUTION_PHASE                ChipsetPhase\r

-)\r
-;\r
+);\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -136,8 +134,7 @@ EFI_STATUS
 (EFIAPI *EFI_PCI_PLATFORM_GET_PLATFORM_POLICY)(\r
   IN  EFI_PCI_PLATFORM_PROTOCOL           *This,\r
   OUT EFI_PCI_PLATFORM_POLICY             *PciPolicy\r
 (EFIAPI *EFI_PCI_PLATFORM_GET_PLATFORM_POLICY)(\r
   IN  EFI_PCI_PLATFORM_PROTOCOL           *This,\r
   OUT EFI_PCI_PLATFORM_POLICY             *PciPolicy\r

-)\r
-;\r
+);\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -174,8 +171,7 @@ EFI_STATUS
   IN   EFI_HANDLE                   PciHandle,\r
   OUT  VOID                         **RomImage,\r
   OUT  UINTN                        *RomSize\r
   IN   EFI_HANDLE                   PciHandle,\r
   OUT  VOID                         **RomImage,\r
   OUT  UINTN                        *RomSize\r

-)\r
-;\r
+);\r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/IntelFrameworkPkg/Include/Protocol/SmmBase.h b/IntelFrameworkPkg/Include/Protocol/SmmBase.h
index cf4feb03451a20c65dd06a01f2bd77f9fd9757ca..69cd2b8f295260e6a097950a58a8f7261d006450 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/SmmBase.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmBase.h
@@ -107,8 +107,7 @@ EFI_STATUS
   IN  UINTN                                          SourceSize,\r
   OUT EFI_HANDLE                                     *ImageHandle,\r
   IN  BOOLEAN                                        LegacyIA32Binary OPTIONAL\r
   IN  UINTN                                          SourceSize,\r
   OUT EFI_HANDLE                                     *ImageHandle,\r
   IN  BOOLEAN                                        LegacyIA32Binary OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove a given driver SMRAM.  This is the equivalent of performing\r
 \r
 /**\r
   Remove a given driver SMRAM.  This is the equivalent of performing\r


@@ -128,8 +127,7 @@ EFI_STATUS
 (EFIAPI *EFI_SMM_UNREGISTER_HANDLER)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN EFI_HANDLE                     ImageHandle\r
 (EFIAPI *EFI_SMM_UNREGISTER_HANDLER)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN EFI_HANDLE                     ImageHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The SMM Inter-module Communicate Service Communicate() function\r
 \r
 /**\r
   The SMM Inter-module Communicate Service Communicate() function\r


@@ -154,8 +152,7 @@ EFI_STATUS
   IN EFI_HANDLE                     ImageHandle,\r
   IN OUT VOID                       *CommunicationBuffer,\r
   IN OUT UINTN                      *SourceSize\r
   IN EFI_HANDLE                     ImageHandle,\r
   IN OUT VOID                       *CommunicationBuffer,\r
   IN OUT UINTN                      *SourceSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Register a callback to execute within SMM.\r
 \r
 /**\r
   Register a callback to execute within SMM.\r


@@ -186,8 +183,7 @@ EFI_STATUS
   IN EFI_SMM_CALLBACK_ENTRY_POINT                     CallbackAddress,\r
   IN BOOLEAN                                          MakeLast OPTIONAL,\r
   IN BOOLEAN                                          FloatingPointSave OPTIONAL\r
   IN EFI_SMM_CALLBACK_ENTRY_POINT                     CallbackAddress,\r
   IN BOOLEAN                                          MakeLast OPTIONAL,\r
   IN BOOLEAN                                          FloatingPointSave OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The SmmAllocatePool() function allocates a memory region of Size bytes from memory of\r
 \r
 /**\r
   The SmmAllocatePool() function allocates a memory region of Size bytes from memory of\r


@@ -216,8 +212,7 @@ EFI_STATUS
   IN EFI_MEMORY_TYPE                PoolType,\r
   IN UINTN                          Size,\r
   OUT VOID                          **Buffer\r
   IN EFI_MEMORY_TYPE                PoolType,\r
   IN UINTN                          Size,\r
   OUT VOID                          **Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The SmmFreePool() function returns the memory specified by Buffer to the system.\r
 \r
 /**\r
   The SmmFreePool() function returns the memory specified by Buffer to the system.\r


@@ -237,8 +232,7 @@ EFI_STATUS
 (EFIAPI *EFI_SMM_FREE_POOL)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN VOID                           *Buffer\r
 (EFIAPI *EFI_SMM_FREE_POOL)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN VOID                           *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine tells caller if execution context is SMM or not.\r
 \r
 /**\r
   This routine tells caller if execution context is SMM or not.\r


@@ -254,8 +248,7 @@ EFI_STATUS
 (EFIAPI *EFI_SMM_INSIDE_OUT)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   OUT BOOLEAN                       *InSmm\r
 (EFIAPI *EFI_SMM_INSIDE_OUT)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   OUT BOOLEAN                       *InSmm\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The GetSmstLocation() function returns the locatin of the System Management\r
 \r
 /**\r
   The GetSmstLocation() function returns the locatin of the System Management\r


@@ -276,8 +269,7 @@ EFI_STATUS
 (EFIAPI *EFI_SMM_GET_SMST_LOCATION)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN OUT EFI_SMM_SYSTEM_TABLE       **Smst\r
 (EFIAPI *EFI_SMM_GET_SMST_LOCATION)(\r
   IN EFI_SMM_BASE_PROTOCOL          *This,\r
   IN OUT EFI_SMM_SYSTEM_TABLE       **Smst\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
index 9de1199f73a4ae9a728aa9901322957f37d01f97..3f786bc2857479226af66813d19cf09ad1abf248 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
@@ -30,8 +30,7 @@ VOID
 EhcDumpQtd (\r
   IN EHC_QTD              *Qtd,\r
   IN CHAR8                *Msg\r
 EhcDumpQtd (\r
   IN EHC_QTD              *Qtd,\r
   IN CHAR8                *Msg\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -49,8 +48,7 @@ EhcDumpQh (
   IN EHC_QH               *Qh,\r
   IN CHAR8                *Msg,\r
   IN BOOLEAN              DumpBuf\r
   IN EHC_QH               *Qh,\r
   IN CHAR8                *Msg,\r
   IN BOOLEAN              DumpBuf\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -66,7 +64,6 @@ VOID
 EhcDumpBuf (\r
   IN UINT8                *Buf,\r
   IN UINTN                Len\r
 EhcDumpBuf (\r
   IN UINT8                *Buf,\r
   IN UINTN                Len\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h b/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
index 00406e549b7f8a8208f082745d9686297b49fbd4..f6ca7646739ca6c6d1c500af95db413775af7aac 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
@@ -128,8 +128,7 @@ UINT32
 EhcReadCapRegister (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32              Offset\r
 EhcReadCapRegister (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32              Offset\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -145,8 +144,7 @@ UINT32
 EhcReadOpReg (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32              Offset\r
 EhcReadOpReg (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32              Offset\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -164,8 +162,7 @@ EhcWriteOpReg (
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Offset,\r
   IN UINT32               Data\r
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Offset,\r
   IN UINT32               Data\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -180,8 +177,7 @@ EhcWriteOpReg (
 VOID\r
 EhcClearLegacySupport (\r
   IN USB2_HC_DEV          *Ehc\r
 VOID\r
 EhcClearLegacySupport (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -200,8 +196,7 @@ EFI_STATUS
 EhcSetAndWaitDoorBell (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32               Timeout\r
 EhcSetAndWaitDoorBell (\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  UINT32               Timeout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -215,8 +210,7 @@ EhcSetAndWaitDoorBell (
 VOID\r
 EhcAckAllInterrupt (\r
   IN  USB2_HC_DEV         *Ehc\r
 VOID\r
 EhcAckAllInterrupt (\r
   IN  USB2_HC_DEV         *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -232,8 +226,7 @@ EhcAckAllInterrupt (
 BOOLEAN\r
 EhcIsHalt (\r
   IN USB2_HC_DEV          *Ehc\r
 BOOLEAN\r
 EhcIsHalt (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -248,8 +241,7 @@ EhcIsHalt (
 BOOLEAN\r
 EhcIsSysError (\r
   IN USB2_HC_DEV          *Ehc\r
 BOOLEAN\r
 EhcIsSysError (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -266,8 +258,7 @@ EFI_STATUS
 EhcResetHC (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Timeout\r
 EhcResetHC (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Timeout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -284,8 +275,7 @@ EFI_STATUS
 EhcHaltHC (\r
   IN USB2_HC_DEV         *Ehc,\r
   IN UINT32              Timeout\r
 EhcHaltHC (\r
   IN USB2_HC_DEV         *Ehc,\r
   IN UINT32              Timeout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -302,8 +292,7 @@ EFI_STATUS
 EhcRunHC (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Timeout\r
 EhcRunHC (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN UINT32               Timeout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -325,7 +314,6 @@ EhcRunHC (
 EFI_STATUS\r
 EhcInitHC (\r
   IN USB2_HC_DEV          *Ehc\r
 EFI_STATUS\r
 EhcInitHC (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
index 13f7b5ad416b49a15efc65d5ee1beb46443dbda2..fb002a91c5cf9a28f0e03077c51076ff745fdb9d 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
@@ -29,8 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 EhcInitSched (\r
   IN USB2_HC_DEV          *Ehc\r
 EFI_STATUS\r
 EhcInitSched (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -44,8 +43,7 @@ EhcInitSched (
 VOID\r
 EhcFreeSched (\r
   IN USB2_HC_DEV          *Ehc\r
 VOID\r
 EhcFreeSched (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -65,8 +63,7 @@ VOID
 EhcLinkQhToAsync (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r
 EhcLinkQhToAsync (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -83,8 +80,7 @@ VOID
 EhcUnlinkQhFromAsync (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r
 EhcUnlinkQhFromAsync (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -102,8 +98,7 @@ VOID
 EhcLinkQhToPeriod (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r
 EhcLinkQhToPeriod (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -120,8 +115,7 @@ VOID
 EhcUnlinkQhFromPeriod (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r
 EhcUnlinkQhFromPeriod (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN EHC_QH               *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -142,8 +136,7 @@ EhcExecTransfer (
   IN  USB2_HC_DEV         *Ehc,\r
   IN  URB                 *Urb,\r
   IN  UINTN               TimeOut\r
   IN  USB2_HC_DEV         *Ehc,\r
   IN  URB                 *Urb,\r
   IN  UINTN               TimeOut\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -165,8 +158,7 @@ EhciDelAsyncIntTransfer (
   IN  UINT8               DevAddr,\r
   IN  UINT8               EpNum,\r
   OUT UINT8               *DataToggle\r
   IN  UINT8               DevAddr,\r
   IN  UINT8               EpNum,\r
   OUT UINT8               *DataToggle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -180,8 +172,7 @@ EhciDelAsyncIntTransfer (
 VOID\r
 EhciDelAllAsyncIntTransfers (\r
   IN USB2_HC_DEV          *Ehc\r
 VOID\r
 EhciDelAllAsyncIntTransfers (\r
   IN USB2_HC_DEV          *Ehc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -197,7 +188,6 @@ VOID
 EhcMoniteAsyncRequests (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
 EhcMoniteAsyncRequests (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h b/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
index 5cda230a018228777588df15b1a4ae40c70eadb2..7cae215adb1d71764df8853464fc2c9e9657c917 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
@@ -261,8 +261,7 @@ EhcCreateQtd (
   IN UINT8                PktId,\r
   IN UINT8                Toggle,\r
   IN UINTN                MaxPacket\r
   IN UINT8                PktId,\r
   IN UINT8                Toggle,\r
   IN UINTN                MaxPacket\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -279,8 +278,7 @@ EHC_QH *
 EhcCreateQh (\r
   IN USB2_HC_DEV          *Ehci,\r
   IN USB_ENDPOINT         *Ep\r
 EhcCreateQh (\r
   IN USB2_HC_DEV          *Ehci,\r
   IN USB_ENDPOINT         *Ep\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -296,8 +294,7 @@ VOID
 EhcFreeUrb (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN URB                  *Urb\r
 EhcFreeUrb (\r
   IN USB2_HC_DEV          *Ehc,\r
   IN URB                  *Urb\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -337,6 +334,5 @@ EhcCreateUrb (
   IN EFI_ASYNC_USB_TRANSFER_CALLBACK    Callback,\r
   IN VOID                               *Context,\r
   IN UINTN                              Interval\r
   IN EFI_ASYNC_USB_TRANSFER_CALLBACK    Callback,\r
   IN VOID                               *Context,\r
   IN UINTN                              Interval\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
index 7fda8a528c51559b35ce6fe287408872aab4bac2..944acdc11e6e4c3d26b61d4044f034a96684ec7c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
@@ -91,8 +91,7 @@ UsbHcInitMemPool (
   IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
   IN BOOLEAN              Check4G,\r
   IN UINT32               Which4G\r
   IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
   IN BOOLEAN              Check4G,\r
   IN UINT32               Which4G\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -107,8 +106,7 @@ UsbHcInitMemPool (
 EFI_STATUS\r
 UsbHcFreeMemPool (\r
   IN USBHC_MEM_POOL       *Pool\r
 EFI_STATUS\r
 UsbHcFreeMemPool (\r
   IN USBHC_MEM_POOL       *Pool\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -125,8 +123,7 @@ VOID *
 UsbHcAllocateMem (\r
   IN  USBHC_MEM_POOL      *Pool,\r
   IN  UINTN               Size\r
 UsbHcAllocateMem (\r
   IN  USBHC_MEM_POOL      *Pool,\r
   IN  UINTN               Size\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -144,6 +141,5 @@ UsbHcFreeMem (
   IN USBHC_MEM_POOL       *Pool,\r
   IN VOID                 *Mem,\r
   IN UINTN                Size\r
   IN USBHC_MEM_POOL       *Pool,\r
   IN VOID                 *Mem,\r
   IN UINTN                Size\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
index a55948c3e2aabd71a334b0d064a6fdd2800da966..a4912fb8e16633863e8ffe64c0f4e75260d1d633 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
@@ -28,8 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 VOID\r
 UhciDumpQh (\r
   IN UHCI_QH_SW         *QhSw\r
 VOID\r
 UhciDumpQh (\r
   IN UHCI_QH_SW         *QhSw\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -43,7 +42,6 @@ UhciDumpQh (
 VOID\r
 UhciDumpTds (\r
   IN UHCI_TD_SW           *TdSw\r
 VOID\r
 UhciDumpTds (\r
   IN UHCI_TD_SW           *TdSw\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
index 0463f4bff6c3aab3fb303b061a6f9ef335ad857e..70e7f377ded6b699d57147c1bf5ecc9136f49314 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
@@ -107,8 +107,7 @@ VOID
 UhciLinkTdToQh (\r
   IN UHCI_QH_SW           *Qh,\r
   IN UHCI_TD_SW           *Td\r
 UhciLinkTdToQh (\r
   IN UHCI_QH_SW           *Qh,\r
   IN UHCI_TD_SW           *Td\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -124,8 +123,7 @@ VOID
 UhciUnlinkTdFromQh (\r
   IN UHCI_QH_SW           *Qh,\r
   IN UHCI_TD_SW           *Td\r
 UhciUnlinkTdFromQh (\r
   IN UHCI_QH_SW           *Qh,\r
   IN UHCI_TD_SW           *Td\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -146,8 +144,7 @@ UhciMapUserRequest (
   IN  OUT VOID            *Request,\r
   OUT UINT8               **MappedAddr,\r
   OUT VOID                **Map\r
   IN  OUT VOID            *Request,\r
   OUT UINT8               **MappedAddr,\r
   OUT VOID                **Map\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -174,8 +171,7 @@ UhciMapUserData (
   OUT UINT8                   *PktId,\r
   OUT UINT8                   **MappedAddr,\r
   OUT VOID                    **Map\r
   OUT UINT8                   *PktId,\r
   OUT UINT8                   **MappedAddr,\r
   OUT VOID                    **Map\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -191,8 +187,7 @@ VOID
 UhciDestoryTds (\r
   IN USB_HC_DEV           *Uhc,\r
   IN UHCI_TD_SW           *FirstTd\r
 UhciDestoryTds (\r
   IN USB_HC_DEV           *Uhc,\r
   IN UHCI_TD_SW           *FirstTd\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -208,8 +203,7 @@ UHCI_QH_SW *
 UhciCreateQh (\r
   IN  USB_HC_DEV        *Uhc,\r
   IN  UINTN             Interval\r
 UhciCreateQh (\r
   IN  USB_HC_DEV        *Uhc,\r
   IN  UINTN             Interval\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -237,8 +231,7 @@ UhciCreateCtrlTds (
   IN UINTN                DataLen,\r
   IN UINT8                MaxPacket,\r
   IN BOOLEAN              IsLow\r
   IN UINTN                DataLen,\r
   IN UINT8                MaxPacket,\r
   IN BOOLEAN              IsLow\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -268,7 +261,6 @@ UhciCreateBulkOrIntTds (
   IN OUT UINT8            *DataToggle,\r
   IN UINT8                MaxPacket,\r
   IN BOOLEAN              IsLow\r
   IN OUT UINT8            *DataToggle,\r
   IN UINT8                MaxPacket,\r
   IN BOOLEAN              IsLow\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
index 8ba1cc23cd07f7aed6f2c58dc272bc9955c79cb8..c93be9ea3af01c60536cbcb969bb7403bd3abbb7 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
@@ -111,8 +111,7 @@ UINT16
 UhciReadReg (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset\r
 UhciReadReg (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -131,8 +130,7 @@ UhciWriteReg (
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Data\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Data\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -151,8 +149,7 @@ UhciSetRegBit (
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Bit\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Bit\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -171,8 +168,7 @@ UhciClearRegBit (
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Bit\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN UINT32                  Offset,\r
   IN UINT16                  Bit\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -187,8 +183,7 @@ UhciClearRegBit (
 VOID\r
 UhciAckAllInterrupt (\r
   IN  USB_HC_DEV          *Uhc\r
 VOID\r
 UhciAckAllInterrupt (\r
   IN  USB_HC_DEV          *Uhc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -205,8 +200,7 @@ EFI_STATUS
 UhciStopHc (\r
   IN USB_HC_DEV         *Uhc,\r
   IN UINTN              Timeout\r
 UhciStopHc (\r
   IN USB_HC_DEV         *Uhc,\r
   IN UINTN              Timeout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -222,8 +216,7 @@ UhciStopHc (
 BOOLEAN\r
 UhciIsHcWorking (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo\r
 BOOLEAN\r
 UhciIsHcWorking (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -240,8 +233,7 @@ VOID
 UhciSetFrameListBaseAddr (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN VOID                    *Addr\r
 UhciSetFrameListBaseAddr (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo,\r
   IN VOID                    *Addr\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -255,6 +247,5 @@ UhciSetFrameListBaseAddr (
 VOID\r
 UhciTurnOffUsbEmulation (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo\r
 VOID\r
 UhciTurnOffUsbEmulation (\r
   IN EFI_PCI_IO_PROTOCOL     *PciIo\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
index d76d68212bb420a504a70f0e133ea9fe3508ca37..ec685d56af8d8ed3935dd8adec8c27df23167a4a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
@@ -96,8 +96,7 @@ struct _UHCI_ASYNC_REQUEST{
 EFI_STATUS\r
 UhciInitFrameList (\r
   IN USB_HC_DEV         *Uhc\r
 EFI_STATUS\r
 UhciInitFrameList (\r
   IN USB_HC_DEV         *Uhc\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destory FrameList buffer.\r
 \r
 /**\r
   Destory FrameList buffer.\r


@@ -110,8 +109,7 @@ UhciInitFrameList (
 VOID\r
 UhciDestoryFrameList (\r
   IN USB_HC_DEV           *Uhc\r
 VOID\r
 UhciDestoryFrameList (\r
   IN USB_HC_DEV           *Uhc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -126,8 +124,7 @@ UhciDestoryFrameList (
 UINTN\r
 UhciConvertPollRate (\r
   IN  UINTN               Interval\r
 UINTN\r
 UhciConvertPollRate (\r
   IN  UINTN               Interval\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -144,8 +141,7 @@ VOID
 UhciLinkQhToFrameList (\r
   UINT32                  *FrameBase,\r
   UHCI_QH_SW              *Qh\r
 UhciLinkQhToFrameList (\r
   UINT32                  *FrameBase,\r
   UHCI_QH_SW              *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -163,8 +159,7 @@ VOID
 UhciUnlinkQhFromFrameList (\r
   UINT32                *FrameBase,\r
   UHCI_QH_SW            *Qh\r
 UhciUnlinkQhFromFrameList (\r
   UINT32                *FrameBase,\r
   UHCI_QH_SW            *Qh\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -189,8 +184,7 @@ UhciExecuteTransfer (
   IN  UINTN               TimeOut,\r
   IN  BOOLEAN             IsLow,\r
   OUT UHCI_QH_RESULT      *QhResult\r
   IN  UINTN               TimeOut,\r
   IN  BOOLEAN             IsLow,\r
   OUT UHCI_QH_RESULT      *QhResult\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -228,8 +222,7 @@ UhciCreateAsyncReq (
   IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,\r
   IN VOID                             *Context,\r
   IN BOOLEAN                          IsLow\r
   IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,\r
   IN VOID                             *Context,\r
   IN BOOLEAN                          IsLow\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -251,8 +244,7 @@ UhciRemoveAsyncReq (
   IN  UINT8               DevAddr,\r
   IN  UINT8               EndPoint,\r
   OUT UINT8               *Toggle\r
   IN  UINT8               DevAddr,\r
   IN  UINT8               EndPoint,\r
   OUT UINT8               *Toggle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -266,8 +258,7 @@ UhciRemoveAsyncReq (
 VOID\r
 UhciFreeAllAsyncReq (\r
   IN USB_HC_DEV           *Uhc\r
 VOID\r
 UhciFreeAllAsyncReq (\r
   IN USB_HC_DEV           *Uhc\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -283,7 +274,6 @@ VOID
 UhciMonitorAsyncReqList (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
 UhciMonitorAsyncReqList (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
index 80b2aa382b4d814766be8ab1f0c7007e60ad865a..40a5c1d592d84fe8851599a50ba4a0d4756ea3a1 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
@@ -89,8 +89,7 @@ UsbHcInitMemPool (
   IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
   IN BOOLEAN              Check4G,\r
   IN UINT32               Which4G\r
   IN EFI_PCI_IO_PROTOCOL  *PciIo,\r
   IN BOOLEAN              Check4G,\r
   IN UINT32               Which4G\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -105,8 +104,7 @@ UsbHcInitMemPool (
 EFI_STATUS\r
 UsbHcFreeMemPool (\r
   IN USBHC_MEM_POOL       *Pool\r
 EFI_STATUS\r
 UsbHcFreeMemPool (\r
   IN USBHC_MEM_POOL       *Pool\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -124,8 +122,7 @@ VOID *
 UsbHcAllocateMem (\r
   IN  USBHC_MEM_POOL      *Pool,\r
   IN  UINTN               Size\r
 UsbHcAllocateMem (\r
   IN  USBHC_MEM_POOL      *Pool,\r
   IN  UINTN               Size\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -144,6 +141,5 @@ UsbHcFreeMem (
   IN USBHC_MEM_POOL       *Pool,\r
   IN VOID                 *Mem,\r
   IN UINTN                Size\r
   IN USBHC_MEM_POOL       *Pool,\r
   IN VOID                 *Mem,\r
   IN UINTN                Size\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index d09d76a279c983a0fb217b4d453ad757bc380728..f59116733e9fe1151a24724981260c80fea83b2a 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -60,8 +60,7 @@ EFIAPI
 ScsiioToPassThruPacket (\r
   IN      EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet,\r
   IN OUT  EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *CommandPacket\r
 ScsiioToPassThruPacket (\r
   IN      EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet,\r
   IN OUT  EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *CommandPacket\r

-  )\r
-;\r
+  );\r

 \r
 \r
 STATIC\r
 \r
 \r
 STATIC\r


@@ -70,16 +69,14 @@ EFIAPI
 PassThruToScsiioPacket (\r
   IN     EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ScsiPacket,\r
   IN OUT EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet\r
 PassThruToScsiioPacket (\r
   IN     EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *ScsiPacket,\r
   IN OUT EFI_SCSI_IO_SCSI_REQUEST_PACKET         *Packet\r

-  )\r
-;\r
+  );\r

 STATIC\r
 VOID\r
 EFIAPI\r
 NotifyFunction (\r
   EFI_EVENT  Event,\r
   VOID       *Context\r
 STATIC\r
 VOID\r
 EFIAPI\r
 NotifyFunction (\r
   EFI_EVENT  Event,\r
   VOID       *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The user Entry Point for module ScsiBus. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module ScsiBus. The user code starts with this function.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index 780f16c46dbd63cf410b2cd244bece104cc62687..616a9d0110581b825d0e290b54bf750186c43174 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
@@ -225,8 +225,7 @@ EFIAPI
 USBKeyboardResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r
 USBKeyboardResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r


@@ -246,8 +245,7 @@ EFIAPI
 USBKeyboardReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r
 USBKeyboardReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set certain state for the input device.\r
 \r
 /**\r
   Set certain state for the input device.\r


@@ -266,8 +264,7 @@ EFIAPI
 USBKeyboardSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r
 USBKeyboardSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r
 \r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r


@@ -291,8 +288,7 @@ USBKeyboardRegisterKeyNotify (
   IN  EFI_KEY_DATA                       *KeyData,\r
   IN  EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                         *NotifyHandle\r
   IN  EFI_KEY_DATA                       *KeyData,\r
   IN  EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                         *NotifyHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove a registered notification function from a particular keystroke.\r
 \r
 /**\r
   Remove a registered notification function from a particular keystroke.\r


@@ -311,8 +307,7 @@ EFIAPI
 USBKeyboardUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
 USBKeyboardUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 555ebe3fb30904a423eb8fa5979322ed3e18bdc3..efe8c83b101b8a7a4679dc5f39861b8abcfbe9e0 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -36,8 +36,7 @@ PeiLoadImageLoadImageWrapper (
   OUT    UINT64                       *ImageSizeArg,     OPTIONAL\r
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,\r
   OUT    UINT32                       *AuthenticationState\r
   OUT    UINT64                       *ImageSizeArg,     OPTIONAL\r
   OUT    EFI_PHYSICAL_ADDRESS         *EntryPoint,\r
   OUT    UINT32                       *AuthenticationState\r

-  )\r
-;\r
+  );\r

 \r
 STATIC EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {\r
   PeiLoadImageLoadImageWrapper\r
 \r
 STATIC EFI_PEI_LOAD_FILE_PPI   mPeiLoadImagePpi = {\r
   PeiLoadImageLoadImageWrapper\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index b1ccf5aaab17f53746a3e4a8ee4c3c41ce1aae3e..6f040d015586837034ea2f0d2be0173e03182ac1 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -236,8 +236,7 @@ PeiCore (
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR      *PpList,\r
   IN VOID                              *Data\r
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR      *PpList,\r
   IN VOID                              *Data\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Dispatcher support functions\r
 \r
 //\r
 // Dispatcher support functions\r


@@ -267,8 +266,7 @@ BOOLEAN
 PeimDispatchReadiness (\r
   IN EFI_PEI_SERVICES   **PeiServices,\r
   IN VOID               *DependencyExpression\r
 PeimDispatchReadiness (\r
   IN EFI_PEI_SERVICES   **PeiServices,\r
   IN VOID               *DependencyExpression\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Conduct PEIM dispatch.\r
 \r
 /**\r
   Conduct PEIM dispatch.\r


@@ -284,8 +282,7 @@ VOID
 PeiDispatcher (\r
   IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
   IN PEI_CORE_INSTANCE           *PrivateData\r
 PeiDispatcher (\r
   IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
   IN PEI_CORE_INSTANCE           *PrivateData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the Dispatcher's data members\r
 \r
 /**\r
   Initialize the Dispatcher's data members\r


@@ -303,8 +300,7 @@ InitializeDispatcherData (
   IN PEI_CORE_INSTANCE            *PrivateData,\r
   IN PEI_CORE_INSTANCE            *OldCoreData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r
   IN PEI_CORE_INSTANCE            *PrivateData,\r
   IN PEI_CORE_INSTANCE            *OldCoreData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine parses the Dependency Expression, if available, and\r
 \r
 /**\r
   This routine parses the Dependency Expression, if available, and\r


@@ -324,8 +320,7 @@ DepexSatisfied (
   IN PEI_CORE_INSTANCE          *Private,\r
   IN EFI_PEI_FILE_HANDLE        FileHandle,\r
   IN UINTN                      PeimCount\r
   IN PEI_CORE_INSTANCE          *Private,\r
   IN EFI_PEI_FILE_HANDLE        FileHandle,\r
   IN UINTN                      PeimCount\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // PPI support functions\r
 \r
 //\r
 // PPI support functions\r


@@ -343,8 +338,7 @@ VOID
 InitializePpiServices (\r
   IN PEI_CORE_INSTANCE   *PrivateData,\r
   IN PEI_CORE_INSTANCE   *OldCoreData\r
 InitializePpiServices (\r
   IN PEI_CORE_INSTANCE   *PrivateData,\r
   IN PEI_CORE_INSTANCE   *OldCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -365,8 +359,7 @@ ConvertPpiPointers (
   IN UINTN                   OldCheckingBottom,\r
   IN UINTN                   OldCheckingTop,\r
   IN INTN                    Fixup\r
   IN UINTN                   OldCheckingBottom,\r
   IN UINTN                   OldCheckingTop,\r
   IN INTN                    Fixup\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -386,8 +379,7 @@ EFIAPI
 PeiInstallPpi (\r
   IN CONST EFI_PEI_SERVICES        **PeiServices,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *PpiList\r
 PeiInstallPpi (\r
   IN CONST EFI_PEI_SERVICES        **PeiServices,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *PpiList\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -409,8 +401,7 @@ PeiReInstallPpi (
   IN CONST EFI_PEI_SERVICES        **PeiServices,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *OldPpi,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *NewPpi\r
   IN CONST EFI_PEI_SERVICES        **PeiServices,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *OldPpi,\r
   IN CONST EFI_PEI_PPI_DESCRIPTOR  *NewPpi\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -436,8 +427,7 @@ PeiLocatePpi (
   IN UINTN                       Instance,\r
   IN OUT EFI_PEI_PPI_DESCRIPTOR  **PpiDescriptor,\r
   IN OUT VOID                    **Ppi\r
   IN UINTN                       Instance,\r
   IN OUT EFI_PEI_PPI_DESCRIPTOR  **PpiDescriptor,\r
   IN OUT VOID                    **Ppi\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -457,8 +447,7 @@ EFIAPI
 PeiNotifyPpi (\r
   IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN CONST EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyList\r
 PeiNotifyPpi (\r
   IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN CONST EFI_PEI_NOTIFY_DESCRIPTOR  *NotifyList\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -470,8 +459,7 @@ PeiNotifyPpi (
 VOID\r
 ProcessNotifyList (\r
   IN PEI_CORE_INSTANCE  *PrivateData\r
 VOID\r
 ProcessNotifyList (\r
   IN PEI_CORE_INSTANCE  *PrivateData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -493,8 +481,7 @@ DispatchNotify (
   IN INTN                InstallStopIndex,\r
   IN INTN                NotifyStartIndex,\r
   IN INTN                NotifyStopIndex\r
   IN INTN                InstallStopIndex,\r
   IN INTN                NotifyStartIndex,\r
   IN INTN                NotifyStopIndex\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Boot mode support functions\r
 \r
 //\r
 // Boot mode support functions\r


@@ -514,8 +501,7 @@ EFIAPI
 PeiGetBootMode (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN OUT EFI_BOOT_MODE *BootMode\r
 PeiGetBootMode (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN OUT EFI_BOOT_MODE *BootMode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This service enables PEIMs to update the boot mode variable.\r
 \r
 /**\r
   This service enables PEIMs to update the boot mode variable.\r


@@ -532,8 +518,7 @@ EFIAPI
 PeiSetBootMode (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN EFI_BOOT_MODE     BootMode\r
 PeiSetBootMode (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN EFI_BOOT_MODE     BootMode\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Security support functions\r
 \r
 //\r
 // Security support functions\r


@@ -551,8 +536,7 @@ VOID
 InitializeSecurityServices (\r
   IN EFI_PEI_SERVICES  **PeiServices,\r
   IN PEI_CORE_INSTANCE *OldCoreData\r
 InitializeSecurityServices (\r
   IN EFI_PEI_SERVICES  **PeiServices,\r
   IN PEI_CORE_INSTANCE *OldCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Verify a Firmware volume\r
 \r
 /**\r
   Verify a Firmware volume\r


@@ -566,8 +550,7 @@ InitializeSecurityServices (
 EFI_STATUS\r
 VerifyFv (\r
   IN EFI_FIRMWARE_VOLUME_HEADER  *CurrentFvAddress\r
 EFI_STATUS\r
 VerifyFv (\r
   IN EFI_FIRMWARE_VOLUME_HEADER  *CurrentFvAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -587,8 +570,7 @@ VerifyPeim (
   IN PEI_CORE_INSTANCE      *PrivateData,\r
   IN EFI_PEI_FV_HANDLE      VolumeHandle,\r
   IN EFI_PEI_FILE_HANDLE    FileHandle\r
   IN PEI_CORE_INSTANCE      *PrivateData,\r
   IN EFI_PEI_FV_HANDLE      VolumeHandle,\r
   IN EFI_PEI_FILE_HANDLE    FileHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -608,8 +590,7 @@ EFIAPI
 PeiGetHobList (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN OUT VOID          **HobList\r
 PeiGetHobList (\r
   IN CONST EFI_PEI_SERVICES  **PeiServices,\r
   IN OUT VOID          **HobList\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add a new HOB to the HOB List.\r
 \r
 /**\r
   Add a new HOB to the HOB List.\r


@@ -632,8 +613,7 @@ PeiCreateHob (
   IN UINT16            Type,\r
   IN UINT16            Length,\r
   IN OUT VOID          **Hob\r
   IN UINT16            Type,\r
   IN UINT16            Length,\r
   IN OUT VOID          **Hob\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -651,8 +631,7 @@ PeiCoreBuildHobHandoffInfoTable (
   IN EFI_BOOT_MODE         BootMode,\r
   IN EFI_PHYSICAL_ADDRESS  MemoryBegin,\r
   IN UINT64                MemoryLength\r
   IN EFI_BOOT_MODE         BootMode,\r
   IN EFI_PHYSICAL_ADDRESS  MemoryBegin,\r
   IN UINT64                MemoryLength\r

-  )\r
-;\r
+  );\r

 \r
 \r
 //\r
 \r
 \r
 //\r


@@ -681,8 +660,7 @@ PeiFfsFindNextFile (
   IN UINT8                       SearchType,\r
   IN EFI_PEI_FV_HANDLE           FwVolHeader,\r
   IN OUT EFI_PEI_FILE_HANDLE     *FileHeader\r
   IN UINT8                       SearchType,\r
   IN EFI_PEI_FV_HANDLE           FwVolHeader,\r
   IN OUT EFI_PEI_FILE_HANDLE     *FileHeader\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Given the input file pointer, search for the next matching section in the\r
 \r
 /**\r
   Given the input file pointer, search for the next matching section in the\r


@@ -705,8 +683,7 @@ PeiFfsFindSectionData (
   IN EFI_SECTION_TYPE            SectionType,\r
   IN EFI_PEI_FILE_HANDLE         FfsFileHeader,\r
   IN OUT VOID                    **SectionData\r
   IN EFI_SECTION_TYPE            SectionType,\r
   IN EFI_PEI_FILE_HANDLE         FfsFileHeader,\r
   IN OUT VOID                    **SectionData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   search the firmware volumes by index\r
 \r
 /**\r
   search the firmware volumes by index\r


@@ -725,8 +702,7 @@ PeiFvFindNextVolume (
   IN CONST EFI_PEI_SERVICES          **PeiServices,\r
   IN UINTN                           Instance,\r
   IN OUT EFI_PEI_FV_HANDLE           *FwVolHeader\r
   IN CONST EFI_PEI_SERVICES          **PeiServices,\r
   IN UINTN                           Instance,\r
   IN OUT EFI_PEI_FV_HANDLE           *FwVolHeader\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Memory support functions\r
 \r
 //\r
 // Memory support functions\r


@@ -748,8 +724,7 @@ InitializeMemoryServices (
   IN PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
   IN PEI_CORE_INSTANCE           *OldCoreData\r
   IN PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
   IN PEI_CORE_INSTANCE           *OldCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -769,8 +744,7 @@ PeiInstallPeiMemory (
   IN CONST EFI_PEI_SERVICES      **PeiServices,\r
   IN EFI_PHYSICAL_ADDRESS  MemoryBegin,\r
   IN UINT64                MemoryLength\r
   IN CONST EFI_PEI_SERVICES      **PeiServices,\r
   IN EFI_PHYSICAL_ADDRESS  MemoryBegin,\r
   IN UINT64                MemoryLength\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -797,8 +771,7 @@ PeiAllocatePages (
   IN EFI_MEMORY_TYPE            MemoryType,\r
   IN UINTN                      Pages,\r
   OUT EFI_PHYSICAL_ADDRESS      *Memory\r
   IN EFI_MEMORY_TYPE            MemoryType,\r
   IN UINTN                      Pages,\r
   OUT EFI_PHYSICAL_ADDRESS      *Memory\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -820,8 +793,7 @@ PeiAllocatePool (
   IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN UINTN                      Size,\r
   OUT VOID                      **Buffer\r
   IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN UINTN                      Size,\r
   OUT VOID                      **Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -844,8 +816,7 @@ PeiLoadImage (
   IN  EFI_PEI_FILE_HANDLE         FileHandle,\r
   OUT    EFI_PHYSICAL_ADDRESS     *EntryPoint,\r
   OUT    UINT32                   *AuthenticationState\r
   IN  EFI_PEI_FILE_HANDLE         FileHandle,\r
   OUT    EFI_PHYSICAL_ADDRESS     *EntryPoint,\r
   OUT    UINT32                   *AuthenticationState\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -872,8 +843,7 @@ PeiReportStatusCode (
   IN UINT32                   Instance,\r
   IN CONST EFI_GUID                 *CallerId,\r
   IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
   IN UINT32                   Instance,\r
   IN CONST EFI_GUID                 *CallerId,\r
   IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -891,8 +861,7 @@ EFI_STATUS
 EFIAPI\r
 PeiResetSystem (\r
   IN CONST EFI_PEI_SERVICES   **PeiServices\r
 EFIAPI\r
 PeiResetSystem (\r
   IN CONST EFI_PEI_SERVICES   **PeiServices\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -907,8 +876,7 @@ VOID
 PeiInitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r
 PeiInitializeFv (\r
   IN  PEI_CORE_INSTANCE           *PrivateData,\r
   IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process Firmware Volum Information once FvInfoPPI install.\r
 \r
 /**\r
   Process Firmware Volum Information once FvInfoPPI install.\r


@@ -926,8 +894,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r
   IN EFI_PEI_SERVICES              **PeiServices,\r
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
   IN VOID                          *Ppi\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -948,8 +915,7 @@ PeiFfsFindFileByName (
   IN  CONST EFI_GUID        *FileName,\r
   IN  EFI_PEI_FV_HANDLE     VolumeHandle,\r
   OUT EFI_PEI_FILE_HANDLE   *FileHandle\r
   IN  CONST EFI_GUID        *FileName,\r
   IN  EFI_PEI_FV_HANDLE     VolumeHandle,\r
   OUT EFI_PEI_FILE_HANDLE   *FileHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -968,8 +934,7 @@ EFIAPI
 PeiFfsGetFileInfo (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO    *FileInfo\r
 PeiFfsGetFileInfo (\r
   IN EFI_PEI_FILE_HANDLE  FileHandle,\r
   OUT EFI_FV_FILE_INFO    *FileInfo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -986,8 +951,7 @@ EFIAPI
 PeiFfsGetVolumeInfo (\r
   IN EFI_PEI_FV_HANDLE  VolumeHandle,\r
   OUT EFI_FV_INFO       *VolumeInfo\r
 PeiFfsGetVolumeInfo (\r
   IN EFI_PEI_FV_HANDLE  VolumeHandle,\r
   OUT EFI_FV_INFO       *VolumeInfo\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine enable a PEIM to register itself to shadow when PEI Foundation\r
 \r
 /**\r
   This routine enable a PEIM to register itself to shadow when PEI Foundation\r


@@ -1004,8 +968,7 @@ EFI_STATUS
 EFIAPI\r
 PeiRegisterForShadow (\r
   IN EFI_PEI_FILE_HANDLE       FileHandle\r
 EFIAPI\r
 PeiRegisterForShadow (\r
   IN EFI_PEI_FILE_HANDLE       FileHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Given the input file pointer, search for the next matching file in the\r
 \r
 /**\r
   Given the input file pointer, search for the next matching file in the\r


@@ -1031,8 +994,7 @@ PeiFindFileEx (
   IN        EFI_FV_FILETYPE          SearchType,\r
   IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle,\r
   IN OUT    EFI_PEI_FV_HANDLE        *AprioriFile  OPTIONAL\r
   IN        EFI_FV_FILETYPE          SearchType,\r
   IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle,\r
   IN OUT    EFI_PEI_FV_HANDLE        *AprioriFile  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize image service that install PeiLoadFilePpi.\r
 \r
 /**\r
   Initialize image service that install PeiLoadFilePpi.\r


@@ -1048,8 +1010,7 @@ VOID
 InitializeImageServices (\r
   IN  PEI_CORE_INSTANCE   *PrivateData,\r
   IN  PEI_CORE_INSTANCE   *OldCoreData\r
 InitializeImageServices (\r
   IN  PEI_CORE_INSTANCE   *PrivateData,\r
   IN  PEI_CORE_INSTANCE   *OldCoreData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Fv image from the FV type file, then install FV INFO ppi, Build FV hob.\r
 \r
 /**\r
   Get Fv image from the FV type file, then install FV INFO ppi, Build FV hob.\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index f41b375506d31bc2c7d73fa9796e692804f95add..c8362c997659d5779d11430d9d8c01448a42c7c9 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -53,8 +53,7 @@ RuntimeDriverCalculateCrc32 (
   IN  VOID    *Data,\r
   IN  UINTN   DataSize,\r
   OUT UINT32  *CrcOut\r
   IN  VOID    *Data,\r
   IN  UINTN   DataSize,\r
   OUT UINT32  *CrcOut\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
 /**\r
   Determines the new virtual address that is to be used on subsequent memory accesses.\r


@@ -75,8 +74,7 @@ EFIAPI
 RuntimeDriverConvertPointer (\r
   IN     UINTN  DebugDisposition,\r
   IN OUT VOID   **ConvertAddress\r
 RuntimeDriverConvertPointer (\r
   IN     UINTN  DebugDisposition,\r
   IN OUT VOID   **ConvertAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Changes the runtime addressing mode of EFI firmware from physical to virtual.\r
 \r
 /**\r
   Changes the runtime addressing mode of EFI firmware from physical to virtual.\r


@@ -104,8 +102,7 @@ RuntimeDriverSetVirtualAddressMap (
   IN UINTN                  DescriptorSize,\r
   IN UINT32                 DescriptorVersion,\r
   IN EFI_MEMORY_DESCRIPTOR  *VirtualMap\r
   IN UINTN                  DescriptorSize,\r
   IN UINT32                 DescriptorVersion,\r
   IN EFI_MEMORY_DESCRIPTOR  *VirtualMap\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize CRC32 table.\r
 \r
 /**\r
   Initialize CRC32 table.\r


@@ -114,8 +111,7 @@ RuntimeDriverSetVirtualAddressMap (
 VOID\r
 RuntimeDriverInitializeCrc32Table (\r
   VOID\r
 VOID\r
 RuntimeDriverInitializeCrc32Table (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Install Runtime AP. This code includes the EfiRuntimeLib, but it only\r
 \r
 /**\r
   Install Runtime AP. This code includes the EfiRuntimeLib, but it only\r


@@ -134,7 +130,6 @@ EFIAPI
 RuntimeDriverInitialize (\r
   IN EFI_HANDLE                            ImageHandle,\r
   IN EFI_SYSTEM_TABLE                      *SystemTable\r
 RuntimeDriverInitialize (\r
   IN EFI_HANDLE                            ImageHandle,\r
   IN EFI_SYSTEM_TABLE                      *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/CapsuleLib.h b/MdeModulePkg/Include/Library/CapsuleLib.h
index 80df80e6289c98659a5e5c7c41ab7c570be3e532..3bbc8c03c43e4f4cc2f2790ca65d8de57a09e191 100644 (file)
--- a/MdeModulePkg/Include/Library/CapsuleLib.h
+++ b/MdeModulePkg/Include/Library/CapsuleLib.h
@@ -29,8 +29,7 @@ EFI_STATUS
 EFIAPI\r
 SupportCapsuleImage (\r
   IN EFI_CAPSULE_HEADER *CapsuleHeader\r
 EFIAPI\r
 SupportCapsuleImage (\r
   IN EFI_CAPSULE_HEADER *CapsuleHeader\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The firmware implements to process the capsule image.\r
 \r
 /**\r
   The firmware implements to process the capsule image.\r


@@ -44,8 +43,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessCapsuleImage (\r
   IN EFI_CAPSULE_HEADER *CapsuleHeader\r
 EFIAPI\r
 ProcessCapsuleImage (\r
   IN EFI_CAPSULE_HEADER *CapsuleHeader\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Include/Library/ExtendedHiiLib.h b/MdeModulePkg/Include/Library/ExtendedHiiLib.h
index d2bfb4a75b5d5db5e69341f9e829971af7b061ed..15c97603559635f710a7030dfb23068c9184ee74 100644 (file)
--- a/MdeModulePkg/Include/Library/ExtendedHiiLib.h
+++ b/MdeModulePkg/Include/Library/ExtendedHiiLib.h
@@ -35,8 +35,7 @@ EFI_STATUS
 EFIAPI\r
 HiiLibCreateHiiDriverHandle (\r
   OUT EFI_HANDLE               *DriverHandle\r
 EFIAPI\r
 HiiLibCreateHiiDriverHandle (\r
   OUT EFI_HANDLE               *DriverHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroy the Driver Handle created by CreateHiiDriverHandle().\r
 \r
 /**\r
   Destroy the Driver Handle created by CreateHiiDriverHandle().\r


@@ -52,8 +51,7 @@ VOID
 EFIAPI\r
 HiiLibDestroyHiiDriverHandle (\r
   IN EFI_HANDLE                 DriverHandle\r
 EFIAPI\r
 HiiLibDestroyHiiDriverHandle (\r
   IN EFI_HANDLE                 DriverHandle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 #endif\r
 \r
 \r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
index 4bef9bbe14083ae234069fa95bdf271421013cb0..2d8db3b9e23e96160e776b09f44b9b160d3f3b1d 100644 (file)
--- a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
+++ b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
@@ -37,8 +37,7 @@ CreateBannerOpCode (
   IN      UINT16              LineNumber,\r
   IN      UINT8               Alignment,\r
   IN OUT  EFI_HII_UPDATE_DATA *Data\r
   IN      UINT16              LineNumber,\r
   IN      UINT8               Alignment,\r
   IN OUT  EFI_HII_UPDATE_DATA *Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function allows the caller to update a form that has\r
 \r
 /**\r
   This function allows the caller to update a form that has\r


@@ -71,8 +70,7 @@ IfrLibUpdateForm (
   IN UINT16                    Label,\r
   IN BOOLEAN                   Insert,\r
   IN EFI_HII_UPDATE_DATA       *Data\r
   IN UINT16                    Label,\r
   IN BOOLEAN                   Insert,\r
   IN EFI_HII_UPDATE_DATA       *Data\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Extract formset class for given HII handle.\r
 \r
 /**\r
   Extract formset class for given HII handle.\r


@@ -100,8 +98,7 @@ IfrLibExtractClassFromHiiHandle (
   OUT     UINT16              *Class,\r
   OUT     EFI_STRING_ID       *FormSetTitle,\r
   OUT     EFI_STRING_ID       *FormSetHelp\r
   OUT     UINT16              *Class,\r
   OUT     EFI_STRING_ID       *FormSetTitle,\r
   OUT     EFI_STRING_ID       *FormSetHelp\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Configure the buffer accrording to ConfigBody strings in the format of\r
 \r
 /**\r
   Configure the buffer accrording to ConfigBody strings in the format of\r


@@ -124,8 +121,7 @@ IfrLibExtractDefault(
   IN UINTN                        *BufferSize,\r
   UINTN                           Number,\r
   ...\r
   IN UINTN                        *BufferSize,\r
   UINTN                           Number,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Include/Library/GenericBdsLib.h b/MdeModulePkg/Include/Library/GenericBdsLib.h
index 8816e5f8adbe34546e146028c9a15174ffc2f757..654271dff60422427365d247fc9c6184a2aa1df6 100644 (file)
--- a/MdeModulePkg/Include/Library/GenericBdsLib.h
+++ b/MdeModulePkg/Include/Library/GenericBdsLib.h
@@ -1048,8 +1048,7 @@ EFIAPI
 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r
 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Concatenates a formatted unicode string to allocated pool.\r
 \r
 /**\r
   Concatenates a formatted unicode string to allocated pool.\r


@@ -1070,7 +1069,6 @@ CatPrint (
   IN OUT POOL_PRINT   *Str,\r
   IN CHAR16           *fmt,\r
   ...\r
   IN OUT POOL_PRINT   *Str,\r
   IN CHAR16           *fmt,\r
   ...\r

-  )\r
-;\r
+  );\r

 #endif\r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Include/Library/PlatformBdsLib.h b/MdeModulePkg/Include/Library/PlatformBdsLib.h
index a10789bd35d27eb77eda8beb8a1240bd2949cc3d..2fcb310d744883f4f78f96a1b16e5f20153ab9ce 100644 (file)
--- a/MdeModulePkg/Include/Library/PlatformBdsLib.h
+++ b/MdeModulePkg/Include/Library/PlatformBdsLib.h
@@ -59,8 +59,7 @@ VOID
 EFIAPI\r
 PlatformBdsInit (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
 EFIAPI\r
 PlatformBdsInit (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The function will excute with as the platform policy, current policy\r
 \r
 /**\r
   The function will excute with as the platform policy, current policy\r


@@ -78,8 +77,7 @@ PlatformBdsPolicyBehavior (
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                      *DriverOptionList,\r
   IN LIST_ENTRY                      *BootOptionList\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                      *DriverOptionList,\r
   IN LIST_ENTRY                      *BootOptionList\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Hook point after a boot attempt fails.\r
 \r
 /**\r
   Hook point after a boot attempt fails.\r


@@ -97,8 +95,7 @@ PlatformBdsBootFail (
   IN  EFI_STATUS         Status,\r
   IN  CHAR16             *ExitData,\r
   IN  UINTN              ExitDataSize\r
   IN  EFI_STATUS         Status,\r
   IN  CHAR16             *ExitData,\r
   IN  UINTN              ExitDataSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Hook point after a boot attempt succeeds. We don't expect a boot option to\r
 \r
 /**\r
   Hook point after a boot attempt succeeds. We don't expect a boot option to\r


@@ -113,8 +110,7 @@ VOID
 EFIAPI\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r
 EFIAPI\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -127,6 +123,5 @@ EFI_STATUS
 EFIAPI\r
 PlatformBdsLockNonUpdatableFlash (\r
   VOID\r
 EFIAPI\r
 PlatformBdsLockNonUpdatableFlash (\r
   VOID\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
index ae806e7bb92a2606f022cdb1cf4b19ee51400f92..fc0413656de17ff992d78fd568fa8af33a2325df 100644 (file)
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ b/MdeModulePkg/Include/Library/RecoveryLib.h
@@ -26,8 +26,7 @@ EFI_STATUS
 EFIAPI\r
 PeiRecoverFirmware (\r
   VOID\r
 EFIAPI\r
 PeiRecoverFirmware (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h
index dd21d6e09c21e64a75503c932e22cdb06b8d0163..8e2a25d14f9b789f5aee6eb4b9bed866da254602 100644 (file)
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ b/MdeModulePkg/Include/Library/S3Lib.h
@@ -26,8 +26,7 @@ EFI_STATUS
 EFIAPI\r
 AcpiS3ResumeOs (\r
   VOID\r
 EFIAPI\r
 AcpiS3ResumeOs (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h
index b00587c8b3d165fee60662fb101d2535b7cfba53..b14b54d028a2e0d4fb27337434ad1e6af9526cad 100644 (file)
--- a/MdeModulePkg/Include/Protocol/ConsoleControl.h
+++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h
@@ -49,8 +49,7 @@ EFI_STATUS
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,\r
   OUT BOOLEAN                           *GopUgaExists,  OPTIONAL  \r
   OUT BOOLEAN                           *StdInLocked    OPTIONAL\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,\r
   OUT BOOLEAN                           *GopUgaExists,  OPTIONAL  \r
   OUT BOOLEAN                           *StdInLocked    OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the current video mode to either text or graphics. \r
 \r
 /**\r
   Set the current video mode to either text or graphics. \r


@@ -68,8 +67,7 @@ EFI_STATUS
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE)(\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   Mode\r
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE)(\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   Mode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copy the Password and enable state variable and then arm the periodic timer\r
 \r
 /**\r
   Copy the Password and enable state variable and then arm the periodic timer\r


@@ -84,8 +82,7 @@ EFI_STATUS
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN)(\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   IN CHAR16                             *Password\r
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN)(\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   IN CHAR16                             *Password\r

-  )\r
-;\r
+  );\r

 \r
 struct _EFI_CONSOLE_CONTROL_PROTOCOL {\r
   EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE           GetMode;\r
 \r
 struct _EFI_CONSOLE_CONTROL_PROTOCOL {\r
   EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE           GetMode;\r

diff --git a/MdeModulePkg/Include/Protocol/DiskInfo.h b/MdeModulePkg/Include/Protocol/DiskInfo.h
index 1f45b3a2866f5262eaf6cf99fef72b94a7de737a..98ecd7695e5ce1b9de9a50b96e3590e030aed931 100644 (file)
--- a/MdeModulePkg/Include/Protocol/DiskInfo.h
+++ b/MdeModulePkg/Include/Protocol/DiskInfo.h
@@ -47,8 +47,7 @@ EFI_STATUS
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   IN OUT VOID                         *InquiryData,\r
   IN OUT UINT32                       *IntquiryDataSize\r
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   IN OUT VOID                         *InquiryData,\r
   IN OUT UINT32                       *IntquiryDataSize\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -71,8 +70,7 @@ EFI_STATUS
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   IN OUT VOID                         *IdentifyData,\r
   IN OUT UINT32                       *IdentifyDataSize\r
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   IN OUT VOID                         *IdentifyData,\r
   IN OUT UINT32                       *IdentifyDataSize\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -97,8 +95,7 @@ EFI_STATUS
   IN OUT VOID                         *SenseData,\r
   IN OUT UINT32                       *SenseDataSize,\r
   OUT UINT8                           *SenseDataNumber\r
   IN OUT VOID                         *SenseData,\r
   IN OUT UINT32                       *SenseDataSize,\r
   OUT UINT8                           *SenseDataNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the results of the Request Sense command to a drive in SenseData.\r
 \r
 /**\r
   Return the results of the Request Sense command to a drive in SenseData.\r


@@ -118,8 +115,7 @@ EFI_STATUS
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   OUT UINT32                          *IdeChannel,\r
   OUT UINT32                          *IdeDevice\r
   IN EFI_DISK_INFO_PROTOCOL           * This,\r
   OUT UINT32                          *IdeChannel,\r
   OUT UINT32                          *IdeDevice\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // GUIDs for EFI_DISK_INFO_PROTOCOL.Interface. Defines the format of the\r
 \r
 //\r
 // GUIDs for EFI_DISK_INFO_PROTOCOL.Interface. Defines the format of the\r

diff --git a/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h b/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h
index ce0128df107eec1ffe4c1c803024487f765e122c..4a0e49526788df4d233fde534a1cb34da56387b5 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h
+++ b/MdeModulePkg/Include/Protocol/FaultTolerantWriteLite.h
@@ -60,8 +60,7 @@ EFI_STATUS
   IN UINTN                             Offset,\r
   IN UINTN                             *NumBytes,\r
   IN VOID                              *Buffer\r
   IN UINTN                             Offset,\r
   IN UINTN                             *NumBytes,\r
   IN VOID                              *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Protocol declaration\r
 \r
 //\r
 // Protocol declaration\r

diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
index 87959ed73a1cf8e885041dcebb47d013c2c4b072..57ef1493b42e81af30ff22192f40c0b9eaa7bbc8 100644 (file)
--- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
+++ b/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
@@ -49,8 +49,7 @@ EFI_STATUS
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EXTENDMEM_COVERAGE_LEVEL                 Level,\r
   OUT BOOLEAN                                  *RequireSoftECCInit\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EXTENDMEM_COVERAGE_LEVEL                 Level,\r
   OUT BOOLEAN                                  *RequireSoftECCInit\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -81,8 +80,7 @@ EFI_STATUS
   OUT UINT64                                   *TotalMemorySize,\r
   OUT BOOLEAN                                  *ErrorOut,\r
   IN BOOLEAN                                   IfTestAbort\r
   OUT UINT64                                   *TotalMemorySize,\r
   OUT BOOLEAN                                  *ErrorOut,\r
   IN BOOLEAN                                   IfTestAbort\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -99,8 +97,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MEMORY_TEST_FINISHED)(\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_MEMORY_TEST_FINISHED)(\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Provide capability to test compatible range which used by some sepcial\r
 \r
 /**\r
   Provide capability to test compatible range which used by some sepcial\r


@@ -120,8 +117,7 @@ EFI_STATUS
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EFI_PHYSICAL_ADDRESS                     StartAddress,\r
   IN  UINT64                                   Length\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EFI_PHYSICAL_ADDRESS                     StartAddress,\r
   IN  UINT64                                   Length\r

-  )\r
-;\r
+  );\r

 \r
 struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL {\r
   EFI_MEMORY_TEST_INIT              MemoryTestInit;\r
 \r
 struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL {\r
   EFI_MEMORY_TEST_INIT              MemoryTestInit;\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
index 95326b8d582d0a70088e32e6ed2b02fd1b171083..fee8bdbac52e2e4178a2317686aaffc6a3864c19 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
@@ -63,8 +63,7 @@ BdsDeleteAllInvalidLegacyBootOptions (
 EFI_STATUS\r
 BdsAddNonExistingLegacyBootOptions (\r
   VOID\r
 EFI_STATUS\r
 BdsAddNonExistingLegacyBootOptions (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 70335a6f9acdc7b707129ee3bf80cd93ba5c5247..4aed70aab3236f592211db75fb5a8efc990fefba 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -467,8 +467,7 @@ typedef struct _STRING_DEPOSITORY {
 EFI_STATUS\r
 BOpt_FindFileSystem (\r
   IN BMM_CALLBACK_DATA          *CallbackData\r
 EFI_STATUS\r
 BOpt_FindFileSystem (\r
   IN BMM_CALLBACK_DATA          *CallbackData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Find files under current directory\r
 \r
 /**\r
   Find files under current directory\r


@@ -486,8 +485,7 @@ EFI_STATUS
 BOpt_FindFiles (\r
   IN BMM_CALLBACK_DATA          *CallbackData,\r
   IN BM_MENU_ENTRY              *MenuEntry\r
 BOpt_FindFiles (\r
   IN BMM_CALLBACK_DATA          *CallbackData,\r
   IN BM_MENU_ENTRY              *MenuEntry\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -503,8 +501,7 @@ BOpt_FindFiles (
 EFI_STATUS\r
 BOpt_FindDrivers (\r
   VOID\r
 EFI_STATUS\r
 BOpt_FindDrivers (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -776,8 +773,7 @@ FreeAllConsoles (
 VOID\r
 ChangeVariableDevicePath (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
 VOID\r
 ChangeVariableDevicePath (\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r
 \r
 /**\r
   Update the multi-instance device path of Terminal Device based on\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
index f7876843e4722743a4d780db8ebf3930168fa9f8..3fe70c1c5dfd5e19d28be14e6710254388756b19 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
@@ -79,8 +79,7 @@ BootManagerCallback (
   IN  UINT8                                  Type,\r
   IN  EFI_IFR_TYPE_VALUE                     *Value,\r
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   IN  UINT8                                  Type,\r
   IN  EFI_IFR_TYPE_VALUE                     *Value,\r
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -92,8 +91,7 @@ BootManagerCallback (
 EFI_STATUS\r
 InitializeBootManager (\r
   VOID\r
 EFI_STATUS\r
 InitializeBootManager (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This funtion invokees Boot Manager. If all devices have not a chance to be connected,\r
 \r
 /**\r
   This funtion invokees Boot Manager. If all devices have not a chance to be connected,\r


@@ -105,7 +103,6 @@ InitializeBootManager (
 VOID\r
 CallBootManager (\r
   VOID\r
 VOID\r
 CallBootManager (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
index 449676251d0b240b00c7e7027f5e85ce7f6873dd..9668452ddbe22eb6e037c3c8390aabd9c2204525 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
@@ -98,8 +98,7 @@ DeviceManagerCallback (
   IN  UINT8                                  Type,\r
   IN  EFI_IFR_TYPE_VALUE                     *Value,\r
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   IN  UINT8                                  Type,\r
   IN  EFI_IFR_TYPE_VALUE                     *Value,\r
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -112,8 +111,7 @@ DeviceManagerCallback (
 EFI_STATUS\r
 InitializeDeviceManager (\r
   VOID\r
 EFI_STATUS\r
 InitializeDeviceManager (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -131,7 +129,6 @@ InitializeDeviceManager (
 EFI_STATUS\r
 CallDeviceManager (\r
   VOID\r
 EFI_STATUS\r
 CallDeviceManager (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.h b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
index 3bc21509fc2270d3042c4c1ba7724b232221ea44..944e5fb9a1b7669da113d6b1f16e0fed982ea005 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.h
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
@@ -53,8 +53,7 @@ EFI_STATUS
 RegisterHotkey (\r
   IN EFI_KEY_OPTION     *KeyOption,\r
   OUT UINT16            *KeyOptionNumber\r
 RegisterHotkey (\r
   IN EFI_KEY_OPTION     *KeyOption,\r
   OUT UINT16            *KeyOptionNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -70,8 +69,7 @@ RegisterHotkey (
 EFI_STATUS\r
 UnregisterHotkey (\r
   IN UINT16             KeyOptionNumber\r
 EFI_STATUS\r
 UnregisterHotkey (\r
   IN UINT16             KeyOptionNumber\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -87,7 +85,6 @@ UnregisterHotkey (
 EFI_STATUS\r
 InitializeHotkeyService (\r
   VOID\r
 EFI_STATUS\r
 InitializeHotkeyService (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
index 1063c86fc2e8b12eb02c3b89cc4d5395c9720db1..1926839c6ff66842cf433a741a6e1868691cfce0 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
+++ b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
@@ -34,7 +34,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 VOID\r
 InitializeHwErrRecSupport (\r
   IN UINT16       HwErrRecSupportLevel\r
 VOID\r
 InitializeHwErrRecSupport (\r
   IN UINT16       HwErrRecSupportLevel\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/BdsDxe/Language.h b/MdeModulePkg/Universal/BdsDxe/Language.h
index 1d10f7178be3be7c1356f0484004da2a7d42a3b9..39dd1eccf974af3ef9073b158cb4b762f4ae839d 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/Language.h
+++ b/MdeModulePkg/Universal/BdsDxe/Language.h
@@ -27,7 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 VOID\r
 InitializeLanguage (\r
   BOOLEAN LangCodesSettingRequired\r
 VOID\r
 InitializeLanguage (\r
   BOOLEAN LangCodesSettingRequired\r

-  )\r
-;\r
+  );\r

 \r
 #endif // _LANGUAGE_H_\r
 \r
 #endif // _LANGUAGE_H_\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index 578b49a58e2553230f45224027bd98d49d83b889..407081e1867d44d9aecbef55e4f9ea109f577d3c 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -272,8 +272,7 @@ EFIAPI
 ConSplitterDriverEntry (\r
   IN EFI_HANDLE                       ImageHandle,\r
   IN EFI_SYSTEM_TABLE                 *SystemTable\r
 ConSplitterDriverEntry (\r
   IN EFI_HANDLE                       ImageHandle,\r
   IN EFI_SYSTEM_TABLE                 *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Construct console input devices' private data.\r
 \r
 /**\r
   Construct console input devices' private data.\r


@@ -289,8 +288,7 @@ ConSplitterDriverEntry (
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Construct console output devices' private data.\r
 \r
 /**\r
   Construct console output devices' private data.\r


@@ -305,8 +303,7 @@ ConSplitterTextInConstructor (
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Driver Binding Functions\r
 \r
 //\r
 // Driver Binding Functions\r


@@ -330,8 +327,7 @@ ConSplitterConInDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test to see if Simple Pointer protocol could be supported on the ControllerHandle. \r
 \r
 /**\r
   Test to see if Simple Pointer protocol could be supported on the ControllerHandle. \r


@@ -351,8 +347,7 @@ ConSplitterSimplePointerDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test to see if Console Out Device could be supported on the ControllerHandle. \r
 \r
 /**\r
   Test to see if Console Out Device could be supported on the ControllerHandle. \r


@@ -372,8 +367,7 @@ ConSplitterConOutDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test to see if Standard Error Device could be supported on the ControllerHandle. \r
 \r
 /**\r
   Test to see if Standard Error Device could be supported on the ControllerHandle. \r


@@ -393,8 +387,7 @@ ConSplitterStdErrDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start Console In Consplitter on device handle. \r
 \r
 /**\r
   Start Console In Consplitter on device handle. \r


@@ -414,8 +407,7 @@ ConSplitterConInDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start Simple Pointer Consplitter on device handle. \r
 \r
 /**\r
   Start Simple Pointer Consplitter on device handle. \r


@@ -435,8 +427,7 @@ ConSplitterSimplePointerDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start Console Out Consplitter on device handle. \r
 \r
 /**\r
   Start Console Out Consplitter on device handle. \r


@@ -456,8 +447,7 @@ ConSplitterConOutDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start Standard Error Consplitter on device handle. \r
 \r
 /**\r
   Start Standard Error Consplitter on device handle. \r


@@ -477,8 +467,7 @@ ConSplitterStdErrDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop Console In ConSplitter on ControllerHandle by closing Console In Devcice GUID.\r
 \r
 /**\r
   Stop Console In ConSplitter on ControllerHandle by closing Console In Devcice GUID.\r


@@ -500,8 +489,7 @@ ConSplitterConInDriverBindingStop (
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop Simple Pointer protocol ConSplitter on ControllerHandle by closing\r
 \r
 /**\r
   Stop Simple Pointer protocol ConSplitter on ControllerHandle by closing\r


@@ -524,8 +512,7 @@ ConSplitterSimplePointerDriverBindingStop (
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop Console Out ConSplitter on ControllerHandle by closing Console Out Devcice GUID.\r
 \r
 /**\r
   Stop Console Out ConSplitter on ControllerHandle by closing Console Out Devcice GUID.\r


@@ -547,8 +534,7 @@ ConSplitterConOutDriverBindingStop (
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop Standard Error ConSplitter on ControllerHandle by closing Standard Error GUID.\r
 \r
 /**\r
   Stop Standard Error ConSplitter on ControllerHandle by closing Standard Error GUID.\r


@@ -570,8 +556,7 @@ ConSplitterStdErrDriverBindingStop (
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -592,8 +577,7 @@ ConSplitterAbsolutePointerDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start Absolute Pointer Consplitter on device handle. \r
 \r
 /**\r
   Start Absolute Pointer Consplitter on device handle. \r


@@ -613,8 +597,7 @@ ConSplitterAbsolutePointerDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop Absolute Pointer protocol ConSplitter on ControllerHandle by closing\r
 \r
 /**\r
   Stop Absolute Pointer protocol ConSplitter on ControllerHandle by closing\r


@@ -637,8 +620,7 @@ ConSplitterAbsolutePointerDriverBindingStop (
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r
   IN  EFI_HANDLE                      ControllerHandle,\r
   IN  UINTN                           NumberOfChildren,\r
   IN  EFI_HANDLE                      *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add Absolute Pointer Device in Consplitter Absolute Pointer list.\r
 \r
 /**\r
   Add Absolute Pointer Device in Consplitter Absolute Pointer list.\r


@@ -654,8 +636,7 @@ EFI_STATUS
 ConSplitterAbsolutePointerAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r
 ConSplitterAbsolutePointerAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove Absolute Pointer Device in Consplitter Absolute Pointer list.\r
 \r
 /**\r
   Remove Absolute Pointer Device in Consplitter Absolute Pointer list.\r


@@ -671,8 +652,7 @@ EFI_STATUS
 ConSplitterAbsolutePointerDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r
 ConSplitterAbsolutePointerDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Absolute Pointer protocol interfaces\r
 \r
 //\r
 // Absolute Pointer protocol interfaces\r


@@ -695,8 +675,7 @@ EFIAPI
 ConSplitterAbsolutePointerReset (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL   *This,\r
   IN BOOLEAN                         ExtendedVerification\r
 ConSplitterAbsolutePointerReset (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL   *This,\r
   IN BOOLEAN                         ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -719,8 +698,7 @@ EFIAPI
 ConSplitterAbsolutePointerGetState (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL   *This,\r
   IN OUT EFI_ABSOLUTE_POINTER_STATE  *State\r
 ConSplitterAbsolutePointerGetState (\r
   IN EFI_ABSOLUTE_POINTER_PROTOCOL   *This,\r
   IN OUT EFI_ABSOLUTE_POINTER_STATE  *State\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This event agregates all the events of the pointer devices in the splitter.\r
 \r
 /**\r
   This event agregates all the events of the pointer devices in the splitter.\r


@@ -740,8 +718,7 @@ EFIAPI
 ConSplitterAbsolutePointerWaitForInput (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r
 ConSplitterAbsolutePointerWaitForInput (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r


@@ -1000,8 +977,7 @@ ConSplitterAbsolutePointerComponentNameGetControllerName (
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
   IN  CHAR8                                           *Language,\r
   OUT CHAR16                                          **ControllerName\r
   IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
   IN  CHAR8                                           *Language,\r
   OUT CHAR16                                          **ControllerName\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
 \r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r


@@ -1179,8 +1155,7 @@ EFI_STATUS
 ConSplitterTextInAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn\r
 ConSplitterTextInAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove Simple Text Device in Consplitter Absolute Pointer list.\r
 \r
 /**\r
   Remove Simple Text Device in Consplitter Absolute Pointer list.\r


@@ -1196,8 +1171,7 @@ EFI_STATUS
 ConSplitterTextInDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn\r
 ConSplitterTextInDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // SimplePointer Constuctor/Destructor functions\r
 \r
 //\r
 // SimplePointer Constuctor/Destructor functions\r


@@ -1217,8 +1191,7 @@ EFI_STATUS
 ConSplitterSimplePointerAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r
 ConSplitterSimplePointerAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove Simple Pointer Device in Consplitter Absolute Pointer list.\r
 \r
 /**\r
   Remove Simple Pointer Device in Consplitter Absolute Pointer list.\r


@@ -1234,8 +1207,7 @@ EFI_STATUS
 ConSplitterSimplePointerDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r
 ConSplitterSimplePointerDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // TextOut Constuctor/Destructor functions\r
 \r
 //\r
 // TextOut Constuctor/Destructor functions\r


@@ -1259,8 +1231,7 @@ ConSplitterTextOutAddDevice (
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL              *UgaDraw\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL              *UgaDraw\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove Text Out Device in Consplitter Text Out list.\r
 \r
 /**\r
   Remove Text Out Device in Consplitter Text Out list.\r


@@ -1276,8 +1247,7 @@ EFI_STATUS
 ConSplitterTextOutDeleteDevice (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut\r
 ConSplitterTextOutDeleteDevice (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // TextIn I/O Functions\r
 \r
 //\r
 // TextIn I/O Functions\r


@@ -1299,8 +1269,7 @@ EFIAPI
 ConSplitterTextInReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *This,\r
   IN  BOOLEAN                            ExtendedVerification\r
 ConSplitterTextInReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *This,\r
   IN  BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r


@@ -1321,8 +1290,7 @@ EFIAPI
 ConSplitterTextInReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *This,\r
   OUT EFI_INPUT_KEY                      *Key\r
 ConSplitterTextInReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *This,\r
   OUT EFI_INPUT_KEY                      *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add Text Input Ex Device in Consplitter Text Input Ex list.\r
 \r
 /**\r
   Add Text Input Ex Device in Consplitter Text Input Ex list.\r


@@ -1338,8 +1306,7 @@ EFI_STATUS
 ConSplitterTextInExAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r
 ConSplitterTextInExAddDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove Simple Text Ex Device in Consplitter Absolute Pointer list.\r
 \r
 /**\r
   Remove Simple Text Ex Device in Consplitter Absolute Pointer list.\r


@@ -1355,8 +1322,7 @@ EFI_STATUS
 ConSplitterTextInExDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r
 ConSplitterTextInExDeleteDevice (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Simple Text Input Ex protocol function prototypes\r
 \r
 //\r
 // Simple Text Input Ex protocol function prototypes\r


@@ -1379,8 +1345,7 @@ EFIAPI
 ConSplitterTextInResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r
 ConSplitterTextInResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1404,8 +1369,7 @@ EFIAPI
 ConSplitterTextInReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r
 ConSplitterTextInReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1428,8 +1392,7 @@ EFIAPI
 ConSplitterTextInSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r
 ConSplitterTextInSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1458,8 +1421,7 @@ ConSplitterTextInRegisterKeyNotify (
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1480,8 +1442,7 @@ EFIAPI
 ConSplitterTextInUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
 ConSplitterTextInUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This event agregates all the events of the ConIn devices in the spliter.\r
 \r
 /**\r
   This event agregates all the events of the ConIn devices in the spliter.\r


@@ -1501,8 +1462,7 @@ EFIAPI
 ConSplitterTextInWaitForKey (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r
 ConSplitterTextInWaitForKey (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r

-  )\r
-;\r
+  );\r

 /**\r
   Return TRUE if StdIn is locked. The ConIn device on the virtual handle is\r
   the only device locked.\r
 /**\r
   Return TRUE if StdIn is locked. The ConIn device on the virtual handle is\r
   the only device locked.\r


@@ -1516,8 +1476,7 @@ ConSplitterTextInWaitForKey (
 BOOLEAN\r
 ConSpliterConssoleControlStdInLocked (\r
   VOID\r
 BOOLEAN\r
 ConSpliterConssoleControlStdInLocked (\r
   VOID\r

-  )\r
-;\r
+  );\r

 /**\r
   This timer event will fire when StdIn is locked. It will check the key\r
   sequence on StdIn to see if it matches the password. Any error in the\r
 /**\r
   This timer event will fire when StdIn is locked. It will check the key\r
   sequence on StdIn to see if it matches the password. Any error in the\r


@@ -1536,8 +1495,7 @@ EFIAPI
 ConSpliterConsoleControlLockStdInEvent (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r
 ConSpliterConsoleControlLockStdInEvent (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   If Password is NULL unlock the password state variable and set the event\r
 \r
 /**\r
   If Password is NULL unlock the password state variable and set the event\r


@@ -1557,8 +1515,7 @@ EFIAPI
 ConSpliterConsoleControlLockStdIn (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   IN  CHAR16                          *Password\r
 ConSpliterConsoleControlLockStdIn (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   IN  CHAR16                          *Password\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r


@@ -1578,8 +1535,7 @@ EFIAPI
 ConSplitterTextInPrivateReadKeyStroke (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   OUT EFI_INPUT_KEY                   *Key\r
 ConSplitterTextInPrivateReadKeyStroke (\r
   IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
   OUT EFI_INPUT_KEY                   *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reset the input device and optionaly run diagnostics\r
 \r
 /**\r
   Reset the input device and optionaly run diagnostics\r


@@ -1597,8 +1553,7 @@ EFIAPI
 ConSplitterSimplePointerReset (\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
   IN  BOOLEAN                         ExtendedVerification\r
 ConSplitterSimplePointerReset (\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
   IN  BOOLEAN                         ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r


@@ -1619,8 +1574,7 @@ EFIAPI
 ConSplitterSimplePointerGetState (\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
   IN OUT EFI_SIMPLE_POINTER_STATE     *State\r
 ConSplitterSimplePointerGetState (\r
   IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
   IN OUT EFI_SIMPLE_POINTER_STATE     *State\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This event agregates all the events of the ConIn devices in the spliter.\r
 \r
 /**\r
   This event agregates all the events of the ConIn devices in the spliter.\r


@@ -1640,8 +1594,7 @@ EFIAPI
 ConSplitterSimplePointerWaitForInput (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r
 ConSplitterSimplePointerWaitForInput (\r
   IN  EFI_EVENT                       Event,\r
   IN  VOID                            *Context\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // TextOut I/O Functions\r
 \r
 //\r
 // TextOut I/O Functions\r


@@ -1664,8 +1617,7 @@ EFIAPI
 ConSplitterTextOutReset (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            ExtendedVerification\r
 ConSplitterTextOutReset (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write a Unicode string to the output device.\r
 \r
 /**\r
   Write a Unicode string to the output device.\r


@@ -1691,8 +1643,7 @@ EFIAPI
 ConSplitterTextOutOutputString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  CHAR16                             *WString\r
 ConSplitterTextOutOutputString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  CHAR16                             *WString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Verifies that all characters in a Unicode string can be output to the\r
 \r
 /**\r
   Verifies that all characters in a Unicode string can be output to the\r


@@ -1714,8 +1665,7 @@ EFIAPI
 ConSplitterTextOutTestString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  CHAR16                             *WString\r
 ConSplitterTextOutTestString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  CHAR16                             *WString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns information for an available text mode that the output device(s)\r
 \r
 /**\r
   Returns information for an available text mode that the output device(s)\r


@@ -1741,8 +1691,7 @@ ConSplitterTextOutQueryMode (
   IN  UINTN                              ModeNumber,\r
   OUT UINTN                              *Columns,\r
   OUT UINTN                              *Rows\r
   IN  UINTN                              ModeNumber,\r
   OUT UINTN                              *Columns,\r
   OUT UINTN                              *Rows\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the output device(s) to a specified mode.\r
 \r
 /**\r
   Sets the output device(s) to a specified mode.\r


@@ -1761,8 +1710,7 @@ EFIAPI
 ConSplitterTextOutSetMode (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              ModeNumber\r
 ConSplitterTextOutSetMode (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the background and foreground colors for the OutputString () and\r
 \r
 /**\r
   Sets the background and foreground colors for the OutputString () and\r


@@ -1786,8 +1734,7 @@ EFIAPI
 ConSplitterTextOutSetAttribute (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              Attribute\r
 ConSplitterTextOutSetAttribute (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              Attribute\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clears the output device(s) display to the currently selected background\r
 \r
 /**\r
   Clears the output device(s) display to the currently selected background\r


@@ -1805,8 +1752,7 @@ EFI_STATUS
 EFIAPI\r
 ConSplitterTextOutClearScreen (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This\r
 EFIAPI\r
 ConSplitterTextOutClearScreen (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the current coordinates of the cursor position\r
 \r
 /**\r
   Sets the current coordinates of the cursor position\r


@@ -1833,8 +1779,7 @@ ConSplitterTextOutSetCursorPosition (
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              Column,\r
   IN  UINTN                              Row\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  UINTN                              Column,\r
   IN  UINTN                              Row\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1856,8 +1801,7 @@ EFIAPI
 ConSplitterTextOutEnableCursor (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            Visible\r
 ConSplitterTextOutEnableCursor (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            Visible\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Take the passed in Buffer of size SizeOfCount and grow the buffer\r
 \r
 /**\r
   Take the passed in Buffer of size SizeOfCount and grow the buffer\r


@@ -1879,8 +1823,7 @@ ConSplitterGrowBuffer (
   IN  UINTN                           SizeOfCount,\r
   IN  UINTN                           *Count,\r
   IN OUT  VOID                        **Buffer\r
   IN  UINTN                           SizeOfCount,\r
   IN  UINTN                           *Count,\r
   IN OUT  VOID                        **Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the current video mode information. Also returns info about existence\r
 \r
 /**\r
   Return the current video mode information. Also returns info about existence\r


@@ -1903,8 +1846,7 @@ ConSpliterConsoleControlGetMode (
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,\r
   OUT BOOLEAN                         *GopExists,\r
   OUT BOOLEAN                         *StdInLocked\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,\r
   OUT BOOLEAN                         *GopExists,\r
   OUT BOOLEAN                         *StdInLocked\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the current mode to either text or graphics. Graphics is\r
 \r
 /**\r
   Set the current mode to either text or graphics. Graphics is\r


@@ -1923,8 +1865,7 @@ EFIAPI
 ConSpliterConsoleControlSetMode (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   IN  EFI_CONSOLE_CONTROL_SCREEN_MODE Mode\r
 ConSpliterConsoleControlSetMode (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   IN  EFI_CONSOLE_CONTROL_SCREEN_MODE Mode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the current video mode information.\r
 \r
 /**\r
   Return the current video mode information.\r


@@ -1951,8 +1892,7 @@ ConSpliterGraphicsOutputQueryMode (
   IN  UINT32                            ModeNumber,\r
   OUT UINTN                              *SizeOfInfo,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   IN  UINT32                            ModeNumber,\r
   OUT UINTN                              *SizeOfInfo,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Graphics output protocol interface to set video mode.\r
 \r
 /**\r
   Graphics output protocol interface to set video mode.\r


@@ -1971,8 +1911,7 @@ EFIAPI
 ConSpliterGraphicsOutputSetMode (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL * This,\r
   IN  UINT32                       ModeNumber\r
 ConSpliterGraphicsOutputSetMode (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL * This,\r
   IN  UINT32                       ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The following table defines actions for BltOperations.\r
 \r
 /**\r
   The following table defines actions for BltOperations.\r


@@ -2033,8 +1972,7 @@ ConSpliterGraphicsOutputBlt (
   IN  UINTN                                         Width,\r
   IN  UINTN                                         Height,\r
   IN  UINTN                                         Delta         OPTIONAL\r
   IN  UINTN                                         Width,\r
   IN  UINTN                                         Height,\r
   IN  UINTN                                         Delta         OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write data from the buffer to video display based on Graphics Output setting. \r
 \r
 /**\r
   Write data from the buffer to video display based on Graphics Output setting. \r


@@ -2055,8 +1993,7 @@ DevNullGopSync (
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the current video mode information.\r
 \r
 /**\r
   Return the current video mode information.\r


@@ -2080,8 +2017,7 @@ ConSpliterUgaDrawGetMode (
   OUT UINT32                          *VerticalResolution,\r
   OUT UINT32                          *ColorDepth,\r
   OUT UINT32                          *RefreshRate\r
   OUT UINT32                          *VerticalResolution,\r
   OUT UINT32                          *ColorDepth,\r
   OUT UINT32                          *RefreshRate\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the current video mode information.\r
 \r
 /**\r
   Return the current video mode information.\r


@@ -2105,8 +2041,7 @@ ConSpliterUgaDrawSetMode (
   IN UINT32                           VerticalResolution,\r
   IN UINT32                           ColorDepth,\r
   IN UINT32                           RefreshRate\r
   IN UINT32                           VerticalResolution,\r
   IN UINT32                           ColorDepth,\r
   IN UINT32                           RefreshRate\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The following table defines actions for BltOperations.\r
 \r
 /**\r
   The following table defines actions for BltOperations.\r


@@ -2167,8 +2102,7 @@ ConSpliterUgaDrawBlt (
   IN  UINTN                                         Width,\r
   IN  UINTN                                         Height,\r
   IN  UINTN                                         Delta         OPTIONAL\r
   IN  UINTN                                         Width,\r
   IN  UINTN                                         Height,\r
   IN  UINTN                                         Delta         OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write data from the buffer to video display based on UGA Draw setting. \r
 \r
 /**\r
   Write data from the buffer to video display based on UGA Draw setting. \r


@@ -2188,8 +2122,7 @@ DevNullUgaSync (
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write a Unicode string to the output device.\r
 \r
 /**\r
   Write a Unicode string to the output device.\r


@@ -2215,8 +2148,7 @@ EFI_STATUS
 DevNullTextOutOutputString (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  CHAR16                          *WString\r
 DevNullTextOutOutputString (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  CHAR16                          *WString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the output device(s) to a specified mode.\r
 \r
 /**\r
   Sets the output device(s) to a specified mode.\r


@@ -2235,8 +2167,7 @@ EFI_STATUS
 DevNullTextOutSetMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  UINTN                           ModeNumber\r
 DevNullTextOutSetMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  UINTN                           ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clears the output device(s) display to the currently selected background\r
 \r
 /**\r
   Clears the output device(s) display to the currently selected background\r


@@ -2253,8 +2184,7 @@ DevNullTextOutSetMode (
 EFI_STATUS\r
 DevNullTextOutClearScreen (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
 EFI_STATUS\r
 DevNullTextOutClearScreen (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the current coordinates of the cursor position.\r
 \r
 /**\r
   Sets the current coordinates of the cursor position.\r


@@ -2278,8 +2208,7 @@ DevNullTextOutSetCursorPosition (
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  UINTN                           Column,\r
   IN  UINTN                           Row\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  UINTN                           Column,\r
   IN  UINTN                           Row\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements SIMPLE_TEXT_OUTPUT.EnableCursor().\r
 \r
 /**\r
   Implements SIMPLE_TEXT_OUTPUT.EnableCursor().\r


@@ -2296,8 +2225,7 @@ EFI_STATUS
 DevNullTextOutEnableCursor (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  BOOLEAN                         Visible\r
 DevNullTextOutEnableCursor (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  BOOLEAN                         Visible\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Take the DevNull TextOut device and update the Simple Text Out on every\r
 \r
 /**\r
   Take the DevNull TextOut device and update the Simple Text Out on every\r


@@ -2312,7 +2240,6 @@ DevNullTextOutEnableCursor (
 EFI_STATUS\r
 DevNullSyncStdOut (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
 EFI_STATUS\r
 DevNullSyncStdOut (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 9fa72ad0f4b76a2502bd84c0b2b1b93458e41a3f..e3e5c38159cdeb359f5e94c149181618f4daf001 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -525,8 +525,7 @@ GraphicsConsoleControllerDriverStop (
 EFI_STATUS\r
 EfiLocateHiiProtocol (\r
   VOID\r
 EFI_STATUS\r
 EfiLocateHiiProtocol (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 \r
 #endif\r
 \r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 7da100c66ea486147cd24cc71089a1872ee20c6a..862826c83ef495ef4e535e4ae3f0dbcc66cc0ab6 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -181,8 +181,7 @@ EFIAPI
 InitializeTerminal (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 InitializeTerminal (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_INPUT_PROTOCOL.Reset().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_INPUT_PROTOCOL.Reset().\r


@@ -201,8 +200,7 @@ EFIAPI
 TerminalConInReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                           ExtendedVerification\r
 TerminalConInReset (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                           ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -223,8 +221,7 @@ EFIAPI
 TerminalConInReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   OUT EFI_INPUT_KEY                   *Key\r
 TerminalConInReadKeyStroke (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This,\r
   OUT EFI_INPUT_KEY                   *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check if the key already has been registered.\r
 \r
 /**\r
   Check if the key already has been registered.\r


@@ -244,8 +241,7 @@ BOOLEAN
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r
   IN EFI_KEY_DATA  *InputData\r
 IsKeyRegistered (\r
   IN EFI_KEY_DATA  *RegsiteredData,\r
   IN EFI_KEY_DATA  *InputData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Event notification function for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r
 \r
 /**\r
   Event notification function for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.WaitForKeyEx event\r


@@ -262,8 +258,7 @@ EFIAPI
 TerminalConInWaitForKeyEx (\r
   IN  EFI_EVENT       Event,\r
   IN  VOID            *Context\r
 TerminalConInWaitForKeyEx (\r
   IN  EFI_EVENT       Event,\r
   IN  VOID            *Context\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Simple Text Input Ex protocol prototypes\r
 \r
 //\r
 // Simple Text Input Ex protocol prototypes\r


@@ -285,8 +280,7 @@ EFIAPI
 TerminalConInResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r
 TerminalConInResetEx (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r


@@ -309,8 +303,7 @@ EFIAPI
 TerminalConInReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r
 TerminalConInReadKeyStrokeEx (\r
   IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
   OUT EFI_KEY_DATA                      *KeyData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set certain state for the input device.\r
 \r
 /**\r
   Set certain state for the input device.\r


@@ -332,8 +325,7 @@ EFIAPI
 TerminalConInSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r
 TerminalConInSetState (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r
 \r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r


@@ -361,8 +353,7 @@ TerminalConInRegisterKeyNotify (
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r
   IN EFI_KEY_DATA                       *KeyData,\r
   IN EFI_KEY_NOTIFY_FUNCTION            KeyNotificationFunction,\r
   OUT EFI_HANDLE                        *NotifyHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove a registered notification function from a particular keystroke.\r
 \r
 /**\r
   Remove a registered notification function from a particular keystroke.\r


@@ -382,8 +373,7 @@ EFIAPI
 TerminalConInUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
 TerminalConInUnregisterKeyNotify (\r
   IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
   IN EFI_HANDLE                         NotificationHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Event notification function for EFI_SIMPLE_TEXT_INPUT_PROTOCOL.WaitForKey event\r
 \r
 /**\r
   Event notification function for EFI_SIMPLE_TEXT_INPUT_PROTOCOL.WaitForKey event\r


@@ -400,8 +390,7 @@ EFIAPI
 TerminalConInWaitForKey (\r
   IN  EFI_EVENT     Event,\r
   IN  VOID          *Context\r
 TerminalConInWaitForKey (\r
   IN  EFI_EVENT     Event,\r
   IN  VOID          *Context\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.Reset().\r


@@ -423,8 +412,7 @@ EFIAPI
 TerminalConOutReset (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            ExtendedVerification\r
 TerminalConOutReset (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
   IN  BOOLEAN                            ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.OutputString().\r


@@ -447,8 +435,7 @@ EFIAPI
 TerminalConOutOutputString (\r
   IN   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  CHAR16                            *WString\r
 TerminalConOutOutputString (\r
   IN   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  CHAR16                            *WString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.TestString().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.TestString().\r


@@ -469,8 +456,7 @@ EFIAPI
 TerminalConOutTestString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  CHAR16                           *WString\r
 TerminalConOutTestString (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  CHAR16                           *WString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.QueryMode().\r


@@ -496,8 +482,7 @@ TerminalConOutQueryMode (
   IN  UINTN                            ModeNumber,\r
   OUT UINTN                            *Columns,\r
   OUT UINTN                            *Rows\r
   IN  UINTN                            ModeNumber,\r
   OUT UINTN                            *Columns,\r
   OUT UINTN                            *Rows\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUT.SetMode().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUT.SetMode().\r


@@ -518,8 +503,7 @@ EFIAPI
 TerminalConOutSetMode (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            ModeNumber\r
 TerminalConOutSetMode (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetAttribute().\r


@@ -538,8 +522,7 @@ EFIAPI
 TerminalConOutSetAttribute (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            Attribute\r
 TerminalConOutSetAttribute (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            Attribute\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.ClearScreen().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.ClearScreen().\r


@@ -557,8 +540,7 @@ EFI_STATUS
 EFIAPI\r
 TerminalConOutClearScreen (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This\r
 EFIAPI\r
 TerminalConOutClearScreen (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetCursorPosition().\r
 \r
 /**\r
   Implements EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL.SetCursorPosition().\r


@@ -579,8 +561,7 @@ TerminalConOutSetCursorPosition (
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            Column,\r
   IN  UINTN                            Row\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  UINTN                            Column,\r
   IN  UINTN                            Row\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Implements SIMPLE_TEXT_OUTPUT.EnableCursor().\r
 \r
 /**\r
   Implements SIMPLE_TEXT_OUTPUT.EnableCursor().\r


@@ -599,8 +580,7 @@ EFIAPI
 TerminalConOutEnableCursor (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  BOOLEAN                          Visible\r
 TerminalConOutEnableCursor (\r
   IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
   IN  BOOLEAN                          Visible\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Test to see if this driver supports Controller. \r
 \r
 /**\r
   Test to see if this driver supports Controller. \r


@@ -816,8 +796,7 @@ TerminalComponentNameGetControllerName (
 EFI_STATUS\r
 TerminalConInCheckForKey (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This\r
 EFI_STATUS\r
 TerminalConInCheckForKey (\r
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update terminal device path in Console Device Environment Variables.\r
 \r
 /**\r
   Update terminal device path in Console Device Environment Variables.\r


@@ -832,8 +811,7 @@ VOID
 TerminalUpdateConsoleDevVariable (\r
   IN CHAR16                    *VariableName,\r
   IN EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath\r
 TerminalUpdateConsoleDevVariable (\r
   IN CHAR16                    *VariableName,\r
   IN EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove console device variable.\r
 \r
 /**\r
   Remove console device variable.\r


@@ -848,8 +826,7 @@ VOID
 TerminalRemoveConsoleDevVariable (\r
   IN CHAR16                    *VariableName,\r
   IN EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath\r
 TerminalRemoveConsoleDevVariable (\r
   IN CHAR16                    *VariableName,\r
   IN EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read the EFI variable (VendorGuid/Name) and return a dynamically allocated\r
 \r
 /**\r
   Read the EFI variable (VendorGuid/Name) and return a dynamically allocated\r


@@ -869,8 +846,7 @@ TerminalGetVariableAndSize (
   IN  CHAR16              *Name,\r
   IN  EFI_GUID            *VendorGuid,\r
   OUT UINTN               *VariableSize\r
   IN  CHAR16              *Name,\r
   IN  EFI_GUID            *VendorGuid,\r
   OUT UINTN               *VariableSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Build termial device path according to terminal type.\r
 \r
 /**\r
   Build termial device path according to terminal type.\r


@@ -889,8 +865,7 @@ SetTerminalDevicePath (
   IN  UINT8                       TerminalType,\r
   IN  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath,\r
   OUT EFI_DEVICE_PATH_PROTOCOL    **TerminalDevicePath\r
   IN  UINT8                       TerminalType,\r
   IN  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath,\r
   OUT EFI_DEVICE_PATH_PROTOCOL    **TerminalDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the Raw Data FIFO.\r
 \r
 /**\r
   Initialize the Raw Data FIFO.\r


@@ -903,8 +878,7 @@ SetTerminalDevicePath (
 VOID\r
 InitializeRawFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r
 VOID\r
 InitializeRawFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the Unicode FIFO.\r
 \r
 /**\r
   Initialize the Unicode FIFO.\r


@@ -917,8 +891,7 @@ InitializeRawFiFo (
 VOID\r
 InitializeUnicodeFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r
 VOID\r
 InitializeUnicodeFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the EFI Key FIFO.\r
 \r
 /**\r
   Initialize the EFI Key FIFO.\r


@@ -931,8 +904,7 @@ InitializeUnicodeFiFo (
 VOID\r
 InitializeEfiKeyFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r
 VOID\r
 InitializeEfiKeyFiFo (\r
   IN  TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get one key out of serial buffer.\r
 \r
 /**\r
   Get one key out of serial buffer.\r


@@ -950,8 +922,7 @@ EFI_STATUS
 GetOneKeyFromSerial (\r
   EFI_SERIAL_IO_PROTOCOL  *SerialIo,\r
   UINT8                   *Input\r
 GetOneKeyFromSerial (\r
   EFI_SERIAL_IO_PROTOCOL  *SerialIo,\r
   UINT8                   *Input\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Insert one byte raw data into the Raw Data FIFO.\r
 \r
 /**\r
   Insert one byte raw data into the Raw Data FIFO.\r


@@ -968,8 +939,7 @@ BOOLEAN
 RawFiFoInsertOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT8         Input\r
 RawFiFoInsertOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT8         Input\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove one pre-fetched key out of the Raw Data FIFO.\r
 \r
 /**\r
   Remove one pre-fetched key out of the Raw Data FIFO.\r


@@ -985,8 +955,7 @@ BOOLEAN
 RawFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT8         *Output\r
 RawFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT8         *Output\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether Raw Data FIFO buffer is empty.\r
 \r
 /**\r
   Clarify whether Raw Data FIFO buffer is empty.\r


@@ -1000,8 +969,7 @@ RawFiFoRemoveOneKey (
 BOOLEAN\r
 IsRawFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsRawFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether Raw Data FIFO buffer is full.\r
 \r
 /**\r
   Clarify whether Raw Data FIFO buffer is full.\r


@@ -1015,8 +983,7 @@ IsRawFiFoEmpty (
 BOOLEAN\r
 IsRawFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsRawFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Insert one pre-fetched key into the FIFO buffer.\r
 \r
 /**\r
   Insert one pre-fetched key into the FIFO buffer.\r


@@ -1033,8 +1000,7 @@ BOOLEAN
 EfiKeyFiFoInsertOneKey (\r
   TERMINAL_DEV      *TerminalDevice,\r
   EFI_INPUT_KEY     Key\r
 EfiKeyFiFoInsertOneKey (\r
   TERMINAL_DEV      *TerminalDevice,\r
   EFI_INPUT_KEY     Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove one pre-fetched key out of the FIFO buffer.\r
 \r
 /**\r
   Remove one pre-fetched key out of the FIFO buffer.\r


@@ -1050,8 +1016,7 @@ BOOLEAN
 EfiKeyFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   EFI_INPUT_KEY *Output\r
 EfiKeyFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   EFI_INPUT_KEY *Output\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether FIFO buffer is empty.\r
 \r
 /**\r
   Clarify whether FIFO buffer is empty.\r


@@ -1065,8 +1030,7 @@ EfiKeyFiFoRemoveOneKey (
 BOOLEAN\r
 IsEfiKeyFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsEfiKeyFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether FIFO buffer is full.\r
 \r
 /**\r
   Clarify whether FIFO buffer is full.\r


@@ -1080,8 +1044,7 @@ IsEfiKeyFiFoEmpty (
 BOOLEAN\r
 IsEfiKeyFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsEfiKeyFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Insert one pre-fetched key into the Unicode FIFO buffer.\r
 \r
 /**\r
   Insert one pre-fetched key into the Unicode FIFO buffer.\r


@@ -1098,8 +1061,7 @@ BOOLEAN
 UnicodeFiFoInsertOneKey (\r
   TERMINAL_DEV      *TerminalDevice,\r
   UINT16            Input\r
 UnicodeFiFoInsertOneKey (\r
   TERMINAL_DEV      *TerminalDevice,\r
   UINT16            Input\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r
 \r
 /**\r
   Remove one pre-fetched key out of the Unicode FIFO buffer.\r


@@ -1115,8 +1077,7 @@ BOOLEAN
 UnicodeFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT16        *Output\r
 UnicodeFiFoRemoveOneKey (\r
   TERMINAL_DEV  *TerminalDevice,\r
   UINT16        *Output\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether Unicode FIFO buffer is empty.\r
 \r
 /**\r
   Clarify whether Unicode FIFO buffer is empty.\r


@@ -1130,8 +1091,7 @@ UnicodeFiFoRemoveOneKey (
 BOOLEAN\r
 IsUnicodeFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsUnicodeFiFoEmpty (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clarify whether Unicode FIFO buffer is full.\r
 \r
 /**\r
   Clarify whether Unicode FIFO buffer is full.\r


@@ -1145,8 +1105,7 @@ IsUnicodeFiFoEmpty (
 BOOLEAN\r
 IsUnicodeFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r
 BOOLEAN\r
 IsUnicodeFiFoFull (\r
   TERMINAL_DEV  *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Count Unicode FIFO buffer.\r
 \r
 /**\r
   Count Unicode FIFO buffer.\r


@@ -1159,8 +1118,7 @@ IsUnicodeFiFoFull (
 UINT8\r
 UnicodeFiFoGetKeyCount (\r
   TERMINAL_DEV    *TerminalDevice\r
 UINT8\r
 UnicodeFiFoGetKeyCount (\r
   TERMINAL_DEV    *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Translate raw data into Unicode (according to different encode), and \r
 \r
 /**\r
   Translate raw data into Unicode (according to different encode), and \r


@@ -1174,8 +1132,7 @@ UnicodeFiFoGetKeyCount (
 VOID\r
 TranslateRawDataToEfiKey (\r
   IN  TERMINAL_DEV      *TerminalDevice\r
 VOID\r
 TranslateRawDataToEfiKey (\r
   IN  TERMINAL_DEV      *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // internal functions for PC ANSI\r
 \r
 //\r
 // internal functions for PC ANSI\r


@@ -1193,8 +1150,7 @@ TranslateRawDataToEfiKey (
 VOID\r
 AnsiRawDataToUnicode (\r
   IN  TERMINAL_DEV    *TerminalDevice\r
 VOID\r
 AnsiRawDataToUnicode (\r
   IN  TERMINAL_DEV    *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts a stream of Unicode characters from a terminal input device into EFI Keys that\r
 \r
 /**\r
   Converts a stream of Unicode characters from a terminal input device into EFI Keys that\r


@@ -1264,8 +1220,7 @@ AnsiRawDataToUnicode (
 VOID\r
 UnicodeToEfiKey (\r
   IN  TERMINAL_DEV    *TerminalDevice\r
 VOID\r
 UnicodeToEfiKey (\r
   IN  TERMINAL_DEV    *TerminalDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check if input string is valid Ascii string, valid EFI control characters\r
 \r
 /**\r
   Check if input string is valid Ascii string, valid EFI control characters\r


@@ -1282,8 +1237,7 @@ EFI_STATUS
 AnsiTestString (\r
   IN  TERMINAL_DEV    *TerminalDevice,\r
   IN  CHAR16          *WString\r
 AnsiTestString (\r
   IN  TERMINAL_DEV    *TerminalDevice,\r
   IN  CHAR16          *WString\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // internal functions for VTUTF8\r
 \r
 //\r
 // internal functions for VTUTF8\r


@@ -1301,8 +1255,7 @@ AnsiTestString (
 VOID\r
 VTUTF8RawDataToUnicode (\r
   IN  TERMINAL_DEV    *VtUtf8Device\r
 VOID\r
 VTUTF8RawDataToUnicode (\r
   IN  TERMINAL_DEV    *VtUtf8Device\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check if input string is valid VT-UTF8 string.\r
 \r
 /**\r
   Check if input string is valid VT-UTF8 string.\r


@@ -1317,8 +1270,7 @@ EFI_STATUS
 VTUTF8TestString (\r
   IN  TERMINAL_DEV    *TerminalDevice,\r
   IN  CHAR16          *WString\r
 VTUTF8TestString (\r
   IN  TERMINAL_DEV    *TerminalDevice,\r
   IN  CHAR16          *WString\r

-  )\r
-;\r
+  );\r

 \r
 /** \r
   Translate one Unicode character into VT-UTF8 characters.\r
 \r
 /** \r
   Translate one Unicode character into VT-UTF8 characters.\r


@@ -1343,8 +1295,7 @@ UnicodeToUtf8 (
   IN  CHAR16      Unicode,\r
   OUT UTF8_CHAR   *Utf8Char,\r
   OUT UINT8       *ValidBytes\r
   IN  CHAR16      Unicode,\r
   OUT UTF8_CHAR   *Utf8Char,\r
   OUT UINT8       *ValidBytes\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get one valid VT-UTF8 characters set from Raw Data FIFO.\r
 \r
 /**\r
   Get one valid VT-UTF8 characters set from Raw Data FIFO.\r


@@ -1362,8 +1313,7 @@ GetOneValidUtf8Char (
   IN  TERMINAL_DEV      *Utf8Device,\r
   OUT UTF8_CHAR         *Utf8Char,\r
   OUT UINT8             *ValidBytes\r
   IN  TERMINAL_DEV      *Utf8Device,\r
   OUT UTF8_CHAR         *Utf8Char,\r
   OUT UINT8             *ValidBytes\r

-  )\r
-;\r
+  );\r

 \r
 /** \r
   Translate VT-UTF8 characters into one Unicode character.\r
 \r
 /** \r
   Translate VT-UTF8 characters into one Unicode character.\r


@@ -1387,8 +1337,7 @@ Utf8ToUnicode (
   IN  UTF8_CHAR       Utf8Char,\r
   IN  UINT8           ValidBytes,\r
   OUT CHAR16          *UnicodeChar\r
   IN  UTF8_CHAR       Utf8Char,\r
   IN  UINT8           ValidBytes,\r
   OUT CHAR16          *UnicodeChar\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // functions for boxdraw unicode\r
 \r
 //\r
 // functions for boxdraw unicode\r


@@ -1411,8 +1360,7 @@ TerminalIsValidTextGraphics (
   IN  CHAR16  Graphic,\r
   OUT CHAR8   *PcAnsi, OPTIONAL\r
   OUT CHAR8   *Ascii OPTIONAL\r
   IN  CHAR16  Graphic,\r
   OUT CHAR8   *PcAnsi, OPTIONAL\r
   OUT CHAR8   *Ascii OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Detects if a valid ASCII char.\r
 \r
 /**\r
   Detects if a valid ASCII char.\r


@@ -1426,8 +1374,7 @@ TerminalIsValidTextGraphics (
 BOOLEAN\r
 TerminalIsValidAscii (\r
   IN  CHAR16  Ascii\r
 BOOLEAN\r
 TerminalIsValidAscii (\r
   IN  CHAR16  Ascii\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Detects if a valid EFI control character.\r
 \r
 /**\r
   Detects if a valid EFI control character.\r


@@ -1441,7 +1388,6 @@ TerminalIsValidAscii (
 BOOLEAN\r
 TerminalIsValidEfiCntlChar (\r
   IN  CHAR16  CharC\r
 BOOLEAN\r
 TerminalIsValidEfiCntlChar (\r
   IN  CHAR16  CharC\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index f19de75809519537f2082f477d92881a91e22967..535bddde13d223161511181e8d7ffead396f4935 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -97,8 +97,7 @@ EFI_STATUS
 DebugPortEntryPoint (\r
   IN EFI_HANDLE                     ImageHandle,\r
   IN EFI_SYSTEM_TABLE               *SystemTable\r
 DebugPortEntryPoint (\r
   IN EFI_HANDLE                     ImageHandle,\r
   IN EFI_SYSTEM_TABLE               *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -106,8 +105,7 @@ DebugPortSupported (
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -115,8 +113,7 @@ DebugPortStart (
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
   IN EFI_HANDLE                     Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -125,8 +122,7 @@ DebugPortStop (
   IN  EFI_HANDLE                     Controller,\r
   IN  UINTN                          NumberOfChildren,\r
   IN  EFI_HANDLE                     *ChildHandleBuffer\r
   IN  EFI_HANDLE                     Controller,\r
   IN  UINTN                          NumberOfChildren,\r
   IN  EFI_HANDLE                     *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI Component Name Functions\r
 \r
 //\r
 // EFI Component Name Functions\r


@@ -265,8 +261,7 @@ EFI_STATUS
 EFIAPI\r
 DebugPortReset (\r
   IN EFI_DEBUGPORT_PROTOCOL         *This\r
 EFIAPI\r
 DebugPortReset (\r
   IN EFI_DEBUGPORT_PROTOCOL         *This\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -275,8 +270,7 @@ DebugPortRead (
   IN UINT32                         Timeout,\r
   IN OUT UINTN                      *BufferSize,\r
   IN VOID                           *Buffer\r
   IN UINT32                         Timeout,\r
   IN OUT UINTN                      *BufferSize,\r
   IN VOID                           *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -285,14 +279,12 @@ DebugPortWrite (
   IN UINT32                         Timeout,\r
   IN OUT UINTN                      *BufferSize,\r
   OUT VOID                          *Buffer\r
   IN UINT32                         Timeout,\r
   IN OUT UINTN                      *BufferSize,\r
   OUT VOID                          *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 DebugPortPoll (\r
   IN EFI_DEBUGPORT_PROTOCOL         *This\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 DebugPortPoll (\r
   IN EFI_DEBUGPORT_PROTOCOL         *This\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
index b8cd8eca043d11d0fa548de155fc11361c8408fd..0fa93de100927ddd0045c640681fb58015f25179 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
@@ -46,8 +46,7 @@ typedef
 VOID\r
 (*DEBUG_PROC) (\r
   VOID\r
 VOID\r
 (*DEBUG_PROC) (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   DESCRIPTOR  OrigDesc;\r
 \r
 typedef struct {\r
   DESCRIPTOR  OrigDesc;\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
index f45ceffb5514db486b031588d58b36c358933f77..b643ec44e2aa17bed34f21ed316c414ac710801a 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
@@ -49,8 +49,7 @@ typedef
 VOID\r
 (*DEBUG_PROC) (\r
   VOID\r
 VOID\r
 (*DEBUG_PROC) (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   DESCRIPTOR  OrigDesc;\r
 \r
 typedef struct {\r
   DESCRIPTOR  OrigDesc;\r

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
index 90a9fd85d2e20f10b44e06e98849b90dde49bb64..2a5195bb4f85d8dde5a44626c0d0856db71c29f7 100644 (file)
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h
@@ -150,8 +150,7 @@ EFIAPI
 InitializeFtwLite (\r
   IN EFI_HANDLE                 ImageHandle,\r
   IN EFI_SYSTEM_TABLE           *SystemTable\r
 InitializeFtwLite (\r
   IN EFI_HANDLE                 ImageHandle,\r
   IN EFI_SYSTEM_TABLE           *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Fault Tolerant Write Protocol API\r
 \r
 //\r
 // Fault Tolerant Write Protocol API\r


@@ -189,8 +188,7 @@ FtwLiteWrite (
   IN UINTN                                      Offset,\r
   IN OUT UINTN                                 *NumBytes,\r
   IN VOID                                       *Buffer\r
   IN UINTN                                      Offset,\r
   IN OUT UINTN                                 *NumBytes,\r
   IN VOID                                       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Internal functions\r
 \r
 //\r
 // Internal functions\r


@@ -213,8 +211,7 @@ FtwLiteWrite (
 EFI_STATUS\r
 FtwRestart (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice\r
 EFI_STATUS\r
 FtwRestart (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Aborts all previous allocated writes.\r
 \r
 /**\r
   Aborts all previous allocated writes.\r


@@ -230,8 +227,7 @@ FtwRestart (
 EFI_STATUS\r
 FtwAbort (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice\r
 EFI_STATUS\r
 FtwAbort (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -252,8 +248,7 @@ EFI_STATUS
 FtwWriteRecord (\r
   IN EFI_FTW_LITE_DEVICE                   *FtwLiteDevice,\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *Fvb\r
 FtwWriteRecord (\r
   IN EFI_FTW_LITE_DEVICE                   *FtwLiteDevice,\r
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *Fvb\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   To Erase one block. The size is FTW_BLOCK_SIZE\r
 \r
 /**\r
   To Erase one block. The size is FTW_BLOCK_SIZE\r


@@ -272,8 +267,7 @@ FtwEraseBlock (
   IN EFI_FTW_LITE_DEVICE              *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r
   IN EFI_FTW_LITE_DEVICE              *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -299,8 +293,7 @@ FtwEraseBlock (
 EFI_STATUS\r
 FtwEraseSpareBlock (\r
   IN EFI_FTW_LITE_DEVICE   *FtwLiteDevice\r
 EFI_STATUS\r
 FtwEraseSpareBlock (\r
   IN EFI_FTW_LITE_DEVICE   *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrive the proper FVB protocol interface by HANDLE.\r
 \r
 /**\r
   Retrive the proper FVB protocol interface by HANDLE.\r


@@ -318,8 +311,7 @@ EFI_STATUS
 FtwGetFvbByHandle (\r
   IN EFI_HANDLE                           FvBlockHandle,\r
   OUT EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  **FvBlock\r
 FtwGetFvbByHandle (\r
   IN EFI_HANDLE                           FvBlockHandle,\r
   OUT EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  **FvBlock\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -337,8 +329,7 @@ EFI_STATUS
 GetFvbByAddress (\r
   IN  EFI_PHYSICAL_ADDRESS               Address,\r
   OUT EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL **FvBlock\r
 GetFvbByAddress (\r
   IN  EFI_PHYSICAL_ADDRESS               Address,\r
   OUT EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL **FvBlock\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -357,8 +348,7 @@ IsInWorkingBlock (
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -378,8 +368,7 @@ IsBootBlock (
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copy the content of spare block to a target block. Size is FTW_BLOCK_SIZE.\r
 \r
 /**\r
   Copy the content of spare block to a target block. Size is FTW_BLOCK_SIZE.\r


@@ -403,8 +392,7 @@ FlushSpareBlockToTargetBlock (
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice,\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *FvBlock,\r
   EFI_LBA                             Lba\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copy the content of spare block to working block. Size is FTW_BLOCK_SIZE.\r
 \r
 /**\r
   Copy the content of spare block to working block. Size is FTW_BLOCK_SIZE.\r


@@ -428,8 +416,7 @@ FlushSpareBlockToTargetBlock (
 EFI_STATUS\r
 FlushSpareBlockToWorkingBlock (\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice\r
 EFI_STATUS\r
 FlushSpareBlockToWorkingBlock (\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copy the content of spare block to a boot block. Size is FTW_BLOCK_SIZE.\r
 \r
 /**\r
   Copy the content of spare block to a boot block. Size is FTW_BLOCK_SIZE.\r


@@ -450,8 +437,7 @@ FlushSpareBlockToWorkingBlock (
 EFI_STATUS\r
 FlushSpareBlockToBootBlock (\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice\r
 EFI_STATUS\r
 FlushSpareBlockToBootBlock (\r
   EFI_FTW_LITE_DEVICE                 *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update a bit of state on a block device. The location of the bit is\r
 \r
 /**\r
   Update a bit of state on a block device. The location of the bit is\r


@@ -477,8 +463,7 @@ FtwUpdateFvState (
   IN EFI_LBA                             Lba,\r
   IN UINTN                               Offset,\r
   IN UINT8                               NewBit\r
   IN EFI_LBA                             Lba,\r
   IN UINTN                               Offset,\r
   IN UINT8                               NewBit\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the last Write record pointer.\r
 \r
 /**\r
   Get the last Write record pointer.\r


@@ -497,8 +482,7 @@ EFI_STATUS
 FtwGetLastRecord (\r
   IN  EFI_FTW_LITE_DEVICE  *FtwLiteDevice,\r
   OUT EFI_FTW_LITE_RECORD  **FtwLastRecord\r
 FtwGetLastRecord (\r
   IN  EFI_FTW_LITE_DEVICE  *FtwLiteDevice,\r
   OUT EFI_FTW_LITE_RECORD  **FtwLastRecord\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -517,8 +501,7 @@ IsErasedFlashBuffer (
   IN BOOLEAN         Polarity,\r
   IN UINT8           *Buffer,\r
   IN UINTN           BufferSize\r
   IN BOOLEAN         Polarity,\r
   IN UINT8           *Buffer,\r
   IN UINTN           BufferSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize a work space when there is no work space.\r
 \r
 /**\r
   Initialize a work space when there is no work space.\r


@@ -533,8 +516,7 @@ IsErasedFlashBuffer (
 EFI_STATUS\r
 InitWorkSpaceHeader (\r
   IN EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *WorkingHeader\r
 EFI_STATUS\r
 InitWorkSpaceHeader (\r
   IN EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *WorkingHeader\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read from working block to refresh the work space in memory.\r
 \r
 /**\r
   Read from working block to refresh the work space in memory.\r


@@ -549,8 +531,7 @@ InitWorkSpaceHeader (
 EFI_STATUS\r
 WorkSpaceRefresh (\r
   IN EFI_FTW_LITE_DEVICE  *FtwLiteDevice\r
 EFI_STATUS\r
 WorkSpaceRefresh (\r
   IN EFI_FTW_LITE_DEVICE  *FtwLiteDevice\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Check to see if it is a valid work space.\r
 \r
 /**\r
   Check to see if it is a valid work space.\r


@@ -565,8 +546,7 @@ WorkSpaceRefresh (
 BOOLEAN\r
 IsValidWorkSpace (\r
   IN EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *WorkingHeader\r
 BOOLEAN\r
 IsValidWorkSpace (\r
   IN EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *WorkingHeader\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reclaim the work space on the working block.\r
 \r
 /**\r
   Reclaim the work space on the working block.\r


@@ -584,7 +564,6 @@ EFI_STATUS
 FtwReclaimWorkSpace (\r
   IN EFI_FTW_LITE_DEVICE  *FtwLiteDevice,\r
   IN BOOLEAN              PreserveRecord\r
 FtwReclaimWorkSpace (\r
   IN EFI_FTW_LITE_DEVICE  *FtwLiteDevice,\r
   IN BOOLEAN              PreserveRecord\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index d559c82841ed96ee4ed2e3153f536fea45d45936..4b53e8762dfdcef6cfc48451e106f01b8de68948 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -305,8 +305,7 @@ typedef struct _HII_DATABASE_PRIVATE_DATA {
 BOOLEAN\r
 IsHiiHandleValid (\r
   EFI_HII_HANDLE Handle\r
 BOOLEAN\r
 IsHiiHandleValid (\r
   EFI_HII_HANDLE Handle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -338,8 +337,7 @@ IsFontInfoExisted (
   IN  EFI_FONT_INFO_MASK        *FontInfoMask,   OPTIONAL\r
   IN  EFI_FONT_HANDLE           FontHandle,      OPTIONAL\r
   OUT HII_GLOBAL_FONT_INFO      **GlobalFontInfo OPTIONAL\r
   IN  EFI_FONT_INFO_MASK        *FontInfoMask,   OPTIONAL\r
   IN  EFI_FONT_HANDLE           FontHandle,      OPTIONAL\r
   OUT HII_GLOBAL_FONT_INFO      **GlobalFontInfo OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -362,8 +360,7 @@ GetSystemFont (
   IN  HII_DATABASE_PRIVATE_DATA      *Private,\r
   OUT EFI_FONT_DISPLAY_INFO          **FontInfo,\r
   OUT UINTN                          *FontInfoSize OPTIONAL\r
   IN  HII_DATABASE_PRIVATE_DATA      *Private,\r
   OUT EFI_FONT_DISPLAY_INFO          **FontInfo,\r
   OUT UINTN                          *FontInfoSize OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -399,8 +396,7 @@ FindStringBlock (
   OUT UINT8                           **StringBlockAddr, OPTIONAL\r
   OUT UINTN                           *StringTextOffset, OPTIONAL\r
   OUT EFI_STRING_ID                   *LastStringId OPTIONAL\r
   OUT UINT8                           **StringBlockAddr, OPTIONAL\r
   OUT UINTN                           *StringTextOffset, OPTIONAL\r
   OUT EFI_STRING_ID                   *LastStringId OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -431,8 +427,7 @@ FindGlyphBlock (
   OUT UINT8                          **GlyphBuffer, OPTIONAL\r
   OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL\r
   OUT UINTN                          *GlyphBufferLen OPTIONAL\r
   OUT UINT8                          **GlyphBuffer, OPTIONAL\r
   OUT EFI_HII_GLYPH_INFO             *Cell, OPTIONAL\r
   OUT UINTN                          *GlyphBufferLen OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI_HII_FONT_PROTOCOL protocol interfaces\r
 \r
 //\r
 // EFI_HII_FONT_PROTOCOL protocol interfaces\r


@@ -506,8 +501,7 @@ HiiStringToImage (
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -586,8 +580,7 @@ HiiStringIdToImage (
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r
   OUT EFI_HII_ROW_INFO               **RowInfoArray    OPTIONAL,\r
   OUT UINTN                          *RowInfoArraySize OPTIONAL,\r
   OUT UINTN                          *ColumnInfoArray  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -620,8 +613,7 @@ HiiGetGlyph (
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfo,\r
   OUT EFI_IMAGE_OUTPUT               **Blt,\r
   OUT UINTN                          *Baseline OPTIONAL\r
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfo,\r
   OUT EFI_IMAGE_OUTPUT               **Blt,\r
   OUT UINTN                          *Baseline OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -661,8 +653,7 @@ HiiGetFontInfo (
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn, OPTIONAL\r
   OUT       EFI_FONT_DISPLAY_INFO    **StringInfoOut,\r
   IN  CONST EFI_STRING               String OPTIONAL\r
   IN  CONST EFI_FONT_DISPLAY_INFO    *StringInfoIn, OPTIONAL\r
   OUT       EFI_FONT_DISPLAY_INFO    **StringInfoOut,\r
   IN  CONST EFI_STRING               String OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI_HII_IMAGE_PROTOCOL interfaces\r
 \r
 //\r
 // EFI_HII_IMAGE_PROTOCOL interfaces\r


@@ -694,8 +685,7 @@ HiiNewImage (
   IN  EFI_HII_HANDLE                 PackageList,\r
   OUT EFI_IMAGE_ID                   *ImageId,\r
   IN  CONST EFI_IMAGE_INPUT          *Image\r
   IN  EFI_HII_HANDLE                 PackageList,\r
   OUT EFI_IMAGE_ID                   *ImageId,\r
   IN  CONST EFI_IMAGE_INPUT          *Image\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -726,8 +716,7 @@ HiiGetImage (
   IN  EFI_HII_HANDLE                 PackageList,\r
   IN  EFI_IMAGE_ID                   ImageId,\r
   OUT EFI_IMAGE_INPUT                *Image\r
   IN  EFI_HII_HANDLE                 PackageList,\r
   IN  EFI_IMAGE_ID                   ImageId,\r
   OUT EFI_IMAGE_INPUT                *Image\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -753,8 +742,7 @@ HiiSetImage (
   IN EFI_HII_HANDLE                  PackageList,\r
   IN EFI_IMAGE_ID                    ImageId,\r
   IN CONST EFI_IMAGE_INPUT           *Image\r
   IN EFI_HII_HANDLE                  PackageList,\r
   IN EFI_IMAGE_ID                    ImageId,\r
   IN CONST EFI_IMAGE_INPUT           *Image\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -795,8 +783,7 @@ HiiDrawImage (
   IN OUT EFI_IMAGE_OUTPUT            **Blt,\r
   IN UINTN                           BltX,\r
   IN UINTN                           BltY\r
   IN OUT EFI_IMAGE_OUTPUT            **Blt,\r
   IN UINTN                           BltX,\r
   IN UINTN                           BltY\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -893,8 +880,7 @@ HiiNewString (
   IN  CONST CHAR16                    *LanguageName, OPTIONAL\r
   IN  CONST EFI_STRING                String,\r
   IN  CONST EFI_FONT_INFO             *StringFontInfo OPTIONAL\r
   IN  CONST CHAR16                    *LanguageName, OPTIONAL\r
   IN  CONST EFI_STRING                String,\r
   IN  CONST EFI_FONT_INFO             *StringFontInfo OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -941,8 +927,7 @@ HiiGetString (
   OUT EFI_STRING                      String,\r
   IN  OUT UINTN                       *StringSize,\r
   OUT EFI_FONT_INFO                   **StringFontInfo OPTIONAL\r
   OUT EFI_STRING                      String,\r
   IN  OUT UINTN                       *StringSize,\r
   OUT EFI_FONT_INFO                   **StringFontInfo OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -976,8 +961,7 @@ HiiSetString (
   IN CONST CHAR8                      *Language,\r
   IN CONST EFI_STRING                 String,\r
   IN CONST EFI_FONT_INFO              *StringFontInfo OPTIONAL\r
   IN CONST CHAR8                      *Language,\r
   IN CONST EFI_STRING                 String,\r
   IN CONST EFI_FONT_INFO              *StringFontInfo OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1008,8 +992,7 @@ HiiGetLanguages (
   IN EFI_HII_HANDLE                   PackageList,\r
   IN OUT CHAR8                        *Languages,\r
   IN OUT UINTN                        *LanguagesSize\r
   IN EFI_HII_HANDLE                   PackageList,\r
   IN OUT CHAR8                        *Languages,\r
   IN OUT UINTN                        *LanguagesSize\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1051,8 +1034,7 @@ HiiGetSecondaryLanguages (
   IN CONST CHAR8                     *FirstLanguage,\r
   IN OUT CHAR8                       *SecondaryLanguages,\r
   IN OUT UINTN                       *SecondaryLanguagesSize\r
   IN CONST CHAR8                     *FirstLanguage,\r
   IN OUT CHAR8                       *SecondaryLanguages,\r
   IN OUT UINTN                       *SecondaryLanguagesSize\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI_HII_DATABASE_PROTOCOL protocol interfaces\r
 \r
 //\r
 // EFI_HII_DATABASE_PROTOCOL protocol interfaces\r


@@ -1085,8 +1067,7 @@ HiiNewPackageList (
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList,\r
   IN CONST EFI_HANDLE                   DriverHandle,\r
   OUT EFI_HII_HANDLE                    *Handle\r
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList,\r
   IN CONST EFI_HANDLE                   DriverHandle,\r
   OUT EFI_HII_HANDLE                    *Handle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1109,8 +1090,7 @@ EFIAPI
 HiiRemovePackageList (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle\r
 HiiRemovePackageList (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1137,8 +1117,7 @@ HiiUpdatePackageList (
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle,\r
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HII_HANDLE                     Handle,\r
   IN CONST EFI_HII_PACKAGE_LIST_HEADER  *PackageList\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1183,8 +1162,7 @@ HiiListPackageLists (
   IN  CONST EFI_GUID                    *PackageGuid,\r
   IN  OUT UINTN                         *HandleBufferLength,\r
   OUT EFI_HII_HANDLE                    *Handle\r
   IN  CONST EFI_GUID                    *PackageGuid,\r
   IN  OUT UINTN                         *HandleBufferLength,\r
   OUT EFI_HII_HANDLE                    *Handle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1221,8 +1199,7 @@ HiiExportPackageLists (
   IN  EFI_HII_HANDLE                    Handle,\r
   IN  OUT UINTN                         *BufferSize,\r
   OUT EFI_HII_PACKAGE_LIST_HEADER       *Buffer\r
   IN  EFI_HII_HANDLE                    Handle,\r
   IN  OUT UINTN                         *BufferSize,\r
   OUT EFI_HII_PACKAGE_LIST_HEADER       *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1270,8 +1247,7 @@ HiiRegisterPackageNotify (
   IN  CONST EFI_HII_DATABASE_NOTIFY     PackageNotifyFn,\r
   IN  EFI_HII_DATABASE_NOTIFY_TYPE      NotifyType,\r
   OUT EFI_HANDLE                        *NotifyHandle\r
   IN  CONST EFI_HII_DATABASE_NOTIFY     PackageNotifyFn,\r
   IN  EFI_HII_DATABASE_NOTIFY_TYPE      NotifyType,\r
   OUT EFI_HANDLE                        *NotifyHandle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1292,8 +1268,7 @@ EFIAPI
 HiiUnregisterPackageNotify (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HANDLE                         NotificationHandle\r
 HiiUnregisterPackageNotify (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL    *This,\r
   IN EFI_HANDLE                         NotificationHandle\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1325,8 +1300,7 @@ HiiFindKeyboardLayouts (
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,\r
   IN  OUT UINT16                        *KeyGuidBufferLength,\r
   OUT EFI_GUID                          *KeyGuidBuffer\r
   IN  CONST EFI_HII_DATABASE_PROTOCOL   *This,\r
   IN  OUT UINT16                        *KeyGuidBufferLength,\r
   OUT EFI_GUID                          *KeyGuidBuffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1357,8 +1331,7 @@ HiiGetKeyboardLayout (
   IN  CONST EFI_GUID                          *KeyGuid,\r
   IN OUT UINT16                         *KeyboardLayoutLength,\r
   OUT EFI_HII_KEYBOARD_LAYOUT           *KeyboardLayout\r
   IN  CONST EFI_GUID                          *KeyGuid,\r
   IN OUT UINT16                         *KeyboardLayoutLength,\r
   OUT EFI_HII_KEYBOARD_LAYOUT           *KeyboardLayout\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1383,8 +1356,7 @@ EFIAPI
 HiiSetKeyboardLayout (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL          *This,\r
   IN CONST EFI_GUID                           *KeyGuid\r
 HiiSetKeyboardLayout (\r
   IN CONST EFI_HII_DATABASE_PROTOCOL          *This,\r
   IN CONST EFI_GUID                           *KeyGuid\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1409,8 +1381,7 @@ HiiGetPackageListHandle (
   IN  CONST EFI_HII_DATABASE_PROTOCOL         *This,\r
   IN  EFI_HII_HANDLE                    PackageListHandle,\r
   OUT EFI_HANDLE                        *DriverHandle\r
   IN  CONST EFI_HII_DATABASE_PROTOCOL         *This,\r
   IN  EFI_HII_HANDLE                    PackageListHandle,\r
   OUT EFI_HANDLE                        *DriverHandle\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI_HII_CONFIG_ROUTING_PROTOCOL interfaces\r
 \r
 //\r
 // EFI_HII_CONFIG_ROUTING_PROTOCOL interfaces\r


@@ -1463,8 +1434,7 @@ HiiConfigRoutingExtractConfig (
   IN  CONST EFI_STRING                       Request,\r
   OUT EFI_STRING                             *Progress,\r
   OUT EFI_STRING                             *Results\r
   IN  CONST EFI_STRING                       Request,\r
   OUT EFI_STRING                             *Progress,\r
   OUT EFI_STRING                             *Results\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1493,8 +1463,7 @@ EFIAPI
 HiiConfigRoutingExportConfig (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   OUT EFI_STRING                             *Results\r
 HiiConfigRoutingExportConfig (\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   OUT EFI_STRING                             *Results\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1528,8 +1497,7 @@ HiiConfigRoutingRouteConfig (
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   IN  CONST EFI_STRING                       Configuration,\r
   OUT EFI_STRING                             *Progress\r
   IN  CONST EFI_HII_CONFIG_ROUTING_PROTOCOL  *This,\r
   IN  CONST EFI_STRING                       Configuration,\r
   OUT EFI_STRING                             *Progress\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -1581,8 +1549,7 @@ HiiBlockToConfig (
   IN  CONST UINTN                            BlockSize,\r
   OUT EFI_STRING                             *Config,\r
   OUT EFI_STRING                             *Progress\r
   IN  CONST UINTN                            BlockSize,\r
   OUT EFI_STRING                             *Config,\r
   OUT EFI_STRING                             *Progress\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1639,8 +1606,7 @@ HiiConfigToBlock (
   IN OUT UINT8                                 *Block,\r
   IN OUT UINTN                                 *BlockSize,\r
   OUT    EFI_STRING                            *Progress\r
   IN OUT UINT8                                 *Block,\r
   IN OUT UINTN                                 *BlockSize,\r
   OUT    EFI_STRING                            *Progress\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -1693,8 +1659,7 @@ HiiGetAltCfg (
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,\r
   IN  CONST UINT16                             *AltCfgId,\r
   OUT EFI_STRING                               *AltCfgResp\r
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,\r
   IN  CONST UINT16                             *AltCfgId,\r
   OUT EFI_STRING                               *AltCfgResp\r

-  )\r
-;\r
+  );\r

 \r
 \r
 //\r
 \r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index a71e6a24fd012f591dc537219808a975c2f631bd..15dad80b22c04cb062050ae9819f03aa551cb99c 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -79,8 +79,7 @@ InitializeMemoryTest (
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EXTENDMEM_COVERAGE_LEVEL                 Level,\r
   OUT BOOLEAN                                  *RequireSoftECCInit\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EXTENDMEM_COVERAGE_LEVEL                 Level,\r
   OUT BOOLEAN                                  *RequireSoftECCInit\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -90,15 +89,13 @@ GenPerformMemoryTest (
   OUT UINT64                                   *TotalMemorySize,\r
   OUT BOOLEAN                                  *ErrorOut,\r
   IN BOOLEAN                                   TestAbort\r
   OUT UINT64                                   *TotalMemorySize,\r
   OUT BOOLEAN                                  *ErrorOut,\r
   IN BOOLEAN                                   TestAbort\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 GenMemoryTestFinished (\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 GenMemoryTestFinished (\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL *This\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -106,7 +103,6 @@ GenCompatibleRangeTest (
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EFI_PHYSICAL_ADDRESS                     StartAddress,\r
   IN  UINT64                                   Length\r
   IN EFI_GENERIC_MEMORY_TEST_PROTOCOL          *This,\r
   IN  EFI_PHYSICAL_ADDRESS                     StartAddress,\r
   IN  UINT64                                   Length\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
index 4fac2a00c9d83814d20c57bf451c4792b3eab7db..0c40cd9c6395fa44479776dd4ce379747889b1bd 100644 (file)
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
@@ -41,7 +41,6 @@ EFIAPI
 MonotonicCounterDriverInitialize (\r
   IN EFI_HANDLE                            ImageHandle,\r
   IN EFI_SYSTEM_TABLE                      *SystemTable\r
 MonotonicCounterDriverInitialize (\r
   IN EFI_HANDLE                            ImageHandle,\r
   IN EFI_SYSTEM_TABLE                      *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
index dd59626f3731369d559a5ecacbf0d017c659c54b..fca782ce3435b5965f80208f13627427146e09bf 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
@@ -48,8 +48,7 @@ typedef struct _MD5_CTX {
 EFI_STATUS\r
 MD5Init (\r
   IN MD5_CTX  *Md5Ctx\r
 EFI_STATUS\r
 MD5Init (\r
   IN MD5_CTX  *Md5Ctx\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   the external interface of Md5 algorithm\r
 \r
 /**\r
   the external interface of Md5 algorithm\r


@@ -69,8 +68,7 @@ MD5Update (
   IN MD5_CTX  *Md5Ctx,\r
   IN VOID     *Data,\r
   IN UINTN    DataLen\r
   IN MD5_CTX  *Md5Ctx,\r
   IN VOID     *Data,\r
   IN UINTN    DataLen\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   accumulate the MD5 value of every data segment and generate the finial\r
 \r
 /**\r
   accumulate the MD5 value of every data segment and generate the finial\r


@@ -88,7 +86,6 @@ EFI_STATUS
 MD5Final (\r
   IN  MD5_CTX  *Md5Ctx,\r
   OUT UINT8    *HashVal\r
 MD5Final (\r
   IN  MD5_CTX  *Md5Ctx,\r
   OUT UINT8    *HashVal\r

-  )\r
-;\r
+  );\r

 \r
 #endif // _MD5_H\r
 \r
 #endif // _MD5_H\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
index 0d1e3f78689649e8c5bd0b1ed2a6c0d61bd1ad00..56c139371f2f47e86a055274ba8dbe6ecf1b2047 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h
@@ -188,16 +188,14 @@ PxebcBisStart (
   PXE_BASECODE_DEVICE     *Private,\r
   BIS_APPLICATION_HANDLE  *BisAppHandle,\r
   EFI_BIS_DATA            **BisDataSigInfo\r
   PXE_BASECODE_DEVICE     *Private,\r
   BIS_APPLICATION_HANDLE  *BisAppHandle,\r
   EFI_BIS_DATA            **BisDataSigInfo\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PxebcBisStop (\r
   EFI_BIS_PROTOCOL        *Bis,\r
   BIS_APPLICATION_HANDLE  BisAppHandle,\r
   EFI_BIS_DATA            *BisDataSigInfo\r
 \r
 VOID\r
 PxebcBisStop (\r
   EFI_BIS_PROTOCOL        *Bis,\r
   BIS_APPLICATION_HANDLE  BisAppHandle,\r
   EFI_BIS_DATA            *BisDataSigInfo\r

-  )\r
-;\r
+  );\r

 \r
 BOOLEAN\r
 PxebcBisVerify (\r
 \r
 BOOLEAN\r
 PxebcBisVerify (\r


@@ -206,14 +204,12 @@ PxebcBisVerify (
   UINTN                   FileBufferLength,\r
   VOID                    *CredentialBuffer,\r
   UINTN                   CredentialBufferLength\r
   UINTN                   FileBufferLength,\r
   VOID                    *CredentialBuffer,\r
   UINTN                   CredentialBufferLength\r

-  )\r
-;\r
+  );\r

 \r
 BOOLEAN\r
 PxebcBisDetect (\r
   PXE_BASECODE_DEVICE *Private\r
 \r
 BOOLEAN\r
 PxebcBisDetect (\r
   PXE_BASECODE_DEVICE *Private\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Global Variables\r
 \r
 //\r
 // Global Variables\r


@@ -240,31 +236,27 @@ EFIAPI
 InitializeBCDriver (\r
   IN EFI_HANDLE                       ImageHandle,\r
   IN EFI_SYSTEM_TABLE                 *SystemTable\r
 InitializeBCDriver (\r
   IN EFI_HANDLE                       ImageHandle,\r
   IN EFI_SYSTEM_TABLE                 *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 BcStart (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN BOOLEAN                          UseIpv6\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 BcStart (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN BOOLEAN                          UseIpv6\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 BcStop (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 BcStop (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 BcDhcp (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN BOOLEAN                          SortOffers\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 BcDhcp (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN BOOLEAN                          SortOffers\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -274,8 +266,7 @@ BcDiscover (
   IN UINT16                           *Layer,\r
   IN BOOLEAN                          UseBis,\r
   IN EFI_PXE_BASE_CODE_DISCOVER_INFO  * Info OPTIONAL\r
   IN UINT16                           *Layer,\r
   IN BOOLEAN                          UseBis,\r
   IN EFI_PXE_BASE_CODE_DISCOVER_INFO  * Info OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -290,8 +281,7 @@ BcMtftp (
   IN UINT8                            *Filename,\r
   IN EFI_PXE_BASE_CODE_MTFTP_INFO     * Info OPTIONAL,\r
   IN BOOLEAN                          DontUseBuffer\r
   IN UINT8                            *Filename,\r
   IN EFI_PXE_BASE_CODE_MTFTP_INFO     * Info OPTIONAL,\r
   IN BOOLEAN                          DontUseBuffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -307,8 +297,7 @@ BcUdpWrite (
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN UINTN                            *BufferSize,\r
   IN VOID                             *BufferPtr\r
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN UINTN                            *BufferSize,\r
   IN VOID                             *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -323,8 +312,7 @@ BcUdpRead (
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *BufferPtr\r
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -345,8 +333,7 @@ BcTcpWrite (
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN UINTN                            *BufferSize,\r
   IN VOID                             *BufferPtr\r
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN UINTN                            *BufferSize,\r
   IN VOID                             *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -361,8 +348,7 @@ BcTcpRead (
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *BufferPtr\r
   IN VOID                             *HeaderPtr, OPTIONAL\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -370,16 +356,14 @@ BcArp (
   IN EFI_PXE_BASE_CODE_PROTOCOL       * This,\r
   IN EFI_IP_ADDRESS                   * IpAddr,\r
   IN EFI_MAC_ADDRESS                  * MacAddr OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       * This,\r
   IN EFI_IP_ADDRESS                   * IpAddr,\r
   IN EFI_MAC_ADDRESS                  * MacAddr OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 BcIpFilter (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN EFI_PXE_BASE_CODE_IP_FILTER      *NewFilter\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 BcIpFilter (\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       *This,\r
   IN EFI_PXE_BASE_CODE_IP_FILTER      *NewFilter\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -390,8 +374,7 @@ BcSetParameters (
   IN UINT8                            *NewTTL, OPTIONAL\r
   IN UINT8                            *NewToS, OPTIONAL\r
   IN BOOLEAN                          *NewMakeCallback OPTIONAL\r
   IN UINT8                            *NewTTL, OPTIONAL\r
   IN UINT8                            *NewToS, OPTIONAL\r
   IN BOOLEAN                          *NewMakeCallback OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -399,8 +382,7 @@ BcSetStationIP (
   IN EFI_PXE_BASE_CODE_PROTOCOL       * This,\r
   IN EFI_IP_ADDRESS                   * NewStationIp, OPTIONAL\r
   IN EFI_IP_ADDRESS                   * NewSubnetMask OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PROTOCOL       * This,\r
   IN EFI_IP_ADDRESS                   * NewStationIp, OPTIONAL\r
   IN EFI_IP_ADDRESS                   * NewSubnetMask OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -418,8 +400,7 @@ BcSetPackets (
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeDiscover, OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeReply, OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeBisReply OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeDiscover, OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeReply, OPTIONAL\r
   IN EFI_PXE_BASE_CODE_PACKET         * NewPxeBisReply OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -429,15 +410,13 @@ LoadFile (
   IN BOOLEAN                          BootPolicy,\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *Buffer\r
   IN BOOLEAN                          BootPolicy,\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PxeBcLibGetSmbiosSystemGuidAndSerialNumber (\r
   IN  EFI_GUID    *SystemGuid,\r
   OUT CHAR8       **SystemSerialNumber\r
 \r
 EFI_STATUS\r
 PxeBcLibGetSmbiosSystemGuidAndSerialNumber (\r
   IN  EFI_GUID    *SystemGuid,\r
   OUT CHAR8       **SystemSerialNumber\r

-  )\r
-;\r
+  );\r

 \r
 #include "Ip.h"\r
 #include "Dhcp.h"\r
 \r
 #include "Ip.h"\r
 #include "Dhcp.h"\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Ip.h b/MdeModulePkg/Universal/Network/PxeBcDxe/Ip.h
index 29f143961a58718db929fadfaa3672e0cb514df8..158fce60ad73cf3f0a6f95b44154f2bda46e1cef 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Ip.h
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Ip.h
@@ -431,8 +431,7 @@ EFI_STATUS
 IpFilter (\r
   PXE_BASECODE_DEVICE            *Private,\r
   IN EFI_PXE_BASE_CODE_IP_FILTER *Filter\r
 IpFilter (\r
   PXE_BASECODE_DEVICE            *Private,\r
   IN EFI_PXE_BASE_CODE_IP_FILTER *Filter\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // //////////////////////////////////////////////////////////////////////\r
 \r
 //\r
 // //////////////////////////////////////////////////////////////////////\r


@@ -452,8 +451,7 @@ UdpWrite (
   IN VOID                                     *HeaderPtr, OPTIONAL\r
   IN UINTN                                    *BufferSizePtr,\r
   IN VOID                                     *BufferPtr\r
   IN VOID                                     *HeaderPtr, OPTIONAL\r
   IN UINTN                                    *BufferSizePtr,\r
   IN VOID                                     *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // /////////////////////////////////////////////////////////////////////\r
 \r
 //\r
 // /////////////////////////////////////////////////////////////////////\r


@@ -473,22 +471,19 @@ UdpRead (
   IN OUT UINTN                      *BufferSizePtr,\r
   IN VOID                           *BufferPtr,\r
   IN EFI_EVENT                      TimeoutEvent\r
   IN OUT UINTN                      *BufferSizePtr,\r
   IN VOID                           *BufferPtr,\r
   IN EFI_EVENT                      TimeoutEvent\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 IgmpLeaveGroup (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *\r
 \r
 VOID\r
 IgmpLeaveGroup (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 IgmpJoinGroup (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *\r
 \r
 VOID\r
 IgmpJoinGroup (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // convert number to zero filled ascii value of length lth\r
 \r
 //\r
 // convert number to zero filled ascii value of length lth\r


@@ -498,8 +493,7 @@ CvtNum (
   UINTN Number,\r
   UINT8 *BufferPtr,\r
   INTN  BufferLen\r
   UINTN Number,\r
   UINT8 *BufferPtr,\r
   INTN  BufferLen\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // convert number to ascii string at ptr\r
 \r
 //\r
 // convert number to ascii string at ptr\r


@@ -508,8 +502,7 @@ VOID
 UtoA10 (\r
   UINTN Number,\r
   UINT8 *BufferPtr\r
 UtoA10 (\r
   UINTN Number,\r
   UINT8 *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // convert ascii numeric string to UINTN\r
 \r
 //\r
 // convert ascii numeric string to UINTN\r


@@ -517,14 +510,12 @@ UtoA10 (
 UINTN\r
 AtoU (\r
   UINT8 *BufferPtr\r
 UINTN\r
 AtoU (\r
   UINT8 *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 UINT64\r
 AtoU64 (\r
   UINT8 *BufferPtr\r
 \r
 UINT64\r
 AtoU64 (\r
   UINT8 *BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // calculate the internet checksum (RFC 1071)\r
 \r
 //\r
 // calculate the internet checksum (RFC 1071)\r


@@ -534,8 +525,7 @@ UINT16
 IpChecksum (\r
   UINT16 *MessagePtr,\r
   UINTN  ByteLength\r
 IpChecksum (\r
   UINT16 *MessagePtr,\r
   UINTN  ByteLength\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // do checksum on non contiguous header and data\r
 \r
 //\r
 // do checksum on non contiguous header and data\r


@@ -546,8 +536,7 @@ IpChecksum2 (
   UINTN  HeaderLength,\r
   UINT16 *Message,\r
   UINTN  MessageLength\r
   UINTN  HeaderLength,\r
   UINT16 *Message,\r
   UINTN  MessageLength\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // update checksum when only a single word changes\r
 \r
 //\r
 // update checksum when only a single word changes\r


@@ -557,21 +546,18 @@ UpdateChecksum (
   UINT16 OldChecksum,\r
   UINT16 OldWord,\r
   UINT16 NewWord\r
   UINT16 OldChecksum,\r
   UINT16 OldWord,\r
   UINT16 NewWord\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 SeedRandom (\r
   IN PXE_BASECODE_DEVICE  *Private,\r
   IN UINT16               InitialSeed\r
 \r
 VOID\r
 SeedRandom (\r
   IN PXE_BASECODE_DEVICE  *Private,\r
   IN UINT16               InitialSeed\r

-  )\r
-;\r
+  );\r

 \r
 UINT16\r
 Random (\r
   IN PXE_BASECODE_DEVICE  *Private\r
 \r
 UINT16\r
 Random (\r
   IN PXE_BASECODE_DEVICE  *Private\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 SendPacket (\r
 \r
 EFI_STATUS\r
 SendPacket (\r


@@ -582,30 +568,26 @@ SendPacket (
   VOID                          *HardwareAddress,\r
   UINT16                        MediaProtocol,\r
   IN EFI_PXE_BASE_CODE_FUNCTION Function\r
   VOID                          *HardwareAddress,\r
   UINT16                        MediaProtocol,\r
   IN EFI_PXE_BASE_CODE_FUNCTION Function\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 HandleArpReceive (\r
   PXE_BASECODE_DEVICE *Private,\r
   ARP_PACKET          *ArpPacketPtr,\r
   VOID                *HeaderPtr\r
 \r
 VOID\r
 HandleArpReceive (\r
   PXE_BASECODE_DEVICE *Private,\r
   ARP_PACKET          *ArpPacketPtr,\r
   VOID                *HeaderPtr\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 HandleIgmp (\r
   PXE_BASECODE_DEVICE *Private,\r
   IGMPV2_MESSAGE      *IgmpMessageptr,\r
   UINTN               IgmpMessageLen\r
 \r
 VOID\r
 HandleIgmp (\r
   PXE_BASECODE_DEVICE *Private,\r
   IGMPV2_MESSAGE      *IgmpMessageptr,\r
   UINTN               IgmpMessageLen\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 IgmpCheckTimers (\r
   PXE_BASECODE_DEVICE *Private\r
 \r
 VOID\r
 IgmpCheckTimers (\r
   PXE_BASECODE_DEVICE *Private\r

-  )\r
-;  // poll when doing a receive\r
+  );  // poll when doing a receive\r

 // return hw add of IP and TRUE if available, otherwise FALSE\r
 //\r
 BOOLEAN\r
 // return hw add of IP and TRUE if available, otherwise FALSE\r
 //\r
 BOOLEAN\r


@@ -613,16 +595,14 @@ GetHwAddr (
   IN PXE_BASECODE_DEVICE  *Private,\r
   EFI_IP_ADDRESS          *ProtocolAddressPtr,\r
   EFI_MAC_ADDRESS         *HardwareAddressPtr\r
   IN PXE_BASECODE_DEVICE  *Private,\r
   EFI_IP_ADDRESS          *ProtocolAddressPtr,\r
   EFI_MAC_ADDRESS         *HardwareAddressPtr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 DoArp (\r
   IN PXE_BASECODE_DEVICE  *Private,\r
   IN EFI_IP_ADDRESS       *ProtocolAddressPtr,\r
   OUT EFI_MAC_ADDRESS     *HardwareAddressptr\r
 \r
 EFI_STATUS\r
 DoArp (\r
   IN PXE_BASECODE_DEVICE  *Private,\r
   IN EFI_IP_ADDRESS       *ProtocolAddressPtr,\r
   OUT EFI_MAC_ADDRESS     *HardwareAddressptr\r

-  )\r
-;\r
+  );\r

 \r
 BOOLEAN\r
 OnSameSubnet (\r
 \r
 BOOLEAN\r
 OnSameSubnet (\r


@@ -630,15 +610,13 @@ OnSameSubnet (
   EFI_IP_ADDRESS  *Ip1,\r
   EFI_IP_ADDRESS  *Ip2,\r
   EFI_IP_ADDRESS  *SubnetMask\r
   EFI_IP_ADDRESS  *Ip1,\r
   EFI_IP_ADDRESS  *Ip2,\r
   EFI_IP_ADDRESS  *SubnetMask\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 IpAddRouter (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *RouterIp\r
 \r
 VOID\r
 IpAddRouter (\r
   PXE_BASECODE_DEVICE *Private,\r
   EFI_IP_ADDRESS      *RouterIp\r

-  )\r
-;\r
+  );\r

 \r
 #define Ip4AddRouter(Private, Ipv4Ptr)  IpAddRouter (Private, (EFI_IP_ADDRESS *) Ipv4Ptr)\r
 \r
 \r
 #define Ip4AddRouter(Private, Ipv4Ptr)  IpAddRouter (Private, (EFI_IP_ADDRESS *) Ipv4Ptr)\r
 \r


@@ -656,8 +634,7 @@ Ipv4Xmt (
   VOID                        *Data,\r
   UINTN                       DataLen,\r
   EFI_PXE_BASE_CODE_FUNCTION  Function\r
   VOID                        *Data,\r
   UINTN                       DataLen,\r
   EFI_PXE_BASE_CODE_FUNCTION  Function\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // send ipv4 packet with ipv4 option\r
 \r
 //\r
 // send ipv4 packet with ipv4 option\r


@@ -673,8 +650,7 @@ Ipv4SendWOp (
   UINTN                       OptionLen,\r
   UINT32                      DestIp,\r
   EFI_PXE_BASE_CODE_FUNCTION  Function\r
   UINTN                       OptionLen,\r
   UINT32                      DestIp,\r
   EFI_PXE_BASE_CODE_FUNCTION  Function\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // send MsgLth message at MsgPtr - higher level protocol header already in xmtbuf, length HdrSize\r
 \r
 //\r
 // send MsgLth message at MsgPtr - higher level protocol header already in xmtbuf, length HdrSize\r


@@ -690,8 +666,7 @@ Ip4Send (
   IN UINTN                HeaderSize,   // protocol header byte length\r
   IN UINT8                *MsgPtr,      // pointer to data\r
   IN UINTN                MsgLength\r
   IN UINTN                HeaderSize,   // protocol header byte length\r
   IN UINT8                *MsgPtr,      // pointer to data\r
   IN UINTN                MsgLength\r

-  )\r
-;                                    // data byte length\r
+  );                                    // data byte length\r

 // receive up to MsgLth message into MsgPtr for protocol Prot\r
 // return message length, src/dest ips if select any, and pointer to protocol header\r
 //\r
 // receive up to MsgLth message into MsgPtr for protocol Prot\r
 // return message length, src/dest ips if select any, and pointer to protocol header\r
 //\r


@@ -707,15 +682,13 @@ IpReceive (
   UINT8                     *MsgPtr,    // pointer to data buffer\r
   UINTN                     *MsgLenPtr, // pointer to data buffer length/ O - returned data length\r
   IN EFI_EVENT              TimeoutEvent\r
   UINT8                     *MsgPtr,    // pointer to data buffer\r
   UINTN                     *MsgLenPtr, // pointer to data buffer length/ O - returned data length\r
   IN EFI_EVENT              TimeoutEvent\r

-  )\r
-;\r
+  );\r

 \r
 #if 0\r
 VOID\r
 WaitForTxComplete (\r
   IN PXE_BASECODE_DEVICE    *Private\r
 \r
 #if 0\r
 VOID\r
 WaitForTxComplete (\r
   IN PXE_BASECODE_DEVICE    *Private\r

-  )\r
-;\r
+  );\r

 #endif\r
 //\r
 // routine to cycle waiting for a receive or timeout\r
 #endif\r
 //\r
 // routine to cycle waiting for a receive or timeout\r


@@ -728,8 +701,7 @@ WaitForReceive (
   IN OUT UINTN                  *HeaderSizePtr,\r
   IN OUT UINTN                  *BufferSizePtr,\r
   IN OUT UINT16                 *ProtocolPtr\r
   IN OUT UINTN                  *HeaderSizePtr,\r
   IN OUT UINTN                  *BufferSizePtr,\r
   IN OUT UINT16                 *ProtocolPtr\r

-  )\r
-;\r
+  );\r

 \r
 #endif /* _IP_H_ */\r
 \r
 \r
 #endif /* _IP_H_ */\r
 \r

diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
index c923ccedbc3fb7b36056381d4c21f02990c6c76e..cefe52d08c68b898b2143abcc5321336f8ca2526 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h
@@ -120,8 +120,7 @@ PxeDhcp4Run (
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN OPTIONAL UINTN                  OpLen,\r
   IN OPTIONAL VOID                   *OpList\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN OPTIONAL UINTN                  OpLen,\r
   IN OPTIONAL VOID                   *OpList\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -129,8 +128,7 @@ EFIAPI
 PxeDhcp4Setup (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN EFI_PXE_DHCP4_DATA     *Data\r
 PxeDhcp4Setup (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN EFI_PXE_DHCP4_DATA     *Data\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -140,8 +138,7 @@ PxeDhcp4Init (
   IN UINTN                  seconds_timeout,\r
   OUT UINTN                 *offer_list_entries,\r
   OUT DHCP4_PACKET          **offer_list\r
   IN UINTN                  seconds_timeout,\r
   OUT UINTN                 *offer_list_entries,\r
   OUT DHCP4_PACKET          **offer_list\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -150,8 +147,7 @@ PxeDhcp4Select (
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN UINTN                  seconds_timeout,\r
   IN DHCP4_PACKET           *offer_list\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   IN UINTN                  seconds_timeout,\r
   IN DHCP4_PACKET           *offer_list\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -159,8 +155,7 @@ EFIAPI
 PxeDhcp4Renew (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   UINTN                     seconds_timeout\r
 PxeDhcp4Renew (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   UINTN                     seconds_timeout\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -168,16 +163,14 @@ EFIAPI
 PxeDhcp4Rebind (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   UINTN                     seconds_timeout\r
 PxeDhcp4Rebind (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This,\r
   UINTN                     seconds_timeout\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 PxeDhcp4Release (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This\r
 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 PxeDhcp4Release (\r
   IN EFI_PXE_DHCP4_PROTOCOL *This\r

-  )\r
-;\r
+  );\r

 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r


@@ -188,15 +181,13 @@ extern
 UINT16 \r
 htons (\r
   UINTN n\r
 UINT16 \r
 htons (\r
   UINTN n\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 UINT32 \r
 htonl (\r
   UINTN n\r
 \r
 extern\r
 UINT32 \r
 htonl (\r
   UINTN n\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -204,8 +195,7 @@ EFIAPI
 timeout_notify (\r
   IN EFI_EVENT Event,\r
   IN VOID      *Context\r
 timeout_notify (\r
   IN EFI_EVENT Event,\r
   IN VOID      *Context\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -213,8 +203,7 @@ EFIAPI
 periodic_notify (\r
   IN EFI_EVENT Event,\r
   IN VOID      *Context\r
 periodic_notify (\r
   IN EFI_EVENT Event,\r
   IN VOID      *Context\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -223,16 +212,14 @@ find_opt (
   IN UINT8        OpCode,\r
   IN UINTN        Skip,\r
   OUT DHCP4_OP    **OpPtr\r
   IN UINT8        OpCode,\r
   IN UINTN        Skip,\r
   OUT DHCP4_OP    **OpPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 add_opt (\r
   IN DHCP4_PACKET *Packet,\r
   IN DHCP4_OP     *OpPtr\r
 \r
 extern\r
 EFI_STATUS \r
 add_opt (\r
   IN DHCP4_PACKET *Packet,\r
   IN DHCP4_OP     *OpPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -240,30 +227,26 @@ start_udp (
   IN PXE_DHCP4_PRIVATE_DATA *Private,\r
   IN OPTIONAL EFI_IP_ADDRESS         *station_ip,\r
   IN OPTIONAL EFI_IP_ADDRESS         *subnet_mask\r
   IN PXE_DHCP4_PRIVATE_DATA *Private,\r
   IN OPTIONAL EFI_IP_ADDRESS         *station_ip,\r
   IN OPTIONAL EFI_IP_ADDRESS         *subnet_mask\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 stop_udp (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private\r
 \r
 extern\r
 VOID \r
 stop_udp (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 start_receive_events (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private,\r
   IN UINTN                  seconds_timeout\r
 \r
 extern\r
 EFI_STATUS \r
 start_receive_events (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private,\r
   IN UINTN                  seconds_timeout\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 stop_receive_events (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private\r
 \r
 extern\r
 VOID \r
 stop_receive_events (\r
   IN PXE_DHCP4_PRIVATE_DATA *Private\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -274,8 +257,7 @@ tx_udp (
   IN EFI_IP_ADDRESS         *src_ip,\r
   IN VOID                   *buffer,\r
   IN UINTN                  BufferSize\r
   IN EFI_IP_ADDRESS         *src_ip,\r
   IN VOID                   *buffer,\r
   IN UINTN                  BufferSize\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -286,8 +268,7 @@ rx_udp (
   IN OUT EFI_IP_ADDRESS     *dest_ip,\r
   IN OUT EFI_IP_ADDRESS     *src_ip,\r
   IN UINT16                 op_flags\r
   IN OUT EFI_IP_ADDRESS     *dest_ip,\r
   IN OUT EFI_IP_ADDRESS     *src_ip,\r
   IN UINT16                 op_flags\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -309,8 +290,7 @@ tx_rx_udp (
       IN UINTN rx_pkt_size\r
     ),\r
   IN UINTN seconds_timeout\r
       IN UINTN rx_pkt_size\r
     ),\r
   IN UINTN seconds_timeout\r

-  )\r
-;\r
+  );\r

 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
index b6e58c4d27bb59c4153607c24ad283bf51abc8b8..4532ab479628055a6e44579ff4dd62cfe2902b04 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
@@ -148,35 +148,30 @@ add_v2p (
   EFI_PCI_IO_PROTOCOL_OPERATION type,\r
   VOID                          *vaddr,\r
   UINTN                         bsize\r
   EFI_PCI_IO_PROTOCOL_OPERATION type,\r
   VOID                          *vaddr,\r
   UINTN                         bsize\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 find_v2p (\r
   struct s_v2p **v2p,\r
   VOID         *vaddr\r
 \r
 EFI_STATUS\r
 find_v2p (\r
   struct s_v2p **v2p,\r
   VOID         *vaddr\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 del_v2p (\r
   VOID *vaddr\r
 \r
 EFI_STATUS\r
 del_v2p (\r
   VOID *vaddr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 snp_undi32_callback_block_30 (\r
   IN UINT32 Enable\r
 \r
 extern\r
 VOID \r
 snp_undi32_callback_block_30 (\r
   IN UINT32 Enable\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 snp_undi32_callback_delay_30 (\r
   IN UINT64 MicroSeconds\r
 \r
 extern\r
 VOID \r
 snp_undi32_callback_delay_30 (\r
   IN UINT64 MicroSeconds\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -185,32 +180,28 @@ snp_undi32_callback_memio_30 (
   IN UINT8      NumBytes,\r
   IN UINT64     MemOrPortAddress,\r
   IN OUT UINT64 BufferPtr\r
   IN UINT8      NumBytes,\r
   IN UINT64     MemOrPortAddress,\r
   IN OUT UINT64 BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 snp_undi32_callback_v2p_30 (\r
   IN UINT64     CpuAddr,\r
   IN OUT UINT64 DeviceAddrPtr\r
 \r
 extern\r
 VOID \r
 snp_undi32_callback_v2p_30 (\r
   IN UINT64     CpuAddr,\r
   IN OUT UINT64 DeviceAddrPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 snp_undi32_callback_block (\r
   IN UINT64 UniqueId,\r
   IN UINT32 Enable\r
 \r
 extern\r
 VOID \r
 snp_undi32_callback_block (\r
   IN UINT64 UniqueId,\r
   IN UINT32 Enable\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 snp_undi32_callback_delay (\r
   IN UINT64 UniqueId,\r
   IN UINT64 MicroSeconds\r
 \r
 extern\r
 VOID \r
 snp_undi32_callback_delay (\r
   IN UINT64 UniqueId,\r
   IN UINT64 MicroSeconds\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -220,8 +211,7 @@ snp_undi32_callback_memio (
   IN UINT8      NumBytes,\r
   IN UINT64     MemOrPortAddr,\r
   IN OUT UINT64 BufferPtr\r
   IN UINT8      NumBytes,\r
   IN UINT64     MemOrPortAddr,\r
   IN OUT UINT64 BufferPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -231,8 +221,7 @@ snp_undi32_callback_map (
   IN UINT32     NumBytes,\r
   IN UINT32     Direction,\r
   IN OUT UINT64 DeviceAddrPtr\r
   IN UINT32     NumBytes,\r
   IN UINT32     Direction,\r
   IN OUT UINT64 DeviceAddrPtr\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -242,8 +231,7 @@ snp_undi32_callback_unmap (
   IN UINT32             NumBytes,\r
   IN UINT32             Direction,\r
   IN UINT64 DeviceAddr  // not a pointer to device address\r
   IN UINT32             NumBytes,\r
   IN UINT32             Direction,\r
   IN UINT64 DeviceAddr  // not a pointer to device address\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 VOID \r
 \r
 extern\r
 VOID \r


@@ -253,24 +241,21 @@ snp_undi32_callback_sync (
   IN UINT32             NumBytes,\r
   IN UINT32             Direction,\r
   IN UINT64 DeviceAddr  // not a pointer to device address\r
   IN UINT32             NumBytes,\r
   IN UINT32             Direction,\r
   IN UINT64 DeviceAddr  // not a pointer to device address\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_start (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r
 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_start (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_stop (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r
 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_stop (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -279,8 +264,7 @@ snp_undi32_initialize (
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this,\r
   IN UINTN                       extra_rx_buffer_size OPTIONAL,\r
   IN UINTN                       extra_tx_buffer_size OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this,\r
   IN UINTN                       extra_rx_buffer_size OPTIONAL,\r
   IN UINTN                       extra_tx_buffer_size OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -288,16 +272,14 @@ EFIAPI
 snp_undi32_reset (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *this,\r
   IN BOOLEAN                      ExtendedVerification\r
 snp_undi32_reset (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *this,\r
   IN BOOLEAN                      ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_shutdown (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r
 \r
 extern\r
 EFI_STATUS \r
 EFIAPI\r
 snp_undi32_shutdown (\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL *this\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -309,8 +291,7 @@ snp_undi32_receive_filters (
   IN BOOLEAN                     reset_mcast_filter,\r
   IN UINTN                       mcast_filter_count OPTIONAL,\r
   IN EFI_MAC_ADDRESS             * mcast_filter OPTIONAL\r
   IN BOOLEAN                     reset_mcast_filter,\r
   IN UINTN                       mcast_filter_count OPTIONAL,\r
   IN EFI_MAC_ADDRESS             * mcast_filter OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -319,8 +300,7 @@ snp_undi32_station_address (
   IN EFI_SIMPLE_NETWORK_PROTOCOL * this,\r
   IN BOOLEAN                     reset,\r
   IN EFI_MAC_ADDRESS             *new OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL * this,\r
   IN BOOLEAN                     reset,\r
   IN EFI_MAC_ADDRESS             *new OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -330,8 +310,7 @@ snp_undi32_statistics (
   IN BOOLEAN                      reset,\r
   IN OUT UINTN                    *statistics_size OPTIONAL,\r
   IN OUT EFI_NETWORK_STATISTICS   * statistics_table OPTIONAL\r
   IN BOOLEAN                      reset,\r
   IN OUT UINTN                    *statistics_size OPTIONAL,\r
   IN OUT EFI_NETWORK_STATISTICS   * statistics_table OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -341,8 +320,7 @@ snp_undi32_mcast_ip_to_mac (
   IN BOOLEAN                     IPv6,\r
   IN EFI_IP_ADDRESS              *IP,\r
   OUT EFI_MAC_ADDRESS            *MAC\r
   IN BOOLEAN                     IPv6,\r
   IN EFI_IP_ADDRESS              *IP,\r
   OUT EFI_MAC_ADDRESS            *MAC\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -353,8 +331,7 @@ snp_undi32_nvdata (
   IN UINTN                       offset,\r
   IN UINTN                       buffer_size,\r
   IN OUT VOID                    *buffer\r
   IN UINTN                       offset,\r
   IN UINTN                       buffer_size,\r
   IN OUT VOID                    *buffer\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -363,8 +340,7 @@ snp_undi32_get_status (
   IN EFI_SIMPLE_NETWORK_PROTOCOL * this,\r
   OUT UINT32                     *interrupt_status OPTIONAL,\r
   OUT VOID                       **tx_buffer OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL * this,\r
   OUT UINT32                     *interrupt_status OPTIONAL,\r
   OUT VOID                       **tx_buffer OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -377,8 +353,7 @@ snp_undi32_transmit (
   IN EFI_MAC_ADDRESS             * src_addr OPTIONAL,\r
   IN EFI_MAC_ADDRESS             * dest_addr OPTIONAL,\r
   IN UINT16                      *protocol OPTIONAL\r
   IN EFI_MAC_ADDRESS             * src_addr OPTIONAL,\r
   IN EFI_MAC_ADDRESS             * dest_addr OPTIONAL,\r
   IN UINT16                      *protocol OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 extern\r
 EFI_STATUS \r
 \r
 extern\r
 EFI_STATUS \r


@@ -391,8 +366,7 @@ snp_undi32_receive (
   OUT EFI_MAC_ADDRESS            * src_addr OPTIONAL,\r
   OUT EFI_MAC_ADDRESS            * dest_addr OPTIONAL,\r
   OUT UINT16                     *protocol OPTIONAL\r
   OUT EFI_MAC_ADDRESS            * src_addr OPTIONAL,\r
   OUT EFI_MAC_ADDRESS            * dest_addr OPTIONAL,\r
   OUT UINT16                     *protocol OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 typedef\r
 EFI_STATUS\r
 \r
 typedef\r
 EFI_STATUS\r


@@ -424,8 +398,7 @@ EFIAPI
 InitializeSnpNiiDriver (\r
   IN EFI_HANDLE       ImageHandle,\r
   IN EFI_SYSTEM_TABLE *SystemTable\r
 InitializeSnpNiiDriver (\r
   IN EFI_HANDLE       ImageHandle,\r
   IN EFI_SYSTEM_TABLE *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #define SNP_MEM_PAGES(x)  (((x) - 1) / 4096 + 1)\r
 \r
 \r
 #define SNP_MEM_PAGES(x)  (((x) - 1) / 4096 + 1)\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index c6108e25149bf6a1223bfe7d5d407ff545f0d264..d63c294945bacbe34d06696b19c2d315504abb42 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -141,8 +141,7 @@ Tcp4GetMode (
 \r
       Option->EnableNagle         = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
       Option->EnableTimeStamp     = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r
 \r
       Option->EnableNagle         = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_NAGLE));\r
       Option->EnableTimeStamp     = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS));\r

-      Option->EnableWindowScaling = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS))\r
-;\r
+      Option->EnableWindowScaling = (BOOLEAN) (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS));\r

 \r
       Option->EnableSelectiveAck      = FALSE;\r
       Option->EnablePathMtuDiscovery  = FALSE;\r
 \r
       Option->EnableSelectiveAck      = FALSE;\r
       Option->EnablePathMtuDiscovery  = FALSE;\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 4b56e4307168852c7c26ad88f39b0bc46f962db2..cb5dd6cf09751f4db2143a4f158313406c2c1751 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -75,8 +75,7 @@ VOID
 EFIAPI\r
 DxePcdSetSku (\r
   IN  UINTN                  SkuId\r
 EFIAPI\r
 DxePcdSetSku (\r
   IN  UINTN                  SkuId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r


@@ -93,8 +92,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGet8 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r


@@ -111,8 +109,7 @@ UINT16
 EFIAPI\r
 DxePcdGet16 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGet16 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r


@@ -129,8 +126,7 @@ UINT32
 EFIAPI\r
 DxePcdGet32 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGet32 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r


@@ -147,8 +143,7 @@ UINT64
 EFIAPI\r
 DxePcdGet64 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGet64 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r


@@ -167,8 +162,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtr (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGetPtr (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r


@@ -187,8 +181,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGetBool (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r


@@ -205,8 +198,7 @@ UINTN
 EFIAPI\r
 DxePcdGetSize (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 DxePcdGetSize (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r


@@ -227,8 +219,7 @@ EFIAPI
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r


@@ -249,8 +240,7 @@ EFIAPI
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r


@@ -271,8 +261,7 @@ EFIAPI
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r


@@ -293,8 +282,7 @@ EFIAPI
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r


@@ -315,8 +303,7 @@ EFIAPI
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r


@@ -337,8 +324,7 @@ EFIAPI
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r


@@ -357,8 +343,7 @@ EFIAPI
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r


@@ -382,8 +367,7 @@ EFIAPI
 DxePcdSet8 (\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
 DxePcdSet8 (\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r


@@ -407,8 +391,7 @@ EFIAPI
 DxePcdSet16 (\r
   IN UINTN             TokenNumber,\r
   IN UINT16             Value\r
 DxePcdSet16 (\r
   IN UINTN             TokenNumber,\r
   IN UINT16             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r


@@ -432,8 +415,7 @@ EFIAPI
 DxePcdSet32 (\r
   IN UINTN             TokenNumber,\r
   IN UINT32             Value\r
 DxePcdSet32 (\r
   IN UINTN             TokenNumber,\r
   IN UINT32             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r


@@ -457,8 +439,7 @@ EFIAPI
 DxePcdSet64 (\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r
 DxePcdSet64 (\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -488,8 +469,7 @@ DxePcdSetPtr (
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r


@@ -513,8 +493,7 @@ EFIAPI
 DxePcdSetBool (\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
 DxePcdSetBool (\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -541,8 +520,7 @@ DxePcdSet8Ex (
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r


@@ -568,8 +546,7 @@ DxePcdSet16Ex (
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r


@@ -595,8 +572,7 @@ DxePcdSet32Ex (
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT32             Value\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT32             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r


@@ -622,8 +598,7 @@ DxePcdSet64Ex (
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r
   IN CONST EFI_GUID        *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r


@@ -654,8 +629,7 @@ DxePcdSetPtrEx (
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r


@@ -681,8 +655,7 @@ DxePcdSetBoolEx (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r


@@ -702,8 +675,7 @@ DxeRegisterCallBackOnSet (
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r


@@ -723,8 +695,7 @@ DxeUnRegisterCallBackOnSet (
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the next valid PCD token for a given namespace.\r
 \r
 /**\r
   Retrieves the next valid PCD token for a given namespace.\r


@@ -749,8 +720,7 @@ EFIAPI
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r
   IN OUT   UINTN                  *TokenNumber\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r
   IN OUT   UINTN                  *TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get next token space in PCD database according to given token space guid.\r
 \r
 /**\r
   Get next token space in PCD database according to given token space guid.\r


@@ -771,8 +741,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdGetNextTokenSpace (\r
   IN OUT CONST EFI_GUID               **Guid\r
 EFIAPI\r
 DxePcdGetNextTokenSpace (\r
   IN OUT CONST EFI_GUID               **Guid\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   LIST_ENTRY              Node;\r
 \r
 typedef struct {\r
   LIST_ENTRY              Node;\r


@@ -800,8 +769,7 @@ SetValueWorker (
   IN UINTN                   TokenNumber,\r
   IN VOID                    *Data,\r
   IN UINTN                   Size\r
   IN UINTN                   TokenNumber,\r
   IN VOID                    *Data,\r
   IN UINTN                   Size\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set value for an PCD entry\r
 \r
 /**\r
   Set value for an PCD entry\r


@@ -824,8 +792,7 @@ SetWorker (
   IN          VOID                      *Data,\r
   IN OUT      UINTN                     *Size,\r
   IN          BOOLEAN                   PtrType\r
   IN          VOID                      *Data,\r
   IN OUT      UINTN                     *Size,\r
   IN          BOOLEAN                   PtrType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for set PCD value for non-Pointer type dynamic-ex PCD.\r
 \r
 /**\r
   Wrapper function for set PCD value for non-Pointer type dynamic-ex PCD.\r


@@ -844,8 +811,7 @@ ExSetValueWorker (
   IN          CONST EFI_GUID       *Guid,\r
   IN          VOID                 *Data,\r
   IN          UINTN                SetSize\r
   IN          CONST EFI_GUID       *Guid,\r
   IN          VOID                 *Data,\r
   IN          UINTN                SetSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set value for a dynamic PCD entry.\r
 \r
 /**\r
   Set value for a dynamic PCD entry.\r


@@ -872,8 +838,7 @@ ExSetWorker (
   IN      VOID                 *Data,\r
   IN OUT  UINTN                *Size,\r
   IN      BOOLEAN              PtrType\r
   IN      VOID                 *Data,\r
   IN OUT  UINTN                *Size,\r
   IN      BOOLEAN              PtrType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r


@@ -893,8 +858,7 @@ VOID *
 GetWorker (\r
   IN UINTN             TokenNumber,\r
   IN UINTN             GetSize\r
 GetWorker (\r
   IN UINTN             TokenNumber,\r
   IN UINTN             GetSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for get PCD value for dynamic-ex PCD.\r
 \r
 /**\r
   Wrapper function for get PCD value for dynamic-ex PCD.\r


@@ -911,8 +875,7 @@ ExGetWorker (
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Find the local token number according to system SKU ID.\r
 \r
 /**\r
   Find the local token number according to system SKU ID.\r


@@ -930,8 +893,7 @@ GetSkuEnabledTokenNumber (
   UINT32 LocalTokenNumber,\r
   UINTN  Size,\r
   BOOLEAN IsPeiDb\r
   UINT32 LocalTokenNumber,\r
   UINTN  Size,\r
   BOOLEAN IsPeiDb\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Variable which contains HII type PCD entry.\r
 \r
 /**\r
   Get Variable which contains HII type PCD entry.\r


@@ -949,8 +911,7 @@ GetHiiVariable (
   IN  UINT16        *VariableName,\r
   OUT UINT8          **VariableData,\r
   OUT UINTN         *VariableSize\r
   IN  UINT16        *VariableName,\r
   OUT UINT8          **VariableData,\r
   OUT UINTN         *VariableSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set value for HII-type PCD.\r
 \r
 /**\r
   Set value for HII-type PCD.\r


@@ -974,8 +935,7 @@ SetHiiVariable (
   IN  CONST VOID   *Data,\r
   IN  UINTN        DataSize,\r
   IN  UINTN        Offset\r
   IN  CONST VOID   *Data,\r
   IN  UINTN        DataSize,\r
   IN  UINTN        Offset\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Register the callback function for a PCD entry.\r
 \r
 /**\r
   Register the callback function for a PCD entry.\r


@@ -996,8 +956,7 @@ DxeRegisterCallBackWorker (
   IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   UnRegister the callback function for a PCD entry.\r
 \r
 /**\r
   UnRegister the callback function for a PCD entry.\r


@@ -1018,8 +977,7 @@ DxeUnRegisterCallBackWorker (
   IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the PCD database in DXE phase.\r
 \r
 /**\r
   Initialize the PCD database in DXE phase.\r


@@ -1031,8 +989,7 @@ DxeUnRegisterCallBackWorker (
 VOID\r
 BuildPcdDxeDataBase (\r
   VOID\r
 VOID\r
 BuildPcdDxeDataBase (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get local token number according to dynamic-ex PCD's {token space guid:token number}\r
 \r
 /**\r
   Get local token number according to dynamic-ex PCD's {token space guid:token number}\r


@@ -1051,8 +1008,7 @@ UINTN
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get next token number in given token space.\r
 \r
 /**\r
   Get next token number in given token space.\r


@@ -1087,8 +1043,7 @@ ExGetNextTokeNumber (
   IN      UINTN             SizeOfGuidTable,\r
   IN      DYNAMICEX_MAPPING *ExMapTable,\r
   IN      UINTN             SizeOfExMapTable\r
   IN      UINTN             SizeOfGuidTable,\r
   IN      DYNAMICEX_MAPPING *ExMapTable,\r
   IN      UINTN             SizeOfExMapTable\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get size of POINTER type PCD value.\r
 \r
 /**\r
   Get size of POINTER type PCD value.\r


@@ -1103,8 +1058,7 @@ UINTN
 GetPtrTypeSize (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   OUT   UINTN             *MaxSize\r
 GetPtrTypeSize (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   OUT   UINTN             *MaxSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set size of POINTER type PCD value. The size should not exceed the maxmium size\r
 \r
 /**\r
   Set size of POINTER type PCD value. The size should not exceed the maxmium size\r


@@ -1120,8 +1074,7 @@ BOOLEAN
 SetPtrTypeSize (\r
   IN          UINTN             LocalTokenNumberTableIdx,\r
   IN    OUT   UINTN             *CurrentSize\r
 SetPtrTypeSize (\r
   IN          UINTN             LocalTokenNumberTableIdx,\r
   IN    OUT   UINTN             *CurrentSize\r

-  )\r
-;\r
+  );\r

 \r
 extern EFI_GUID gPcdDataBaseHobGuid;\r
 \r
 \r
 extern EFI_GUID gPcdDataBaseHobGuid;\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 006681c49407e91fff4a7130241b616416c3d757..438b70bbce7203e6fbaa705608b122eb34600426 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -76,8 +76,7 @@ VOID
 EFIAPI\r
 PeiPcdSetSku (\r
   IN  UINTN                  SkuId\r
 EFIAPI\r
 PeiPcdSetSku (\r
   IN  UINTN                  SkuId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r


@@ -94,8 +93,7 @@ UINT8
 EFIAPI\r
 PeiPcdGet8 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGet8 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r


@@ -112,8 +110,7 @@ UINT16
 EFIAPI\r
 PeiPcdGet16 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGet16 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r


@@ -130,8 +127,7 @@ UINT32
 EFIAPI\r
 PeiPcdGet32 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGet32 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r


@@ -148,8 +144,7 @@ UINT64
 EFIAPI\r
 PeiPcdGet64 (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGet64 (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r


@@ -168,8 +163,7 @@ VOID *
 EFIAPI\r
 PeiPcdGetPtr (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGetPtr (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves a Boolean value for a given PCD token.\r


@@ -188,8 +182,7 @@ BOOLEAN
 EFIAPI\r
 PeiPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGetBool (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r


@@ -206,8 +199,7 @@ UINTN
 EFIAPI\r
 PeiPcdGetSize (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 PeiPcdGetSize (\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 8-bit value for a given PCD token.\r


@@ -228,8 +220,7 @@ EFIAPI
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 16-bit value for a given PCD token.\r


@@ -250,8 +241,7 @@ EFIAPI
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 32-bit value for a given PCD token.\r


@@ -272,8 +262,7 @@ EFIAPI
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Retrieves an 64-bit value for a given PCD token.\r


@@ -294,8 +283,7 @@ EFIAPI
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r
 \r
 /**\r
   Retrieves a pointer to a value for a given PCD token.\r


@@ -316,8 +304,7 @@ EFIAPI
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r
 \r
 /**\r
   Retrieves an Boolean value for a given PCD token.\r


@@ -338,8 +325,7 @@ EFIAPI
 PeiPcdGetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r
 \r
 /**\r
   Retrieves the size of the value for a given PCD token.\r


@@ -358,8 +344,7 @@ EFIAPI
 PeiPcdGetSizeEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r
 PeiPcdGetSizeEx (\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r


@@ -383,8 +368,7 @@ EFIAPI
 PeiPcdSet8 (\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
 PeiPcdSet8 (\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r


@@ -408,8 +392,7 @@ EFIAPI
 PeiPcdSet16 (\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r
 PeiPcdSet16 (\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r


@@ -433,8 +416,7 @@ EFIAPI
 PeiPcdSet32 (\r
   IN UINTN             TokenNumber,\r
   IN UINT32            Value\r
 PeiPcdSet32 (\r
   IN UINTN             TokenNumber,\r
   IN UINT32            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r


@@ -458,8 +440,7 @@ EFIAPI
 PeiPcdSet64 (\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r
 PeiPcdSet64 (\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r


@@ -488,8 +469,7 @@ PeiPcdSetPtr (
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r


@@ -513,8 +493,7 @@ EFIAPI
 PeiPcdSetBool (\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
 PeiPcdSetBool (\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 8-bit value for a given PCD token.\r


@@ -540,8 +519,7 @@ PeiPcdSet8Ex (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT8             Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 16-bit value for a given PCD token.\r


@@ -567,8 +545,7 @@ PeiPcdSet16Ex (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT16            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 32-bit value for a given PCD token.\r


@@ -594,8 +571,7 @@ PeiPcdSet32Ex (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT32            Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT32            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r
 \r
 /**\r
   Sets an 64-bit value for a given PCD token.\r


@@ -621,8 +597,7 @@ PeiPcdSet64Ex (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN UINT64            Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r
 \r
 /**\r
   Sets a value of a specified size for a given PCD token.\r


@@ -653,8 +628,7 @@ PeiPcdSetPtrEx (
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r
   IN        UINTN             TokenNumber,\r
   IN OUT    UINTN             *SizeOfBuffer,\r
   IN        VOID              *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r
 \r
 /**\r
   Sets an Boolean value for a given PCD token.\r


@@ -680,8 +654,7 @@ PeiPcdSetBoolEx (
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   IN CONST EFI_GUID    *Guid,\r
   IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r
 \r
 /**\r
   Specifies a function to be called anytime the value of a designated token is changed.\r


@@ -701,8 +674,7 @@ PeiRegisterCallBackOnSet (
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r
 \r
 /**\r
   Cancels a previously set callback function for a particular PCD token number.\r


@@ -722,8 +694,7 @@ PcdUnRegisterCallBackOnSet (
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  UINTN                   TokenNumber,\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the next valid PCD token for a given namespace.\r
 \r
 /**\r
   Retrieves the next valid PCD token for a given namespace.\r


@@ -748,8 +719,7 @@ EFIAPI
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
   IN OUT  UINTN               *TokenNumber\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
   IN OUT  UINTN               *TokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r
 \r
 /**\r
   Retrieves the next valid PCD token namespace for a given namespace.\r


@@ -776,8 +746,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdGetNextTokenSpace (\r
   IN OUT CONST EFI_GUID           **Guid\r
 EFIAPI\r
 PeiPcdGetNextTokenSpace (\r
   IN OUT CONST EFI_GUID           **Guid\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /* Internal Function definitions */\r
 \r
 \r
 /* Internal Function definitions */\r


@@ -790,8 +759,7 @@ PeiPcdGetNextTokenSpace (
 PEI_PCD_DATABASE *\r
 GetPcdDatabase (\r
   VOID\r
 PEI_PCD_DATABASE *\r
 GetPcdDatabase (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for setting non-pointer type value for a PCD entry.\r
 \r
 /**\r
   Wrapper function for setting non-pointer type value for a PCD entry.\r


@@ -808,8 +776,7 @@ SetValueWorker (
   IN          UINTN              TokenNumber,\r
   IN          VOID               *Data,\r
   IN          UINTN              Size\r
   IN          UINTN              TokenNumber,\r
   IN          VOID               *Data,\r
   IN          UINTN              Size\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set value for an PCD entry\r
 \r
 /**\r
   Set value for an PCD entry\r


@@ -832,8 +799,7 @@ SetWorker (
   IN          VOID               *Data,\r
   IN OUT      UINTN              *Size,\r
   IN          BOOLEAN            PtrType\r
   IN          VOID               *Data,\r
   IN OUT      UINTN              *Size,\r
   IN          BOOLEAN            PtrType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for set PCD value for non-Pointer type dynamic-ex PCD.\r
 \r
 /**\r
   Wrapper function for set PCD value for non-Pointer type dynamic-ex PCD.\r


@@ -852,8 +818,7 @@ ExSetValueWorker (
   IN          CONST EFI_GUID       *Guid,\r
   IN          VOID                 *Data,\r
   IN          UINTN                Size\r
   IN          CONST EFI_GUID       *Guid,\r
   IN          VOID                 *Data,\r
   IN          UINTN                Size\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set value for a dynamic PCD entry.\r
 \r
 /**\r
   Set value for a dynamic PCD entry.\r


@@ -880,8 +845,7 @@ ExSetWorker (
   IN      VOID                 *Data,\r
   IN OUT  UINTN                *Size,\r
   IN      BOOLEAN              PtrType\r
   IN      VOID                 *Data,\r
   IN OUT  UINTN                *Size,\r
   IN      BOOLEAN              PtrType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r
 \r
 /**\r
   Get the PCD entry pointer in PCD database.\r


@@ -901,8 +865,7 @@ VOID *
 GetWorker (\r
   IN UINTN                TokenNumber,\r
   IN UINTN                GetSize\r
 GetWorker (\r
   IN UINTN                TokenNumber,\r
   IN UINTN                GetSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wrapper function for get PCD value for dynamic-ex PCD.\r
 \r
 /**\r
   Wrapper function for get PCD value for dynamic-ex PCD.\r


@@ -919,8 +882,7 @@ ExGetWorker (
   IN CONST EFI_GUID   *Guid,\r
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   IN CONST EFI_GUID   *Guid,\r
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   UINTN   TokenNumber;\r
 \r
 typedef struct {\r
   UINTN   TokenNumber;\r


@@ -945,8 +907,7 @@ UINTN
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINTN                      ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINTN                      ExTokenNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The function registers the CallBackOnSet fucntion\r
 \r
 /**\r
   The function registers the CallBackOnSet fucntion\r


@@ -976,8 +937,7 @@ PeiRegisterCallBackWorker (
 VOID\r
 BuildPcdDatabase (\r
   VOID\r
 VOID\r
 BuildPcdDatabase (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get SKU ID tabble from PCD database.\r
 \r
 /**\r
   Get SKU ID tabble from PCD database.\r


@@ -992,8 +952,7 @@ SKU_ID *
 GetSkuIdArray (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   IN    PEI_PCD_DATABASE  *Database\r
 GetSkuIdArray (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   IN    PEI_PCD_DATABASE  *Database\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get index of PCD entry in size table.\r
 \r
 /**\r
   Get index of PCD entry in size table.\r


@@ -1008,8 +967,7 @@ UINTN
 GetSizeTableIndex (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   IN    PEI_PCD_DATABASE  *Database\r
 GetSizeTableIndex (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   IN    PEI_PCD_DATABASE  *Database\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Get PCD value's size for POINTER type PCD.\r


@@ -1029,8 +987,7 @@ GetPtrTypeSize (
   IN    UINTN             LocalTokenNumberTableIdx,\r
   OUT   UINTN             *MaxSize,\r
   IN    PEI_PCD_DATABASE  *Database\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
   OUT   UINTN             *MaxSize,\r
   IN    PEI_PCD_DATABASE  *Database\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r
 \r
 /**\r
   Set PCD value's size for POINTER type PCD.\r


@@ -1051,8 +1008,7 @@ SetPtrTypeSize (
   IN          UINTN             LocalTokenNumberTableIdx,\r
   IN    OUT   UINTN             *CurrentSize,\r
   IN          PEI_PCD_DATABASE  *Database\r
   IN          UINTN             LocalTokenNumberTableIdx,\r
   IN    OUT   UINTN             *CurrentSize,\r
   IN          PEI_PCD_DATABASE  *Database\r

-  )\r
-;\r
+  );\r

 \r
 \r
 extern EFI_GUID gPcdDataBaseHobGuid;\r
 \r
 \r
 extern EFI_GUID gPcdDataBaseHobGuid;\r

diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
index 8d1dbe19d3df8b7e3d0939662165c1af1884f454..cebcd23add0017856c332371de8a55dd84ee763c 100644 (file)
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
@@ -419,8 +419,7 @@ ConvertRtcTimeToEfiTime (
   IN OUT EFI_TIME        *Time,\r
   IN     UINT8           Century,\r
   IN     RTC_REGISTER_B  RegisterB\r
   IN OUT EFI_TIME        *Time,\r
   IN     UINT8           Century,\r
   IN     RTC_REGISTER_B  RegisterB\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 RtcWaitToUpdate (\r
 \r
 EFI_STATUS\r
 RtcWaitToUpdate (\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index e41f953ac9c1d0af3f4583b1936e0b0a46355fe0..9dcfdb6ee5855bf49ff22df0707939bfce6edcf8 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -511,8 +511,7 @@ extern EFI_GUID          gTianoHiiIfrGuid;
 VOID\r
 InitializeBrowserStrings (\r
   VOID\r
 VOID\r
 InitializeBrowserStrings (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Prints a unicode string to the default console,\r
 \r
 /**\r
   Prints a unicode string to the default console,\r


@@ -526,8 +525,7 @@ InitializeBrowserStrings (
 UINTN\r
 PrintString (\r
   IN CHAR16       *String\r
 UINTN\r
 PrintString (\r
   IN CHAR16       *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Prints a chracter to the default console,\r
 \r
 /**\r
   Prints a chracter to the default console,\r


@@ -541,8 +539,7 @@ PrintString (
 UINTN\r
 PrintChar (\r
   CHAR16       Character\r
 UINTN\r
 PrintChar (\r
   CHAR16       Character\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Prints a formatted unicode string to the default console, at\r
 \r
 /**\r
   Prints a formatted unicode string to the default console, at\r


@@ -562,8 +559,7 @@ PrintAt (
   IN UINTN     Row,\r
   IN CHAR16    *Fmt,\r
   ...\r
   IN UINTN     Row,\r
   IN CHAR16    *Fmt,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Prints a unicode string to the default console, at\r
 \r
 /**\r
   Prints a unicode string to the default console, at\r


@@ -581,8 +577,7 @@ PrintStringAt (
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   IN CHAR16    *String\r
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   IN CHAR16    *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Prints a chracter to the default console, at\r
 \r
 /**\r
   Prints a chracter to the default console, at\r


@@ -600,8 +595,7 @@ PrintCharAt (
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   CHAR16       Character\r
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   CHAR16       Character\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Parse opcodes in the formset IFR binary.\r
 \r
 /**\r
   Parse opcodes in the formset IFR binary.\r


@@ -615,8 +609,7 @@ PrintCharAt (
 EFI_STATUS\r
 ParseOpCodes (\r
   IN FORM_BROWSER_FORMSET              *FormSet\r
 EFI_STATUS\r
 ParseOpCodes (\r
   IN FORM_BROWSER_FORMSET              *FormSet\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Free resources allocated for a FormSet.\r
 \r
 /**\r
   Free resources allocated for a FormSet.\r


@@ -627,8 +620,7 @@ ParseOpCodes (
 VOID\r
 DestroyFormSet (\r
   IN OUT FORM_BROWSER_FORMSET  *FormSet\r
 VOID\r
 DestroyFormSet (\r
   IN OUT FORM_BROWSER_FORMSET  *FormSet\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function displays the page frame.\r
 \r
 /**\r
   This function displays the page frame.\r


@@ -637,8 +629,7 @@ DestroyFormSet (
 VOID\r
 DisplayPageFrame (\r
   VOID\r
 VOID\r
 DisplayPageFrame (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Create a new string in HII Package List.\r
 \r
 /**\r
   Create a new string in HII Package List.\r


@@ -654,8 +645,7 @@ EFI_STRING_ID
 NewString (\r
   IN  CHAR16                   *String,\r
   IN  EFI_HII_HANDLE           HiiHandle\r
 NewString (\r
   IN  CHAR16                   *String,\r
   IN  EFI_HII_HANDLE           HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Delete a string from HII Package List.\r
 \r
 /**\r
   Delete a string from HII Package List.\r


@@ -670,8 +660,7 @@ EFI_STATUS
 DeleteString (\r
   IN  EFI_STRING_ID            StringId,\r
   IN  EFI_HII_HANDLE           HiiHandle\r
 DeleteString (\r
   IN  EFI_STRING_ID            StringId,\r
   IN  EFI_HII_HANDLE           HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the string based on the StringId and HII Package List Handle.\r
 \r
 /**\r
   Get the string based on the StringId and HII Package List Handle.\r


@@ -687,8 +676,7 @@ CHAR16 *
 GetToken (\r
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r
 GetToken (\r
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Draw a pop up windows based on the dimension, number of lines and\r
 \r
 /**\r
   Draw a pop up windows based on the dimension, number of lines and\r


@@ -704,8 +692,7 @@ CreateSharedPopUp (
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r
   IN  VA_LIST                     Marker\r
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r
   IN  VA_LIST                     Marker\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Routine used to abstract a generic dialog interface and return the selected key or string\r
 \r
 /**\r
   Routine used to abstract a generic dialog interface and return the selected key or string\r


@@ -742,8 +729,7 @@ CreateDialog (
   OUT CHAR16                      *StringBuffer,\r
   OUT EFI_INPUT_KEY               *KeyValue,\r
   ...\r
   OUT CHAR16                      *StringBuffer,\r
   OUT EFI_INPUT_KEY               *KeyValue,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Question's current Value.\r
 \r
 /**\r
   Get Question's current Value.\r


@@ -763,8 +749,7 @@ GetQuestionValue (
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Save Question Value to edit copy(cached) or Storage(uncached).\r
 \r
 /**\r
   Save Question Value to edit copy(cached) or Storage(uncached).\r


@@ -784,8 +769,7 @@ SetQuestionValue (
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Perform inconsistent check for a Form.\r
 \r
 /**\r
   Perform inconsistent check for a Form.\r


@@ -805,8 +789,7 @@ ValidateQuestion (
   IN  FORM_BROWSER_FORM               *Form,\r
   IN  FORM_BROWSER_STATEMENT          *Question,\r
   IN  UINTN                           Type\r
   IN  FORM_BROWSER_FORM               *Form,\r
   IN  FORM_BROWSER_STATEMENT          *Question,\r
   IN  UINTN                           Type\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Submit a Form.\r
 \r
 /**\r
   Submit a Form.\r


@@ -821,8 +804,7 @@ EFI_STATUS
 SubmitForm (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r
 SubmitForm (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reset Question to its default value.\r
 \r
 /**\r
   Reset Question to its default value.\r


@@ -841,8 +823,7 @@ GetQuestionDefault (
   IN FORM_BROWSER_FORM                *Form,\r
   IN FORM_BROWSER_STATEMENT           *Question,\r
   IN UINT16                           DefaultId\r
   IN FORM_BROWSER_FORM                *Form,\r
   IN FORM_BROWSER_STATEMENT           *Question,\r
   IN UINT16                           DefaultId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get current setting of Questions.\r
 \r
 /**\r
   Get current setting of Questions.\r


@@ -855,8 +836,7 @@ GetQuestionDefault (
 EFI_STATUS\r
 InitializeCurrentSetting (\r
   IN OUT FORM_BROWSER_FORMSET             *FormSet\r
 EFI_STATUS\r
 InitializeCurrentSetting (\r
   IN OUT FORM_BROWSER_FORMSET             *FormSet\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize the internal data structure of a FormSet.\r
 \r
 /**\r
   Initialize the internal data structure of a FormSet.\r


@@ -876,8 +856,7 @@ InitializeFormSet (
   IN  EFI_HII_HANDLE                   Handle,\r
   IN OUT EFI_GUID                      *FormSetGuid,\r
   OUT FORM_BROWSER_FORMSET             *FormSet\r
   IN  EFI_HII_HANDLE                   Handle,\r
   IN OUT EFI_GUID                      *FormSetGuid,\r
   OUT FORM_BROWSER_FORMSET             *FormSet\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reset Questions in a Form to their default value.\r
 \r
 /**\r
   Reset Questions in a Form to their default value.\r


@@ -894,8 +873,7 @@ ExtractFormDefault (
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN  FORM_BROWSER_FORM               *Form,\r
   IN UINT16                           DefaultId\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN  FORM_BROWSER_FORM               *Form,\r
   IN UINT16                           DefaultId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize Question's Edit copy from Storage.\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage.\r


@@ -910,8 +888,7 @@ EFI_STATUS
 LoadFormConfig (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r
 LoadFormConfig (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert setting of Buffer Storage or NameValue Storage to <ConfigResp>.\r
 \r
 /**\r
   Convert setting of Buffer Storage or NameValue Storage to <ConfigResp>.\r


@@ -927,8 +904,7 @@ EFI_STATUS
 StorageToConfigResp (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  **ConfigResp\r
 StorageToConfigResp (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  **ConfigResp\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert <ConfigResp> to settings in Buffer Storage or NameValue Storage.\r
 \r
 /**\r
   Convert <ConfigResp> to settings in Buffer Storage or NameValue Storage.\r


@@ -944,8 +920,7 @@ EFI_STATUS
 ConfigRespToStorage (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  *ConfigResp\r
 ConfigRespToStorage (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  *ConfigResp\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Fill storage's edit copy with settings requested from Configuration Driver.\r
 \r
 /**\r
   Fill storage's edit copy with settings requested from Configuration Driver.\r


@@ -960,8 +935,7 @@ EFI_STATUS
 LoadStorage (\r
   IN FORM_BROWSER_FORMSET    *FormSet,\r
   IN FORMSET_STORAGE         *Storage\r
 LoadStorage (\r
   IN FORM_BROWSER_FORMSET    *FormSet,\r
   IN FORMSET_STORAGE         *Storage\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Fetch the Ifr binary data of a FormSet.\r
 \r
 /**\r
   Fetch the Ifr binary data of a FormSet.\r


@@ -986,8 +960,7 @@ GetIfrBinaryData (
   IN OUT EFI_GUID      *FormSetGuid,\r
   OUT UINTN            *BinaryLength,\r
   OUT UINT8            **BinaryData\r
   IN OUT EFI_GUID      *FormSetGuid,\r
   OUT UINTN            *BinaryLength,\r
   OUT UINT8            **BinaryData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This is the routine which an external caller uses to direct the browser\r
 \r
 /**\r
   This is the routine which an external caller uses to direct the browser\r


@@ -1027,8 +1000,7 @@ SendForm (
   IN  UINT16                           FormId, OPTIONAL\r
   IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL\r
   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL\r
   IN  UINT16                           FormId, OPTIONAL\r
   IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL\r
   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function is called by a callback handler to retrieve uncommitted state\r
 \r
 /**\r
   This function is called by a callback handler to retrieve uncommitted state\r


@@ -1066,7 +1038,6 @@ BrowserCallback (
   IN BOOLEAN                           RetrieveData,\r
   IN CONST EFI_GUID                    *VariableGuid, OPTIONAL\r
   IN CONST CHAR16                      *VariableName  OPTIONAL\r
   IN BOOLEAN                           RetrieveData,\r
   IN CONST EFI_GUID                    *VariableGuid, OPTIONAL\r
   IN CONST CHAR16                      *VariableName  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index 444961c9ddf2f59f78acecec71d05307a08188ff..1eaeb59aba7bccd4167b98743713530893ed67ce 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -180,8 +180,7 @@ extern UI_MENU_SELECTION   *gCurrentSelection;
 VOID\r
 UiInitMenu (\r
   VOID\r
 VOID\r
 UiInitMenu (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize Menu option list.\r
 \r
 /**\r
   Initialize Menu option list.\r


@@ -190,8 +189,7 @@ UiInitMenu (
 VOID\r
 UiInitMenuList (\r
   VOID\r
 VOID\r
 UiInitMenuList (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Remove a Menu in list, and return FormId/QuestionId for previous Menu.\r
 \r
 /**\r
   Remove a Menu in list, and return FormId/QuestionId for previous Menu.\r


@@ -202,8 +200,7 @@ UiInitMenuList (
 VOID\r
 UiRemoveMenuListEntry (\r
   OUT UI_MENU_SELECTION  *Selection\r
 VOID\r
 UiRemoveMenuListEntry (\r
   OUT UI_MENU_SELECTION  *Selection\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Free Menu option linked list.\r
 \r
 /**\r
   Free Menu option linked list.\r


@@ -212,8 +209,7 @@ UiRemoveMenuListEntry (
 VOID\r
 UiFreeMenuList (\r
   VOID\r
 VOID\r
 UiFreeMenuList (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add one menu entry to the linked lst\r
 \r
 /**\r
   Add one menu entry to the linked lst\r


@@ -224,8 +220,7 @@ UiFreeMenuList (
 VOID\r
 UiAddMenuListEntry (\r
   IN UI_MENU_SELECTION            *Selection\r
 VOID\r
 UiAddMenuListEntry (\r
   IN UI_MENU_SELECTION            *Selection\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Free Menu option linked list.\r
 \r
 /**\r
   Free Menu option linked list.\r


@@ -234,8 +229,7 @@ UiAddMenuListEntry (
 VOID\r
 UiFreeMenu (\r
   VOID\r
 VOID\r
 UiFreeMenu (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Add one menu option by specified description and context.\r
 \r
 /**\r
   Add one menu option by specified description and context.\r


@@ -254,8 +248,7 @@ UiAddMenuOption (
   IN FORM_BROWSER_STATEMENT  *Statement,\r
   IN UINT16                  NumberOfLines,\r
   IN UINT16                  MenuItemCount\r
   IN FORM_BROWSER_STATEMENT  *Statement,\r
   IN UINT16                  NumberOfLines,\r
   IN UINT16                  MenuItemCount\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Display menu and wait for user to select one menu option, then return it.\r
 \r
 /**\r
   Display menu and wait for user to select one menu option, then return it.\r


@@ -271,8 +264,7 @@ UiAddMenuOption (
 EFI_STATUS\r
 UiDisplayMenu (\r
   IN OUT UI_MENU_SELECTION           *Selection\r
 EFI_STATUS\r
 UiDisplayMenu (\r
   IN OUT UI_MENU_SELECTION           *Selection\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Free up the resource allocated for all strings required\r
 \r
 /**\r
   Free up the resource allocated for all strings required\r


@@ -282,8 +274,7 @@ UiDisplayMenu (
 VOID\r
 FreeBrowserStrings (\r
   VOID\r
 VOID\r
 FreeBrowserStrings (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   The worker function that send the displays to the screen. On output,\r
 \r
 /**\r
   The worker function that send the displays to the screen. On output,\r


@@ -301,8 +292,7 @@ FreeBrowserStrings (
 EFI_STATUS\r
 SetupBrowser (\r
   IN OUT UI_MENU_SELECTION    *Selection\r
 EFI_STATUS\r
 SetupBrowser (\r
   IN OUT UI_MENU_SELECTION    *Selection\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   VSPrint worker function that prints a Value as a decimal number in Buffer.\r
 \r
 /**\r
   VSPrint worker function that prints a Value as a decimal number in Buffer.\r


@@ -320,8 +310,7 @@ ValueToString (
   IN CHAR16   *Buffer,\r
   IN BOOLEAN  Flags,\r
   IN INT64    Value\r
   IN CHAR16   *Buffer,\r
   IN BOOLEAN  Flags,\r
   IN INT64    Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set Buffer to Value for Size bytes.\r
 \r
 /**\r
   Set Buffer to Value for Size bytes.\r


@@ -336,8 +325,7 @@ SetUnicodeMem (
   IN VOID   *Buffer,\r
   IN UINTN  Size,\r
   IN CHAR16 Value\r
   IN VOID   *Buffer,\r
   IN UINTN  Size,\r
   IN CHAR16 Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wait for a given event to fire, or for an optional timeout to expire.\r
 \r
 /**\r
   Wait for a given event to fire, or for an optional timeout to expire.\r


@@ -355,8 +343,7 @@ UiWaitForSingleEvent (
   IN EFI_EVENT                Event,\r
   IN UINT64                   Timeout, OPTIONAL\r
   IN UINT8                    RefreshInterval OPTIONAL\r
   IN EFI_EVENT                Event,\r
   IN UINT64                   Timeout, OPTIONAL\r
   IN UINT8                    RefreshInterval OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Draw a pop up windows based on the dimension, number of lines and\r
 \r
 /**\r
   Draw a pop up windows based on the dimension, number of lines and\r


@@ -372,8 +359,7 @@ CreatePopUp (
   IN  UINTN                       ScreenWidth,\r
   IN  UINTN                       NumberOfLines,\r
   ...\r
   IN  UINTN                       ScreenWidth,\r
   IN  UINTN                       NumberOfLines,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get string or password input from user.\r
 \r
 /**\r
   Get string or password input from user.\r


@@ -391,8 +377,7 @@ ReadString (
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  CHAR16                      *Prompt,\r
   OUT CHAR16                      *StringPtr\r
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  CHAR16                      *Prompt,\r
   OUT CHAR16                      *StringPtr\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get selection for OneOf and OrderedList (Left/Right will be ignored).\r
 \r
 /**\r
   Get selection for OneOf and OrderedList (Left/Right will be ignored).\r


@@ -408,8 +393,7 @@ EFI_STATUS
 GetSelectionInputPopUp (\r
   IN  UI_MENU_SELECTION           *Selection,\r
   IN  UI_MENU_OPTION              *MenuOption\r
 GetSelectionInputPopUp (\r
   IN  UI_MENU_SELECTION           *Selection,\r
   IN  UI_MENU_OPTION              *MenuOption\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This routine reads a numeric value from the user input.\r
 \r
 /**\r
   This routine reads a numeric value from the user input.\r


@@ -425,8 +409,7 @@ EFI_STATUS
 GetNumericInput (\r
   IN  UI_MENU_SELECTION           *Selection,\r
   IN  UI_MENU_OPTION              *MenuOption\r
 GetNumericInput (\r
   IN  UI_MENU_SELECTION           *Selection,\r
   IN  UI_MENU_OPTION              *MenuOption\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update status bar on the bottom of menu.\r
 \r
 /**\r
   Update status bar on the bottom of menu.\r


@@ -441,8 +424,7 @@ UpdateStatusBar (
   IN  UINTN                       MessageType,\r
   IN  UINT8                       Flags,\r
   IN  BOOLEAN                     State\r
   IN  UINTN                       MessageType,\r
   IN  UINT8                       Flags,\r
   IN  BOOLEAN                     State\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process Question Config.\r
 \r
 /**\r
   Process Question Config.\r


@@ -458,8 +440,7 @@ EFI_STATUS
 ProcessQuestionConfig (\r
   IN  UI_MENU_SELECTION       *Selection,\r
   IN  FORM_BROWSER_STATEMENT  *Question\r
 ProcessQuestionConfig (\r
   IN  UI_MENU_SELECTION       *Selection,\r
   IN  FORM_BROWSER_STATEMENT  *Question\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Print Question Value according to it's storage width and display attributes.\r
 \r
 /**\r
   Print Question Value according to it's storage width and display attributes.\r


@@ -477,8 +458,7 @@ PrintFormattedNumber (
   IN FORM_BROWSER_STATEMENT   *Question,\r
   IN OUT CHAR16               *FormattedNumber,\r
   IN UINTN                    BufferSize\r
   IN FORM_BROWSER_STATEMENT   *Question,\r
   IN OUT CHAR16               *FormattedNumber,\r
   IN UINTN                    BufferSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Search an Option of a Question by its value.\r
 \r
 /**\r
   Search an Option of a Question by its value.\r


@@ -494,8 +474,7 @@ QUESTION_OPTION *
 ValueToOption (\r
   IN FORM_BROWSER_STATEMENT   *Question,\r
   IN EFI_HII_VALUE            *OptionValue\r
 ValueToOption (\r
   IN FORM_BROWSER_STATEMENT   *Question,\r
   IN EFI_HII_VALUE            *OptionValue\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process a Question's Option (whether selected or un-selected).\r
 \r
 /**\r
   Process a Question's Option (whether selected or un-selected).\r


@@ -515,8 +494,7 @@ ProcessOptions (
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     Selected,\r
   OUT CHAR16                      **OptionString\r
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     Selected,\r
   OUT CHAR16                      **OptionString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Process the help string: Split StringPtr to several lines of strings stored in\r
 \r
 /**\r
   Process the help string: Split StringPtr to several lines of strings stored in\r


@@ -532,8 +510,7 @@ ProcessHelpString (
   IN  CHAR16                      *StringPtr,\r
   OUT CHAR16                      **FormattedString,\r
   IN  UINTN                       RowCount\r
   IN  CHAR16                      *StringPtr,\r
   OUT CHAR16                      **FormattedString,\r
   IN  UINTN                       RowCount\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Update key's help imformation.\r
 \r
 /**\r
   Update key's help imformation.\r


@@ -546,8 +523,7 @@ VOID
 UpdateKeyHelp (\r
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     Selected\r
 UpdateKeyHelp (\r
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     Selected\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clear retangle with specified text attribute.\r
 \r
 /**\r
   Clear retangle with specified text attribute.\r


@@ -566,8 +542,7 @@ ClearLines (
   UINTN                                       TopRow,\r
   UINTN                                       BottomRow,\r
   UINTN                                       TextAttribute\r
   UINTN                                       TopRow,\r
   UINTN                                       BottomRow,\r
   UINTN                                       TextAttribute\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Count the storage space of a Unicode string.\r
 \r
 /**\r
   Count the storage space of a Unicode string.\r


@@ -586,8 +561,7 @@ ClearLines (
 UINTN\r
 GetStringWidth (\r
   CHAR16                                      *String\r
 UINTN\r
 GetStringWidth (\r
   CHAR16                                      *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Will copy LineWidth amount of a string in the OutputString buffer and return the\r
 \r
 /**\r
   Will copy LineWidth amount of a string in the OutputString buffer and return the\r


@@ -608,8 +582,7 @@ GetLineByWidth (
   IN      UINT16                      LineWidth,\r
   IN OUT  UINTN                       *Index,\r
   OUT     CHAR16                      **OutputString\r
   IN      UINT16                      LineWidth,\r
   IN OUT  UINTN                       *Index,\r
   OUT     CHAR16                      **OutputString\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the supported width for a particular op-code\r
 \r
 /**\r
   Get the supported width for a particular op-code\r


@@ -624,8 +597,7 @@ UINT16
 GetWidth (\r
   IN FORM_BROWSER_STATEMENT        *Statement,\r
   IN EFI_HII_HANDLE                 Handle\r
 GetWidth (\r
   IN FORM_BROWSER_STATEMENT        *Statement,\r
   IN EFI_HII_HANDLE                 Handle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Concatenate a narrow string to another string.\r
 \r
 /**\r
   Concatenate a narrow string to another string.\r


@@ -639,8 +611,7 @@ VOID
 NewStrCat (\r
   CHAR16                                      *Destination,\r
   CHAR16                                      *Source\r
 NewStrCat (\r
   CHAR16                                      *Destination,\r
   CHAR16                                      *Source\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Wait for a key to be pressed by user.\r
 \r
 /**\r
   Wait for a key to be pressed by user.\r


@@ -653,8 +624,7 @@ NewStrCat (
 EFI_STATUS\r
 WaitForKeyStroke (\r
   OUT  EFI_INPUT_KEY           *Key\r
 EFI_STATUS\r
 WaitForKeyStroke (\r
   OUT  EFI_INPUT_KEY           *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reset stack pointer to begin of the stack.\r
 \r
 /**\r
   Reset stack pointer to begin of the stack.\r


@@ -663,8 +633,7 @@ WaitForKeyStroke (
 VOID\r
 ResetScopeStack (\r
   VOID\r
 VOID\r
 ResetScopeStack (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Push an Operand onto the Stack\r
 \r
 /**\r
   Push an Operand onto the Stack\r


@@ -679,8 +648,7 @@ ResetScopeStack (
 EFI_STATUS\r
 PushScope (\r
   IN UINT8   Operand\r
 EFI_STATUS\r
 PushScope (\r
   IN UINT8   Operand\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Pop an Operand from the Stack\r
 \r
 /**\r
   Pop an Operand from the Stack\r


@@ -695,8 +663,7 @@ PushScope (
 EFI_STATUS\r
 PopScope (\r
   OUT UINT8     *Operand\r
 EFI_STATUS\r
 PopScope (\r
   OUT UINT8     *Operand\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get Form given its FormId.\r
 \r
 /**\r
   Get Form given its FormId.\r


@@ -712,8 +679,7 @@ FORM_BROWSER_FORM *
 IdToForm (\r
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN UINT16                FormId\r
 IdToForm (\r
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN UINT16                FormId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Search a Question in Formset scope using its QuestionId.\r
 \r
 /**\r
   Search a Question in Formset scope using its QuestionId.\r


@@ -731,8 +697,7 @@ IdToQuestion (
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN UINT16                QuestionId\r
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN UINT16                QuestionId\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Zero extend integer/boolean/date/time to UINT64 for comparing.\r
 \r
 /**\r
   Zero extend integer/boolean/date/time to UINT64 for comparing.\r


@@ -743,8 +708,7 @@ IdToQuestion (
 VOID\r
 ExtendValueToU64 (\r
   IN  EFI_HII_VALUE   *Value\r
 VOID\r
 ExtendValueToU64 (\r
   IN  EFI_HII_VALUE   *Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Compare two Hii value.\r
 \r
 /**\r
   Compare two Hii value.\r


@@ -764,8 +728,7 @@ CompareHiiValue (
   IN  EFI_HII_VALUE   *Value1,\r
   IN  EFI_HII_VALUE   *Value2,\r
   IN  EFI_HII_HANDLE  HiiHandle OPTIONAL\r
   IN  EFI_HII_VALUE   *Value1,\r
   IN  EFI_HII_VALUE   *Value2,\r
   IN  EFI_HII_HANDLE  HiiHandle OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Evaluate the result of a HII expression\r
 \r
 /**\r
   Evaluate the result of a HII expression\r


@@ -788,7 +751,6 @@ EvaluateExpression (
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN OUT FORM_EXPRESSION   *Expression\r
   IN FORM_BROWSER_FORMSET  *FormSet,\r
   IN FORM_BROWSER_FORM     *Form,\r
   IN OUT FORM_EXPRESSION   *Expression\r

-  )\r
-;\r
+  );\r

 \r
 #endif // _UI_H\r
 \r
 #endif // _UI_H\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 956e23d7c547a369ae73daa6416edfa97ab6af41..1688bf1b23e926ff0d193b9093a446dfd7244031 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -86,24 +86,21 @@ EFIAPI
 VariableCommonInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 VariableCommonInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -115,8 +112,7 @@ GetVariable (
   OUT     VOID              *Data,\r
   IN      VARIABLE_GLOBAL   * Global,\r
   IN      UINT32            Instance\r
   OUT     VOID              *Data,\r
   IN      VARIABLE_GLOBAL   * Global,\r
   IN      UINT32            Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -126,8 +122,7 @@ GetNextVariableName (
   IN OUT  EFI_GUID          *VendorGuid,\r
   IN      VARIABLE_GLOBAL   *Global,\r
   IN      UINT32            Instance\r
   IN OUT  EFI_GUID          *VendorGuid,\r
   IN      VARIABLE_GLOBAL   *Global,\r
   IN      UINT32            Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -141,8 +136,7 @@ SetVariable (
   IN UINTN                   *VolatileOffset,\r
   IN UINTN                   *NonVolatileOffset,\r
   IN UINT32                  Instance\r
   IN UINTN                   *VolatileOffset,\r
   IN UINTN                   *NonVolatileOffset,\r
   IN UINT32                  Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -153,7 +147,6 @@ QueryVariableInfo (
   OUT UINT64                 *MaximumVariableSize,\r
   IN  VARIABLE_GLOBAL        *Global,\r
   IN  UINT32                 Instance\r
   OUT UINT64                 *MaximumVariableSize,\r
   IN  VARIABLE_GLOBAL        *Global,\r
   IN  UINT32                 Instance\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 0c16c4813058fb11e688e115ea0a97c27aa20c0f..b2db844fc97c340255db35cbf3575ea03e5baeba 100644 (file)
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -622,8 +622,7 @@ CHAR16
 EFIAPI\r
 NibbleToHexChar (\r
   IN UINT8      Nibble\r
 EFIAPI\r
 NibbleToHexChar (\r
   IN UINT8      Nibble\r

-  )\r
-;\r
+  );\r

 \r
 /** \r
   Convert binary buffer to a Unicode String in a specified sequence. \r
 \r
 /** \r
   Convert binary buffer to a Unicode String in a specified sequence. \r


@@ -660,8 +659,7 @@ BufToHexString (
   IN OUT       UINTN                *StringLen,\r
   IN     CONST UINT8                *Buffer,\r
   IN           UINTN                BufferSizeInBytes\r
   IN OUT       UINTN                *StringLen,\r
   IN     CONST UINT8                *Buffer,\r
   IN           UINTN                BufferSizeInBytes\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -705,8 +703,7 @@ HexStringToBuf (
   IN OUT       UINTN                    *BufferSizeInBytes,\r
   IN     CONST CHAR16                   *String,\r
   OUT          UINTN                    *ConvertedStrLen  OPTIONAL\r
   IN OUT       UINTN                    *BufferSizeInBytes,\r
   IN     CONST CHAR16                   *String,\r
   OUT          UINTN                    *ConvertedStrLen  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -730,8 +727,7 @@ EFIAPI
 IsHexDigit (\r
   OUT UINT8      *Digit,\r
   IN  CHAR16      Char\r
 IsHexDigit (\r
   OUT UINT8      *Digit,\r
   IN  CHAR16      Char\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert one Null-terminated Unicode string to a Null-terminated\r
 \r
 /**\r
   Convert one Null-terminated Unicode string to a Null-terminated\r

diff --git a/MdePkg/Include/Library/DxePiLib.h b/MdePkg/Include/Library/DxePiLib.h
index dd80da7a26f5ce7e62ddac8ec46ca162d54aa0d8..912134761fc533231f236c0df4ea4e46c4fc6b82 100644 (file)
--- a/MdePkg/Include/Library/DxePiLib.h
+++ b/MdePkg/Include/Library/DxePiLib.h
@@ -70,8 +70,7 @@ PiLibGetSectionFromAnyFv (
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Locates a requested firmware section within a file and returns it to a buffer allocated by this function. \r
 \r
 /**\r
   Locates a requested firmware section within a file and returns it to a buffer allocated by this function. \r


@@ -123,8 +122,7 @@ PiLibGetSectionFromCurrentFv (
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -170,8 +168,7 @@ PiLibGetSectionFromCurrentFfs (
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r
   IN  UINTN                         SectionInstance,\r
   OUT VOID                          **Buffer,\r
   OUT UINTN                         *Size\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/Library/HiiLib.h b/MdePkg/Include/Library/HiiLib.h
index 9bad5b47761a24b932d7c1e29aa0f9e0536830fa..e094fad28fd8aaa5360542e073a068445c74b163 100644 (file)
--- a/MdePkg/Include/Library/HiiLib.h
+++ b/MdePkg/Include/Library/HiiLib.h
@@ -43,8 +43,7 @@ HiiLibPreparePackageList (
   IN UINTN                    NumberOfPackages,\r
   IN CONST EFI_GUID                 *GuidId,\r
   ...\r
   IN UINTN                    NumberOfPackages,\r
   IN CONST EFI_GUID                 *GuidId,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGE_LIST structure\r
 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGE_LIST structure\r


@@ -78,8 +77,7 @@ HiiLibAddPackages (
   IN       EFI_HANDLE          DriverHandle, OPTIONAL\r
   OUT      EFI_HII_HANDLE      *HiiHandle,\r
   ...\r
   IN       EFI_HANDLE          DriverHandle, OPTIONAL\r
   OUT      EFI_HII_HANDLE      *HiiHandle,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Removes a package list from the default HII database.\r
 \r
 /**\r
   Removes a package list from the default HII database.\r


@@ -95,8 +93,7 @@ VOID
 EFIAPI\r
 HiiLibRemovePackages (\r
   IN      EFI_HII_HANDLE      HiiHandle\r
 EFIAPI\r
 HiiLibRemovePackages (\r
   IN      EFI_HII_HANDLE      HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function adds the string into String Package of each language\r
 \r
 /**\r
   This function adds the string into String Package of each language\r


@@ -122,8 +119,7 @@ HiiLibNewString (
   IN  EFI_HII_HANDLE                  PackageList,\r
   OUT EFI_STRING_ID                   *StringId,\r
   IN  CONST EFI_STRING                String\r
   IN  EFI_HII_HANDLE                  PackageList,\r
   OUT EFI_STRING_ID                   *StringId,\r
   IN  CONST EFI_STRING                String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function update the specified string in String Package of each language\r
 \r
 /**\r
   This function update the specified string in String Package of each language\r


@@ -148,8 +144,7 @@ HiiLibSetString (
   IN  EFI_HII_HANDLE                  PackageList,\r
   IN  EFI_STRING_ID                   StringId,\r
   IN  CONST EFI_STRING                String\r
   IN  EFI_HII_HANDLE                  PackageList,\r
   IN  EFI_STRING_ID                   StringId,\r
   IN  CONST EFI_STRING                String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function try to retrieve string from String package of current language.\r
 \r
 /**\r
   This function try to retrieve string from String package of current language.\r


@@ -182,8 +177,7 @@ HiiLibGetString (
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      String,\r
   IN  OUT UINTN                       *StringSize\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      String,\r
   IN  OUT UINTN                       *StringSize\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get string specified by StringId form the HiiHandle. The caller\r
 \r
 /**\r
   Get string specified by StringId form the HiiHandle. The caller\r


@@ -209,8 +203,7 @@ HiiLibGetStringFromHandle (
   IN  EFI_HII_HANDLE                  HiiHandle,\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      *String\r
   IN  EFI_HII_HANDLE                  HiiHandle,\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the string given the StringId and String package Producer's Guid. The caller\r
 \r
 /**\r
   Get the string given the StringId and String package Producer's Guid. The caller\r


@@ -234,8 +227,7 @@ HiiLibGetStringFromToken (
   IN  EFI_GUID                        *ProducerGuid,\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      *String\r
   IN  EFI_GUID                        *ProducerGuid,\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Determines the handles that are currently active in the database.\r
 \r
 /**\r
   Determines the handles that are currently active in the database.\r


@@ -257,8 +249,7 @@ EFIAPI
 HiiLibGetHiiHandles (\r
   IN OUT UINTN                     *HandleBufferLength,\r
   OUT    EFI_HII_HANDLE            **HiiHandleBuffer\r
 HiiLibGetHiiHandles (\r
   IN OUT UINTN                     *HandleBufferLength,\r
   OUT    EFI_HII_HANDLE            **HiiHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Extract Hii package list GUID for given HII handle.\r
 \r
 /**\r
   Extract Hii package list GUID for given HII handle.\r


@@ -277,8 +268,7 @@ EFIAPI
 HiiLibExtractGuidFromHiiHandle (\r
   IN      EFI_HII_HANDLE      Handle,\r
   OUT     EFI_GUID            *Guid\r
 HiiLibExtractGuidFromHiiHandle (\r
   IN      EFI_HII_HANDLE      Handle,\r
   OUT     EFI_GUID            *Guid\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Find HII Handle in the default HII database associated with given Device Path.\r
 \r
 /**\r
   Find HII Handle in the default HII database associated with given Device Path.\r


@@ -297,8 +287,7 @@ EFI_HII_HANDLE
 EFIAPI\r
 HiiLibDevicePathToHiiHandle (\r
   IN EFI_DEVICE_PATH_PROTOCOL   *DevicePath\r
 EFIAPI\r
 HiiLibDevicePathToHiiHandle (\r
   IN EFI_DEVICE_PATH_PROTOCOL   *DevicePath\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -320,8 +309,7 @@ EFI_STATUS
 EFIAPI\r
 HiiLibGetCurrentLanguage (\r
   OUT     CHAR8               *Lang\r
 EFIAPI\r
 HiiLibGetCurrentLanguage (\r
   OUT     CHAR8               *Lang\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get next language from language code list (with separator ';').\r
 \r
 /**\r
   Get next language from language code list (with separator ';').\r


@@ -340,8 +328,7 @@ EFIAPI
 HiiLibGetNextLanguage (\r
   IN OUT CHAR8      **LangCode,\r
   OUT CHAR8         *Lang\r
 HiiLibGetNextLanguage (\r
   IN OUT CHAR8      **LangCode,\r
   OUT CHAR8         *Lang\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function returns the list of supported languages, in the format specified\r
 \r
 /**\r
   This function returns the list of supported languages, in the format specified\r


@@ -359,8 +346,7 @@ CHAR8 *
 EFIAPI\r
 HiiLibGetSupportedLanguages (\r
   IN EFI_HII_HANDLE           HiiHandle\r
 EFIAPI\r
 HiiLibGetSupportedLanguages (\r
   IN EFI_HII_HANDLE           HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function returns the list of supported 2nd languages, in the format specified\r
 \r
 /**\r
   This function returns the list of supported 2nd languages, in the format specified\r


@@ -380,8 +366,7 @@ EFIAPI
 HiiLibGetSupportedSecondaryLanguages (\r
   IN EFI_HII_HANDLE           HiiHandle,\r
   IN CONST CHAR8              *FirstLanguage\r
 HiiLibGetSupportedSecondaryLanguages (\r
   IN EFI_HII_HANDLE           HiiHandle,\r
   IN CONST CHAR8              *FirstLanguage\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -399,8 +384,7 @@ UINT16
 EFIAPI\r
 HiiLibGetSupportedLanguageNumber (\r
   IN EFI_HII_HANDLE           HiiHandle\r
 EFIAPI\r
 HiiLibGetSupportedLanguageNumber (\r
   IN EFI_HII_HANDLE           HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Exports the contents of one or all package lists in the HII database into a buffer.\r
 \r
 /**\r
   Exports the contents of one or all package lists in the HII database into a buffer.\r


@@ -426,8 +410,7 @@ HiiLibExportPackageLists (
   IN EFI_HII_HANDLE                    Handle,\r
   OUT EFI_HII_PACKAGE_LIST_HEADER      **PackageListHeader,\r
   OUT UINTN                            *PackageListSize\r
   IN EFI_HII_HANDLE                    Handle,\r
   OUT EFI_HII_PACKAGE_LIST_HEADER      **PackageListHeader,\r
   OUT UINTN                            *PackageListSize\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -436,8 +419,7 @@ HiiLibListPackageLists (
   IN CONST  EFI_GUID                  *PackageGuid,\r
   IN OUT    UINTN                     *HandleBufferLength,\r
   OUT       EFI_HII_HANDLE            **Handle\r
   IN CONST  EFI_GUID                  *PackageGuid,\r
   IN OUT    UINTN                     *HandleBufferLength,\r
   OUT       EFI_HII_HANDLE            **Handle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert language code from RFC3066 to ISO639-2.\r
 \r
 /**\r
   Convert language code from RFC3066 to ISO639-2.\r


@@ -463,8 +445,7 @@ EFIAPI
 ConvertRfc3066LanguageToIso639Language (\r
   IN  CHAR8   *LanguageRfc3066,\r
   OUT CHAR8   *LanguageIso639\r
 ConvertRfc3066LanguageToIso639Language (\r
   IN  CHAR8   *LanguageRfc3066,\r
   OUT CHAR8   *LanguageIso639\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert language code from ISO639-2 to RFC3066.\r
 \r
 /**\r
   Convert language code from ISO639-2 to RFC3066.\r


@@ -490,8 +471,7 @@ EFIAPI
 ConvertIso639LanguageToRfc3066Language (\r
   IN  CONST CHAR8   *LanguageIso639,\r
   OUT CHAR8         *LanguageRfc3066\r
 ConvertIso639LanguageToRfc3066Language (\r
   IN  CONST CHAR8   *LanguageIso639,\r
   OUT CHAR8         *LanguageRfc3066\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Convert language code list from RFC3066 to ISO639-2, e.g. "en-US;fr-FR" will\r
 \r
 /**\r
   Convert language code list from RFC3066 to ISO639-2, e.g. "en-US;fr-FR" will\r


@@ -508,7 +488,6 @@ CHAR8 *
 EFIAPI\r
 Rfc3066ToIso639 (\r
   CHAR8  *SupportedLanguages\r
 EFIAPI\r
 Rfc3066ToIso639 (\r
   CHAR8  *SupportedLanguages\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/HobLib.h b/MdePkg/Include/Library/HobLib.h
index f2bc43300b74691db755f16831b3b91d954f585d..a02246f6b0139863ba833f26d026a2e5df77fcc7 100644 (file)
--- a/MdePkg/Include/Library/HobLib.h
+++ b/MdePkg/Include/Library/HobLib.h
@@ -27,8 +27,7 @@ VOID *
 EFIAPI\r
 GetHobList (\r
   VOID\r
 EFIAPI\r
 GetHobList (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r
 \r
 /**\r
   Returns the next instance of a HOB type from the starting HOB.\r


@@ -51,8 +50,7 @@ EFIAPI
 GetNextHob (\r
   IN UINT16                 Type,\r
   IN CONST VOID             *HobStart\r
 GetNextHob (\r
   IN UINT16                 Type,\r
   IN CONST VOID             *HobStart\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r
 \r
 /**\r
   Returns the first instance of a HOB type among the whole HOB list.\r


@@ -69,8 +67,7 @@ VOID *
 EFIAPI\r
 GetFirstHob (\r
   IN UINT16                 Type\r
 EFIAPI\r
 GetFirstHob (\r
   IN UINT16                 Type\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function searches the first instance of a HOB from the starting HOB pointer. \r
 \r
 /**\r
   This function searches the first instance of a HOB from the starting HOB pointer. \r


@@ -96,8 +93,7 @@ EFIAPI
 GetNextGuidHob (\r
   IN CONST EFI_GUID         *Guid,\r
   IN CONST VOID             *HobStart\r
 GetNextGuidHob (\r
   IN CONST EFI_GUID         *Guid,\r
   IN CONST VOID             *HobStart\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function searches the first instance of a HOB among the whole HOB list. \r
 \r
 /**\r
   This function searches the first instance of a HOB among the whole HOB list. \r


@@ -117,8 +113,7 @@ VOID *
 EFIAPI\r
 GetFirstGuidHob (\r
   IN CONST EFI_GUID         *Guid\r
 EFIAPI\r
 GetFirstGuidHob (\r
   IN CONST EFI_GUID         *Guid\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get the Boot Mode from the HOB list.\r
 \r
 /**\r
   Get the Boot Mode from the HOB list.\r


@@ -135,8 +130,7 @@ EFI_BOOT_MODE
 EFIAPI\r
 GetBootModeHob (\r
   VOID\r
 EFIAPI\r
 GetBootModeHob (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB for a loaded PE32 module.\r
 \r
 /**\r
   Builds a HOB for a loaded PE32 module.\r


@@ -160,8 +154,7 @@ BuildModuleHob (
   IN EFI_PHYSICAL_ADDRESS   MemoryAllocationModule,\r
   IN UINT64                 ModuleLength,\r
   IN EFI_PHYSICAL_ADDRESS   EntryPoint\r
   IN EFI_PHYSICAL_ADDRESS   MemoryAllocationModule,\r
   IN UINT64                 ModuleLength,\r
   IN EFI_PHYSICAL_ADDRESS   EntryPoint\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB that describes a chunk of system memory.\r
 \r
 /**\r
   Builds a HOB that describes a chunk of system memory.\r


@@ -184,8 +177,7 @@ BuildResourceDescriptorHob (
   IN EFI_RESOURCE_ATTRIBUTE_TYPE  ResourceAttribute,\r
   IN EFI_PHYSICAL_ADDRESS         PhysicalStart,\r
   IN UINT64                       NumberOfBytes\r
   IN EFI_RESOURCE_ATTRIBUTE_TYPE  ResourceAttribute,\r
   IN EFI_PHYSICAL_ADDRESS         PhysicalStart,\r
   IN UINT64                       NumberOfBytes\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a GUID HOB with a certain data length.\r
 \r
 /**\r
   Builds a GUID HOB with a certain data length.\r


@@ -210,8 +202,7 @@ EFIAPI
 BuildGuidHob (\r
   IN CONST EFI_GUID              *Guid,\r
   IN UINTN                       DataLength\r
 BuildGuidHob (\r
   IN CONST EFI_GUID              *Guid,\r
   IN UINTN                       DataLength\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copies a data buffer to a newly-built HOB.\r
 \r
 /**\r
   Copies a data buffer to a newly-built HOB.\r


@@ -239,8 +230,7 @@ BuildGuidDataHob (
   IN CONST EFI_GUID              *Guid,\r
   IN VOID                        *Data,\r
   IN UINTN                       DataLength\r
   IN CONST EFI_GUID              *Guid,\r
   IN VOID                        *Data,\r
   IN UINTN                       DataLength\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a Firmware Volume HOB.\r
 \r
 /**\r
   Builds a Firmware Volume HOB.\r


@@ -259,8 +249,7 @@ EFIAPI
 BuildFvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
 BuildFvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a EFI_HOB_TYPE_FV2 HOB.\r
 \r
 /**\r
   Builds a EFI_HOB_TYPE_FV2 HOB.\r


@@ -283,8 +272,7 @@ BuildFv2Hob (
   IN          UINT64                      Length,\r
   IN CONST    EFI_GUID                    *FvName,\r
   IN CONST    EFI_GUID                    *FileName\r
   IN          UINT64                      Length,\r
   IN CONST    EFI_GUID                    *FvName,\r
   IN CONST    EFI_GUID                    *FileName\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a Capsule Volume HOB.\r
 \r
 /**\r
   Builds a Capsule Volume HOB.\r


@@ -303,8 +291,7 @@ EFIAPI
 BuildCvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
 BuildCvHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB for the CPU.\r
 \r
 /**\r
   Builds a HOB for the CPU.\r


@@ -323,8 +310,7 @@ EFIAPI
 BuildCpuHob (\r
   IN UINT8                       SizeOfMemorySpace,\r
   IN UINT8                       SizeOfIoSpace\r
 BuildCpuHob (\r
   IN UINT8                       SizeOfMemorySpace,\r
   IN UINT8                       SizeOfIoSpace\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB for the Stack.\r
 \r
 /**\r
   Builds a HOB for the Stack.\r


@@ -343,8 +329,7 @@ EFIAPI
 BuildStackHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r
 BuildStackHob (\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB for the BSP store.\r
 \r
 /**\r
   Builds a HOB for the BSP store.\r


@@ -365,8 +350,7 @@ BuildBspStoreHob (
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a HOB for the memory allocation.\r
 \r
 /**\r
   Builds a HOB for the memory allocation.\r


@@ -387,8 +371,7 @@ BuildMemoryAllocationHob (
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r
   IN EFI_PHYSICAL_ADDRESS        BaseAddress,\r
   IN UINT64                      Length,\r
   IN EFI_MEMORY_TYPE             MemoryType\r

-  )\r
-;\r
+  );\r

 \r
 #define GET_HOB_TYPE(Hob)     ((Hob).Header->HobType)\r
 #define GET_HOB_LENGTH(Hob)   ((Hob).Header->HobLength)\r
 \r
 #define GET_HOB_TYPE(Hob)     ((Hob).Header->HobType)\r
 #define GET_HOB_LENGTH(Hob)   ((Hob).Header->HobLength)\r

diff --git a/MdePkg/Include/Library/PciSegmentLib.h b/MdePkg/Include/Library/PciSegmentLib.h
index e0b16c20c000ae52d527b200af7ec346b544cbda..d2034bae5bd8953035d12592bb48a4c158ae63c5 100644 (file)
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/MdePkg/Include/Library/PciSegmentLib.h
@@ -57,8 +57,7 @@ UINT8
 EFIAPI\r
 PciSegmentRead8 (\r
   IN UINT64                    Address\r
 EFIAPI\r
 PciSegmentRead8 (\r
   IN UINT64                    Address\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes an 8-bit PCI configuration register.\r
 \r
 /**\r
   Writes an 8-bit PCI configuration register.\r


@@ -78,8 +77,7 @@ EFIAPI
 PciSegmentWrite8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     Value\r
 PciSegmentWrite8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise inclusive OR of an 8-bit PCI configuration register with an 8-bit value.\r
 \r
 /**\r
   Performs a bitwise inclusive OR of an 8-bit PCI configuration register with an 8-bit value.\r


@@ -102,8 +100,7 @@ EFIAPI
 PciSegmentOr8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     OrData\r
 PciSegmentOr8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit value.\r
 \r
 /**\r
   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit value.\r


@@ -126,8 +123,7 @@ EFIAPI
 PciSegmentAnd8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     AndData\r
 PciSegmentAnd8 (\r
   IN UINT64                    Address,\r
   IN UINT8                     AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit value,\r
 \r
 /**\r
   Performs a bitwise AND of an 8-bit PCI configuration register with an 8-bit value,\r


@@ -154,8 +150,7 @@ PciSegmentAndThenOr8 (
   IN UINT64                    Address,\r
   IN UINT8                     AndData,\r
   IN UINT8                     OrData\r
   IN UINT64                    Address,\r
   IN UINT8                     AndData,\r
   IN UINT8                     OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r
 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r


@@ -183,8 +178,7 @@ PciSegmentBitFieldRead8 (
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r
 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r


@@ -215,8 +209,7 @@ PciSegmentBitFieldWrite8 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     Value\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the 8-bit PCI configuration register specified by Address,\r
 \r
 /**\r
   Reads the 8-bit PCI configuration register specified by Address,\r


@@ -240,8 +233,7 @@ PciSegmentBitFieldOr8 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     OrData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in an 8-bit PCI configuration, performs a bitwise OR,\r
 \r
 /**\r
   Reads a bit field in an 8-bit PCI configuration, performs a bitwise OR,\r


@@ -275,8 +267,7 @@ PciSegmentBitFieldAnd8 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     AndData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT8                     AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in an 8-bit PCI configuration register, performs a bitwise AND,\r
 \r
 /**\r
   Reads a bit field in an 8-bit PCI configuration register, performs a bitwise AND,\r


@@ -312,8 +303,7 @@ PciSegmentBitFieldAndThenOr8 (
   IN UINTN                     EndBit,\r
   IN UINT8                     AndData,\r
   IN UINT8                     OrData\r
   IN UINTN                     EndBit,\r
   IN UINT8                     AndData,\r
   IN UINT8                     OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a 16-bit PCI configuration register.\r
 \r
 /**\r
   Reads a 16-bit PCI configuration register.\r


@@ -331,8 +321,7 @@ UINT16
 EFIAPI\r
 PciSegmentRead16 (\r
   IN UINT64                    Address\r
 EFIAPI\r
 PciSegmentRead16 (\r
   IN UINT64                    Address\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes a 16-bit PCI configuration register.\r
 \r
 /**\r
   Writes a 16-bit PCI configuration register.\r


@@ -352,8 +341,7 @@ EFIAPI
 PciSegmentWrite16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    Value\r
 PciSegmentWrite16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise inclusive OR of a 16-bit PCI configuration register with a 16-bit value.\r
 \r
 /**\r
   Performs a bitwise inclusive OR of a 16-bit PCI configuration register with a 16-bit value.\r


@@ -376,8 +364,7 @@ EFIAPI
 PciSegmentOr16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    OrData\r
 PciSegmentOr16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit value.\r
 \r
 /**\r
   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit value.\r


@@ -400,8 +387,7 @@ EFIAPI
 PciSegmentAnd16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    AndData\r
 PciSegmentAnd16 (\r
   IN UINT64                    Address,\r
   IN UINT16                    AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit value,\r
 \r
 /**\r
   Performs a bitwise AND of a 16-bit PCI configuration register with a 16-bit value,\r


@@ -428,8 +414,7 @@ PciSegmentAndThenOr16 (
   IN UINT64                    Address,\r
   IN UINT16                    AndData,\r
   IN UINT16                    OrData\r
   IN UINT64                    Address,\r
   IN UINT16                    AndData,\r
   IN UINT16                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r
 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r


@@ -457,8 +442,7 @@ PciSegmentBitFieldRead16 (
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r
 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r


@@ -489,8 +473,7 @@ PciSegmentBitFieldWrite16 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    Value\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the 16-bit PCI configuration register specified by Address,\r
 \r
 /**\r
   Reads the 16-bit PCI configuration register specified by Address,\r


@@ -514,8 +497,7 @@ PciSegmentBitFieldOr16 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    OrData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in a 16-bit PCI configuration, performs a bitwise OR,\r
 \r
 /**\r
   Reads a bit field in a 16-bit PCI configuration, performs a bitwise OR,\r


@@ -549,8 +531,7 @@ PciSegmentBitFieldAnd16 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    AndData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT16                    AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in a 16-bit PCI configuration register, performs a bitwise AND,\r
 \r
 /**\r
   Reads a bit field in a 16-bit PCI configuration register, performs a bitwise AND,\r


@@ -586,8 +567,7 @@ PciSegmentBitFieldAndThenOr16 (
   IN UINTN                     EndBit,\r
   IN UINT16                    AndData,\r
   IN UINT16                    OrData\r
   IN UINTN                     EndBit,\r
   IN UINT16                    AndData,\r
   IN UINT16                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a 32-bit PCI configuration register.\r
 \r
 /**\r
   Reads a 32-bit PCI configuration register.\r


@@ -605,8 +585,7 @@ UINT32
 EFIAPI\r
 PciSegmentRead32 (\r
   IN UINT64                    Address\r
 EFIAPI\r
 PciSegmentRead32 (\r
   IN UINT64                    Address\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes a 32-bit PCI configuration register.\r
 \r
 /**\r
   Writes a 32-bit PCI configuration register.\r


@@ -626,8 +605,7 @@ EFIAPI
 PciSegmentWrite32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    Value\r
 PciSegmentWrite32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise inclusive OR of a 32-bit PCI configuration register with a 32-bit value.\r
 \r
 /**\r
   Performs a bitwise inclusive OR of a 32-bit PCI configuration register with a 32-bit value.\r


@@ -650,8 +628,7 @@ EFIAPI
 PciSegmentOr32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    OrData\r
 PciSegmentOr32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit value.\r
 \r
 /**\r
   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit value.\r


@@ -674,8 +651,7 @@ EFIAPI
 PciSegmentAnd32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    AndData\r
 PciSegmentAnd32 (\r
   IN UINT64                    Address,\r
   IN UINT32                    AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit value,\r
 \r
 /**\r
   Performs a bitwise AND of a 32-bit PCI configuration register with a 32-bit value,\r


@@ -702,8 +678,7 @@ PciSegmentAndThenOr32 (
   IN UINT64                    Address,\r
   IN UINT32                    AndData,\r
   IN UINT32                    OrData\r
   IN UINT64                    Address,\r
   IN UINT32                    AndData,\r
   IN UINT32                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r
 \r
 /**\r
   Reads a bit field of a PCI configuration register.\r


@@ -731,8 +706,7 @@ PciSegmentBitFieldRead32 (
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r
   IN UINT64                    Address,\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r
 \r
 /**\r
   Writes a bit field to a PCI configuration register.\r


@@ -763,8 +737,7 @@ PciSegmentBitFieldWrite32 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    Value\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    Value\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the 32-bit PCI configuration register specified by Address,\r
 \r
 /**\r
   Reads the 32-bit PCI configuration register specified by Address,\r


@@ -788,8 +761,7 @@ PciSegmentBitFieldOr32 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    OrData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in a 32-bit PCI configuration, performs a bitwise OR,\r
 \r
 /**\r
   Reads a bit field in a 32-bit PCI configuration, performs a bitwise OR,\r


@@ -823,8 +795,7 @@ PciSegmentBitFieldAnd32 (
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    AndData\r
   IN UINTN                     StartBit,\r
   IN UINTN                     EndBit,\r
   IN UINT32                    AndData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a bit field in a 32-bit PCI configuration register, performs a bitwise AND,\r
 \r
 /**\r
   Reads a bit field in a 32-bit PCI configuration register, performs a bitwise AND,\r


@@ -860,8 +831,7 @@ PciSegmentBitFieldAndThenOr32 (
   IN UINTN                     EndBit,\r
   IN UINT32                    AndData,\r
   IN UINT32                    OrData\r
   IN UINTN                     EndBit,\r
   IN UINT32                    AndData,\r
   IN UINT32                    OrData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads a range of PCI configuration registers into a caller supplied buffer.\r
 \r
 /**\r
   Reads a range of PCI configuration registers into a caller supplied buffer.\r


@@ -888,8 +858,7 @@ PciSegmentReadBuffer (
   IN  UINT64                   StartAddress,\r
   IN  UINTN                    Size,\r
   OUT VOID                     *Buffer\r
   IN  UINT64                   StartAddress,\r
   IN  UINTN                    Size,\r
   OUT VOID                     *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Copies the data in a caller supplied buffer to a specified range of PCI configuration space.\r
 \r
 /**\r
   Copies the data in a caller supplied buffer to a specified range of PCI configuration space.\r


@@ -916,7 +885,6 @@ PciSegmentWriteBuffer (
   IN UINT64                    StartAddress,\r
   IN UINTN                     Size,\r
   IN VOID                      *Buffer\r
   IN UINT64                    StartAddress,\r
   IN UINTN                     Size,\r
   IN VOID                      *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/PeCoffLib.h b/MdePkg/Include/Library/PeCoffLib.h
index 2b0050474be3e68cd24f3370e8eb619cc73fa0b9..3f9fa6735fd23615d6cb0257814d113234ed1c5a 100644 (file)
--- a/MdePkg/Include/Library/PeCoffLib.h
+++ b/MdePkg/Include/Library/PeCoffLib.h
@@ -94,8 +94,7 @@ RETURN_STATUS
 EFIAPI\r
 PeCoffLoaderGetImageInfo (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
 EFIAPI\r
 PeCoffLoaderGetImageInfo (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Applies relocation fixups to a PE/COFF image that was loaded with PeCoffLoaderLoadImage().\r
 \r
 /**\r
   Applies relocation fixups to a PE/COFF image that was loaded with PeCoffLoaderLoadImage().\r


@@ -121,8 +120,7 @@ RETURN_STATUS
 EFIAPI\r
 PeCoffLoaderRelocateImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
 EFIAPI\r
 PeCoffLoaderRelocateImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Loads a PE/COFF image into memory.\r
 \r
 /**\r
   Loads a PE/COFF image into memory.\r


@@ -151,8 +149,7 @@ RETURN_STATUS
 EFIAPI\r
 PeCoffLoaderLoadImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
 EFIAPI\r
 PeCoffLoaderLoadImage (\r
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -174,8 +171,7 @@ PeCoffLoaderImageReadFromMemory (
   IN     UINTN   FileOffset,\r
   IN OUT UINTN   *ReadSize,\r
   OUT    VOID    *Buffer\r
   IN     UINTN   FileOffset,\r
   IN OUT UINTN   *ReadSize,\r
   OUT    VOID    *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -199,8 +195,7 @@ PeCoffLoaderRelocateImageForRuntime (
   IN  PHYSICAL_ADDRESS        VirtImageBase,\r
   IN  UINTN                   ImageSize,\r
   IN  VOID                    *RelocationData\r
   IN  PHYSICAL_ADDRESS        VirtImageBase,\r
   IN  UINTN                   ImageSize,\r
   IN  VOID                    *RelocationData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r
 \r
 /**\r
   Unloads a loaded PE/COFF image from memory and releases its taken resource.\r


@@ -218,6 +213,5 @@ RETURN_STATUS
 EFIAPI\r
 PeCoffLoaderUnloadImage (\r
   IN PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
 EFIAPI\r
 PeCoffLoaderUnloadImage (\r
   IN PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r

-  )\r
-;\r
+  );\r

 #endif\r
 #endif\r

diff --git a/MdePkg/Include/Library/ResourcePublicationLib.h b/MdePkg/Include/Library/ResourcePublicationLib.h
index 11468eeaa8cd13276a9d0028ebf040cb1e5046ce..d063c696ff60c5f3cbce03e95ac77d4fc858d243 100644 (file)
--- a/MdePkg/Include/Library/ResourcePublicationLib.h
+++ b/MdePkg/Include/Library/ResourcePublicationLib.h
@@ -36,7 +36,6 @@ EFIAPI
 PublishSystemMemory (\r
   IN PHYSICAL_ADDRESS       MemoryBegin,\r
   IN UINT64                 MemoryLength\r
 PublishSystemMemory (\r
   IN PHYSICAL_ADDRESS       MemoryBegin,\r
   IN UINT64                 MemoryLength\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index 45373e4fa138f5a7ac2bfccee5aeaf11b5fe39e3..13ab258ebe509bead04232923354bd3569effd9f 100644 (file)
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -417,8 +417,7 @@ LookupUnicodeString2 (
   IN CONST EFI_UNICODE_STRING_TABLE  *UnicodeStringTable,\r
   OUT CHAR16                         **UnicodeString,\r
   IN BOOLEAN                         Iso639Language\r
   IN CONST EFI_UNICODE_STRING_TABLE  *UnicodeStringTable,\r
   OUT CHAR16                         **UnicodeString,\r
   IN BOOLEAN                         Iso639Language\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r
 \r
 /**\r
   This function adds a Unicode string to UnicodeStringTable.\r


@@ -529,8 +528,7 @@ AddUnicodeString2 (
   IN EFI_UNICODE_STRING_TABLE  **UnicodeStringTable,\r
   IN CONST CHAR16              *UnicodeString,\r
   IN BOOLEAN                   Iso639Language\r
   IN EFI_UNICODE_STRING_TABLE  **UnicodeStringTable,\r
   IN CONST CHAR16              *UnicodeString,\r
   IN BOOLEAN                   Iso639Language\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   This function frees the table of Unicode strings in UnicodeStringTable.\r
 \r
 /**\r
   This function frees the table of Unicode strings in UnicodeStringTable.\r

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 81c973917a983736c2df0d04e9e7c439db1dc4d0..8a7954054e315fdbbd8c1484fb8cbfe179f1b888 100644 (file)
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -183,8 +183,7 @@ EFI_STATUS
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length,\r
   IN UINT64                Capabilities\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length,\r
   IN UINT64                Capabilities\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Allocates nonexistent memory, reserved memory, system memory, or memorymapped\r
 \r
 /**\r
   Allocates nonexistent memory, reserved memory, system memory, or memorymapped\r


@@ -226,8 +225,7 @@ EFI_STATUS
   IN OUT EFI_PHYSICAL_ADDRESS                *BaseAddress,\r
   IN     EFI_HANDLE                          ImageHandle,\r
   IN     EFI_HANDLE                          DeviceHandle OPTIONAL\r
   IN OUT EFI_PHYSICAL_ADDRESS                *BaseAddress,\r
   IN     EFI_HANDLE                          ImageHandle,\r
   IN     EFI_HANDLE                          DeviceHandle OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Frees nonexistent memory, reserved memory, system memory, or memory-mapped\r
 \r
 /**\r
   Frees nonexistent memory, reserved memory, system memory, or memory-mapped\r


@@ -252,8 +250,7 @@ EFI_STATUS
 (EFIAPI *EFI_FREE_MEMORY_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r
 (EFIAPI *EFI_FREE_MEMORY_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Removes reserved memory, system memory, or memory-mapped I/O resources from\r
 \r
 /**\r
   Removes reserved memory, system memory, or memory-mapped I/O resources from\r


@@ -281,8 +278,7 @@ EFI_STATUS
 (EFIAPI *EFI_REMOVE_MEMORY_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r
 (EFIAPI *EFI_REMOVE_MEMORY_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the descriptor for a memory region containing a specified address.\r
 \r
 /**\r
   Retrieves the descriptor for a memory region containing a specified address.\r


@@ -301,8 +297,7 @@ EFI_STATUS
 (EFIAPI *EFI_GET_MEMORY_SPACE_DESCRIPTOR)(\r
   IN  EFI_PHYSICAL_ADDRESS             BaseAddress,\r
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Descriptor\r
 (EFIAPI *EFI_GET_MEMORY_SPACE_DESCRIPTOR)(\r
   IN  EFI_PHYSICAL_ADDRESS             BaseAddress,\r
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Descriptor\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Modifies the attributes for a memory region in the global coherency domain of the\r
 \r
 /**\r
   Modifies the attributes for a memory region in the global coherency domain of the\r


@@ -330,8 +325,7 @@ EFI_STATUS
   IN EFI_PHYSICAL_ADDRESS         BaseAddress,\r
   IN UINT64                       Length,\r
   IN UINT64                       Attributes\r
   IN EFI_PHYSICAL_ADDRESS         BaseAddress,\r
   IN UINT64                       Length,\r
   IN UINT64                       Attributes\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns a map of the memory resources in the global coherency domain of the\r
 \r
 /**\r
   Returns a map of the memory resources in the global coherency domain of the\r


@@ -353,8 +347,7 @@ EFI_STATUS
 (EFIAPI *EFI_GET_MEMORY_SPACE_MAP)(\r
   OUT UINTN                            *NumberOfDescriptors,\r
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  **MemorySpaceMap\r
 (EFIAPI *EFI_GET_MEMORY_SPACE_MAP)(\r
   OUT UINTN                            *NumberOfDescriptors,\r
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  **MemorySpaceMap\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Adds reserved I/O or I/O resources to the global coherency domain of the processor.\r
 \r
 /**\r
   Adds reserved I/O or I/O resources to the global coherency domain of the processor.\r


@@ -386,8 +379,7 @@ EFI_STATUS
   IN EFI_GCD_IO_TYPE       GcdIoType,\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r
   IN EFI_GCD_IO_TYPE       GcdIoType,\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Allocates nonexistent I/O, reserved I/O, or I/O resources from the global coherency\r
 \r
 /**\r
   Allocates nonexistent I/O, reserved I/O, or I/O resources from the global coherency\r


@@ -423,8 +415,7 @@ EFI_STATUS
   IN OUT EFI_PHYSICAL_ADDRESS                *BaseAddress,\r
   IN     EFI_HANDLE                          ImageHandle,\r
   IN     EFI_HANDLE                          DeviceHandle OPTIONAL\r
   IN OUT EFI_PHYSICAL_ADDRESS                *BaseAddress,\r
   IN     EFI_HANDLE                          ImageHandle,\r
   IN     EFI_HANDLE                          DeviceHandle OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Frees nonexistent I/O, reserved I/O, or I/O resources from the global coherency\r
 \r
 /**\r
   Frees nonexistent I/O, reserved I/O, or I/O resources from the global coherency\r


@@ -449,8 +440,7 @@ EFI_STATUS
 (EFIAPI *EFI_FREE_IO_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r
 (EFIAPI *EFI_FREE_IO_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Removes reserved I/O or I/O resources from the global coherency domain of the\r
 \r
 /**\r
   Removes reserved I/O or I/O resources from the global coherency domain of the\r


@@ -480,8 +470,7 @@ EFI_STATUS
 (EFIAPI *EFI_REMOVE_IO_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r
 (EFIAPI *EFI_REMOVE_IO_SPACE)(\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,\r
   IN UINT64                Length\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the descriptor for an I/O region containing a specified address.\r
 \r
 /**\r
   Retrieves the descriptor for an I/O region containing a specified address.\r


@@ -500,8 +489,7 @@ EFI_STATUS
 (EFIAPI *EFI_GET_IO_SPACE_DESCRIPTOR)(\r
   IN  EFI_PHYSICAL_ADDRESS         BaseAddress,\r
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  *Descriptor\r
 (EFIAPI *EFI_GET_IO_SPACE_DESCRIPTOR)(\r
   IN  EFI_PHYSICAL_ADDRESS         BaseAddress,\r
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  *Descriptor\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns a map of the I/O resources in the global coherency domain of the processor.\r
 \r
 /**\r
   Returns a map of the I/O resources in the global coherency domain of the processor.\r


@@ -523,8 +511,7 @@ EFI_STATUS
 (EFIAPI *EFI_GET_IO_SPACE_MAP)(\r
   OUT UINTN                        *NumberOfDescriptors,\r
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  **IoSpaceMap\r
 (EFIAPI *EFI_GET_IO_SPACE_MAP)(\r
   OUT UINTN                        *NumberOfDescriptors,\r
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  **IoSpaceMap\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -548,8 +535,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_DISPATCH)(\r
   VOID\r
 EFI_STATUS\r
 (EFIAPI *EFI_DISPATCH)(\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clears the Schedule on Request (SOR) flag for a component that is stored in a firmware volume.\r
 \r
 /**\r
   Clears the Schedule on Request (SOR) flag for a component that is stored in a firmware volume.\r


@@ -567,8 +553,7 @@ EFI_STATUS
 (EFIAPI *EFI_SCHEDULE)(\r
   IN EFI_HANDLE  FirmwareVolumeHandle,\r
   IN CONST EFI_GUID    *FileName\r
 (EFIAPI *EFI_SCHEDULE)(\r
   IN EFI_HANDLE  FirmwareVolumeHandle,\r
   IN CONST EFI_GUID    *FileName\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Promotes a file stored in a firmware volume from the untrusted to the trusted state.\r
 \r
 /**\r
   Promotes a file stored in a firmware volume from the untrusted to the trusted state.\r


@@ -586,8 +571,7 @@ EFI_STATUS
 (EFIAPI *EFI_TRUST)(\r
   IN EFI_HANDLE  FirmwareVolumeHandle,\r
   IN CONST EFI_GUID    *FileName\r
 (EFIAPI *EFI_TRUST)(\r
   IN EFI_HANDLE  FirmwareVolumeHandle,\r
   IN CONST EFI_GUID    *FileName\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Creates a firmware volume handle for a firmware volume that is present in system memory.\r
 \r
 /**\r
   Creates a firmware volume handle for a firmware volume that is present in system memory.\r


@@ -613,8 +597,7 @@ EFI_STATUS
   IN CONST VOID                       *FirmwareVolumeHeader,\r
   IN UINTN                            Size,\r
   OUT EFI_HANDLE                      *FirmwareVolumeHandle\r
   IN CONST VOID                       *FirmwareVolumeHeader,\r
   IN UINTN                            Size,\r
   OUT EFI_HANDLE                      *FirmwareVolumeHandle\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // DXE Services Table\r
 \r
 //\r
 // DXE Services Table\r

diff --git a/MdePkg/Include/Protocol/Arp.h b/MdePkg/Include/Protocol/Arp.h
index 9527ad51af24fc710109b7a8af750cc14d157fbf..21d815668907abe47ffe17c6a9f0be4bdd9acc27 100644 (file)
--- a/MdePkg/Include/Protocol/Arp.h
+++ b/MdePkg/Include/Protocol/Arp.h
@@ -75,8 +75,7 @@ EFI_STATUS
 (EFIAPI *EFI_ARP_CONFIGURE)(\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN EFI_ARP_CONFIG_DATA    *ConfigData   OPTIONAL\r
 (EFIAPI *EFI_ARP_CONFIGURE)(\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN EFI_ARP_CONFIG_DATA    *ConfigData   OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Inserts an entry to the ARP cache.\r
 \r
 /**\r
   Inserts an entry to the ARP cache.\r


@@ -115,8 +114,7 @@ EFI_STATUS
   IN VOID                   *TargetHwAddress  OPTIONAL,\r
   IN UINT32                 TimeoutValue,\r
   IN BOOLEAN                Overwrite\r
   IN VOID                   *TargetHwAddress  OPTIONAL,\r
   IN UINT32                 TimeoutValue,\r
   IN BOOLEAN                Overwrite\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Locates one or more entries in the ARP cache.\r
 \r
 /**\r
   Locates one or more entries in the ARP cache.\r


@@ -152,8 +150,7 @@ EFI_STATUS
   OUT UINT32                *EntryCount       OPTIONAL,\r
   OUT EFI_ARP_FIND_DATA     **Entries         OPTIONAL,\r
   IN BOOLEAN                Refresh\r
   OUT UINT32                *EntryCount       OPTIONAL,\r
   OUT EFI_ARP_FIND_DATA     **Entries         OPTIONAL,\r
   IN BOOLEAN                Refresh\r

-  )\r
-;  \r
+  );  \r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -177,8 +174,7 @@ EFI_STATUS
   IN EFI_ARP_PROTOCOL       *This,\r
   IN BOOLEAN                BySwAddress,\r
   IN VOID                   *AddressBuffer   OPTIONAL\r
   IN EFI_ARP_PROTOCOL       *This,\r
   IN BOOLEAN                BySwAddress,\r
   IN VOID                   *AddressBuffer   OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Removes all dynamic ARP cache entries that were added by this interface.\r
 \r
 /**\r
   Removes all dynamic ARP cache entries that were added by this interface.\r


@@ -195,8 +191,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FLUSH)(\r
   IN EFI_ARP_PROTOCOL       *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_ARP_FLUSH)(\r
   IN EFI_ARP_PROTOCOL       *This\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Starts an ARP request session.\r
 \r
 /**\r
   Starts an ARP request session.\r


@@ -229,8 +224,7 @@ EFI_STATUS
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL,\r
   OUT VOID                  *TargetHwAddress  \r
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL,\r
   OUT VOID                  *TargetHwAddress  \r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Cancels an ARP request session.\r
 \r
 /**\r
   Cancels an ARP request session.\r


@@ -254,8 +248,7 @@ EFI_STATUS
   IN EFI_ARP_PROTOCOL       *This, \r
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL\r
   IN EFI_ARP_PROTOCOL       *This, \r
   IN VOID                   *TargetSwAddress  OPTIONAL,\r
   IN EFI_EVENT              ResolvedEvent     OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/AuthenticationInfo.h b/MdePkg/Include/Protocol/AuthenticationInfo.h
index df2a2195169a3603ecf76dce5d3deecd8541f67b..592561394a380c6078de8f1646b8940dd4810ea6 100644 (file)
--- a/MdePkg/Include/Protocol/AuthenticationInfo.h
+++ b/MdePkg/Include/Protocol/AuthenticationInfo.h
@@ -84,8 +84,7 @@ EFI_STATUS
   IN  EFI_AUTHENTICATION_INFO_PROTOCOL *This,\r
   IN  EFI_HANDLE                       *ControllerHandle,\r
   OUT VOID                             *Buffer\r
   IN  EFI_AUTHENTICATION_INFO_PROTOCOL *This,\r
   IN  EFI_HANDLE                       *ControllerHandle,\r
   OUT VOID                             *Buffer\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Set the Authentication information for a given controller handle.\r
 \r
 /**\r
   Set the Authentication information for a given controller handle.\r


@@ -108,8 +107,7 @@ EFI_STATUS
   IN EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
   IN EFI_HANDLE                        *ControllerHandle,\r
   IN VOID                              *Buffer\r
   IN EFI_AUTHENTICATION_INFO_PROTOCOL  *This,\r
   IN EFI_HANDLE                        *ControllerHandle,\r
   IN VOID                              *Buffer\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h
index 32fe4ef41fb89ca8a37f112683d8853cc6e491dd..8584610a2c2cd427b0b65c555b824fd45eb7994b 100644 (file)
--- a/MdePkg/Include/Protocol/BlockIo.h
+++ b/MdePkg/Include/Protocol/BlockIo.h
@@ -51,8 +51,7 @@ EFI_STATUS
 (EFIAPI *EFI_BLOCK_RESET)(\r
   IN EFI_BLOCK_IO_PROTOCOL          *This,\r
   IN BOOLEAN                        ExtendedVerification\r
 (EFIAPI *EFI_BLOCK_RESET)(\r
   IN EFI_BLOCK_IO_PROTOCOL          *This,\r
   IN BOOLEAN                        ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r
 \r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r


@@ -80,8 +79,7 @@ EFI_STATUS
   IN EFI_LBA                        Lba,\r
   IN UINTN                          BufferSize,\r
   OUT VOID                          *Buffer\r
   IN EFI_LBA                        Lba,\r
   IN UINTN                          BufferSize,\r
   OUT VOID                          *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write BufferSize bytes from Lba into Buffer.\r
 \r
 /**\r
   Write BufferSize bytes from Lba into Buffer.\r


@@ -110,8 +108,7 @@ EFI_STATUS
   IN EFI_LBA                        Lba,\r
   IN UINTN                          BufferSize,\r
   IN VOID                           *Buffer\r
   IN EFI_LBA                        Lba,\r
   IN UINTN                          BufferSize,\r
   IN VOID                           *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Flush the Block Device.\r
 \r
 /**\r
   Flush the Block Device.\r


@@ -127,8 +124,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_BLOCK_FLUSH)(\r
   IN EFI_BLOCK_IO_PROTOCOL  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_BLOCK_FLUSH)(\r
   IN EFI_BLOCK_IO_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Block IO read only mode data and updated only via members of BlockIO\r
 \r
 /**\r
   Block IO read only mode data and updated only via members of BlockIO\r

diff --git a/MdePkg/Include/Protocol/DevicePathFromText.h b/MdePkg/Include/Protocol/DevicePathFromText.h
index d00614b21d0c6eb51be8679eaf06ebb1a126220d..7c4a16148304b232916867434bd6e3c62bda082a 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathFromText.h
+++ b/MdePkg/Include/Protocol/DevicePathFromText.h
@@ -41,8 +41,7 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_NODE)(\r
   IN CONST CHAR16                 *TextDeviceNode\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_NODE)(\r
   IN CONST CHAR16                 *TextDeviceNode\r

-  )\r
-;    \r
+  );    \r

   \r
 \r
 /**\r
   \r
 \r
 /**\r


@@ -60,8 +59,7 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_PATH)(\r
   IN CONST CHAR16                 *TextDevicePath\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_FROM_TEXT_PATH)(\r
   IN CONST CHAR16                 *TextDevicePath\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/DevicePathToText.h b/MdePkg/Include/Protocol/DevicePathToText.h
index 8e03c7f2fb83f4c3bcb8eeb31a7581ac72ed3166..4a8353181fbe75085a460079308ee6b40d911917 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathToText.h
+++ b/MdePkg/Include/Protocol/DevicePathToText.h
@@ -47,8 +47,7 @@ CHAR16*
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DeviceNode,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DeviceNode,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r

-  )\r
-;      \r
+  );      \r

 \r
 /**\r
   Convert a device path to its text representation.\r
 \r
 /**\r
   Convert a device path to its text representation.\r


@@ -71,8 +70,7 @@ CHAR16*
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
   IN BOOLEAN                          DisplayOnly,\r
   IN BOOLEAN                          AllowShortcuts\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/DevicePathUtilities.h b/MdePkg/Include/Protocol/DevicePathUtilities.h
index 830f52e5c573a212ebbe3ab1ebff01e28c622262..44e88ee315bb23845395d30ec706cb88cc2cdee2 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePathUtilities.h
+++ b/MdePkg/Include/Protocol/DevicePathUtilities.h
@@ -39,8 +39,7 @@ typedef
 UINTN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
 UINTN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r

-  )\r
-;    \r
+  );    \r

   \r
 \r
 /**\r
   \r
 \r
 /**\r


@@ -56,8 +55,7 @@ typedef
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
 EFI_DEVICE_PATH_PROTOCOL*\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath\r

-  )\r
-;      \r
+  );      \r

 \r
 /**\r
   Create a new path by appending the second device path to the first.\r
 \r
 /**\r
   Create a new path by appending the second device path to the first.\r


@@ -75,8 +73,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src1,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src2\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_PATH)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src1,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *Src2\r

-  )\r
-;     \r
+  );     \r

   \r
 /**\r
   Creates a new path by appending the device node to the device path.\r
   \r
 /**\r
   Creates a new path by appending the device node to the device path.\r


@@ -94,8 +91,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_NODE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DeviceNode\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_NODE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DeviceNode\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Creates a new path by appending the specified device path instance to the specified device path.\r
 \r
 /**\r
   Creates a new path by appending the specified device path instance to the specified device path.\r


@@ -112,8 +108,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePathInstance\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r
 \r
 /**\r
   Creates a copy of the current device path instance and returns a pointer to the next device path\r


@@ -135,8 +130,7 @@ EFI_DEVICE_PATH_PROTOCOL*
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE)(\r
   IN  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathInstance,\r
   OUT UINTN                         *DevicePathInstanceSize\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE)(\r
   IN  OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePathInstance,\r
   OUT UINTN                         *DevicePathInstanceSize\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Creates a device node\r
 \r
 /**\r
   Creates a device node\r


@@ -159,8 +153,7 @@ EFI_DEVICE_PATH_PROTOCOL*
   IN UINT8                          NodeType,\r
   IN UINT8                          NodeSubType,\r
   IN UINT16                         NodeLength\r
   IN UINT8                          NodeType,\r
   IN UINT8                          NodeSubType,\r
   IN UINT16                         NodeLength\r

-)\r
-;   \r
+);   \r

 \r
 /**\r
   Returns whether a device path is multi-instance.\r
 \r
 /**\r
   Returns whether a device path is multi-instance.\r


@@ -175,8 +168,7 @@ typedef
 BOOLEAN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath\r
 BOOLEAN\r
 (EFIAPI *EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE)(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath\r

-  )\r
-;                                                                                                       \r
+  );                                                                                                       \r

   \r
 /**\r
   @par Protocol Description:\r
   \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Dhcp4.h b/MdePkg/Include/Protocol/Dhcp4.h
index 95c7701ed08afd3d7dfa4942aa70d7aeb246b7e8..e7fc60ecde91646b589805a87c43e390a927286b 100644 (file)
--- a/MdePkg/Include/Protocol/Dhcp4.h
+++ b/MdePkg/Include/Protocol/Dhcp4.h
@@ -199,8 +199,7 @@ EFI_STATUS
 (EFIAPI *EFI_DHCP4_GET_MODE_DATA)(\r
   IN  EFI_DHCP4_PROTOCOL      *This,\r
   OUT EFI_DHCP4_MODE_DATA     *Dhcp4ModeData\r
 (EFIAPI *EFI_DHCP4_GET_MODE_DATA)(\r
   IN  EFI_DHCP4_PROTOCOL      *This,\r
   OUT EFI_DHCP4_MODE_DATA     *Dhcp4ModeData\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initializes, changes, or resets the operational settings for the EFI DHCPv4 Protocol driver.\r
 \r
 /**\r
   Initializes, changes, or resets the operational settings for the EFI DHCPv4 Protocol driver.\r


@@ -226,8 +225,7 @@ EFI_STATUS
 (EFIAPI *EFI_DHCP4_CONFIGURE)(\r
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN EFI_DHCP4_CONFIG_DATA    *Dhcp4CfgData  OPTIONAL\r
 (EFIAPI *EFI_DHCP4_CONFIGURE)(\r
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN EFI_DHCP4_CONFIG_DATA    *Dhcp4CfgData  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -261,8 +259,7 @@ EFI_STATUS
 (EFIAPI *EFI_DHCP4_START)(\r
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN EFI_EVENT                CompletionEvent   OPTIONAL\r
 (EFIAPI *EFI_DHCP4_START)(\r
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN EFI_EVENT                CompletionEvent   OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Extends the lease time by sending a request packet.\r
 \r
 /**\r
   Extends the lease time by sending a request packet.\r


@@ -296,8 +293,7 @@ EFI_STATUS
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN BOOLEAN                  RebindRequest,\r
   IN EFI_EVENT                CompletionEvent  OPTIONAL\r
   IN EFI_DHCP4_PROTOCOL       *This,\r
   IN BOOLEAN                  RebindRequest,\r
   IN EFI_EVENT                CompletionEvent  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Releases the current address configuration.\r
 \r
 /**\r
   Releases the current address configuration.\r


@@ -314,8 +310,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP4_RELEASE)(\r
   IN EFI_DHCP4_PROTOCOL       *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP4_RELEASE)(\r
   IN EFI_DHCP4_PROTOCOL       *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stops the current address configuration.\r
 \r
 /**\r
   Stops the current address configuration.\r


@@ -330,8 +325,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP4_STOP)(\r
   IN EFI_DHCP4_PROTOCOL       *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP4_STOP)(\r
   IN EFI_DHCP4_PROTOCOL       *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Builds a DHCP packet, given the options to be appended or deleted or replaced.\r
 \r
 /**\r
   Builds a DHCP packet, given the options to be appended or deleted or replaced.\r


@@ -365,8 +359,7 @@ EFI_STATUS
   IN  UINT32                  AppendCount,\r
   IN  EFI_DHCP4_PACKET_OPTION *AppendList[]       OPTIONAL,\r
   OUT EFI_DHCP4_PACKET        **NewPacket\r
   IN  UINT32                  AppendCount,\r
   IN  EFI_DHCP4_PACKET_OPTION *AppendList[]       OPTIONAL,\r
   OUT EFI_DHCP4_PACKET        **NewPacket\r

-  )\r
-;\r
+  );\r

 /**\r
   Transmits a DHCP formatted packet and optionally waits for responses.\r
 \r
 /**\r
   Transmits a DHCP formatted packet and optionally waits for responses.\r
 \r


@@ -387,8 +380,7 @@ EFI_STATUS
 (EFIAPI *EFI_DHCP4_TRANSMIT_RECEIVE)(\r
   IN EFI_DHCP4_PROTOCOL                *This,\r
   IN EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token\r
 (EFIAPI *EFI_DHCP4_TRANSMIT_RECEIVE)(\r
   IN EFI_DHCP4_PROTOCOL                *This,\r
   IN EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -417,8 +409,7 @@ EFI_STATUS
   IN EFI_DHCP4_PACKET          *Packet,\r
   IN OUT UINT32                *OptionCount,\r
   OUT EFI_DHCP4_PACKET_OPTION  *PacketOptionList[]  OPTIONAL\r
   IN EFI_DHCP4_PACKET          *Packet,\r
   IN OUT UINT32                *OptionCount,\r
   OUT EFI_DHCP4_PACKET_OPTION  *PacketOptionList[]  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h
index a9f1b96032f300fa0c1ef486786cc956e3b00348..fbf4384874d6fe241d08c8b1e268021e4cca23ff 100644 (file)
--- a/MdePkg/Include/Protocol/DiskIo.h
+++ b/MdePkg/Include/Protocol/DiskIo.h
@@ -61,8 +61,7 @@ EFI_STATUS
   IN UINT64                       Offset,\r
   IN UINTN                        BufferSize,\r
   OUT VOID                        *Buffer\r
   IN UINT64                       Offset,\r
   IN UINTN                        BufferSize,\r
   OUT VOID                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read BufferSize bytes from Offset into Buffer.\r
 \r
 /**\r
   Read BufferSize bytes from Offset into Buffer.\r


@@ -90,8 +89,7 @@ EFI_STATUS
   IN UINT64                       Offset,\r
   IN UINTN                        BufferSize,\r
   IN VOID                         *Buffer\r
   IN UINT64                       Offset,\r
   IN UINTN                        BufferSize,\r
   IN VOID                         *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000\r
 \r
 \r
 #define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000\r
 \r

diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/MdePkg/Include/Protocol/DriverBinding.h
index 7e0cbbda5862ea275a96245cb7973165138aeada..46e85c89d26b9193f3a7d5df91fb4e788f17ad79 100644 (file)
--- a/MdePkg/Include/Protocol/DriverBinding.h
+++ b/MdePkg/Include/Protocol/DriverBinding.h
@@ -49,8 +49,7 @@ EFI_STATUS
   IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
   IN EFI_HANDLE                             ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r
   IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
   IN EFI_HANDLE                             ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Start this driver on ControllerHandle.\r
 \r
 /**\r
   Start this driver on ControllerHandle.\r


@@ -71,8 +70,7 @@ EFI_STATUS
   IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
   IN EFI_HANDLE                             ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r
   IN EFI_DRIVER_BINDING_PROTOCOL            *This,\r
   IN EFI_HANDLE                             ControllerHandle,\r
   IN EFI_DEVICE_PATH_PROTOCOL               *RemainingDevicePath OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stop this driver on ControllerHandle.\r
 \r
 /**\r
   Stop this driver on ControllerHandle.\r


@@ -94,8 +92,7 @@ EFI_STATUS
   IN  EFI_HANDLE                            ControllerHandle,\r
   IN  UINTN                                 NumberOfChildren,\r
   IN  EFI_HANDLE                            *ChildHandleBuffer OPTIONAL\r
   IN  EFI_HANDLE                            ControllerHandle,\r
   IN  UINTN                                 NumberOfChildren,\r
   IN  EFI_HANDLE                            *ChildHandleBuffer OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Interface structure for the ControllerHandle Driver Protocol\r
 \r
 //\r
 // Interface structure for the ControllerHandle Driver Protocol\r

diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protocol/EdidOverride.h
index 7ed938afa8efd181356f047189e43d70610b86e6..8a14e9766667b6d2f520ad9e2d24182b7ba9cc76 100644 (file)
--- a/MdePkg/Include/Protocol/EdidOverride.h
+++ b/MdePkg/Include/Protocol/EdidOverride.h
@@ -54,8 +54,7 @@ EFI_STATUS
   OUT UINT32                              *Attributes,\r
   IN OUT UINTN                            *EdidSize,\r
   IN OUT UINT8                            **Edid\r
   OUT UINT32                              *Attributes,\r
   IN OUT UINTN                            *EdidSize,\r
   IN OUT UINT8                            **Edid\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/MdePkg/Include/Protocol/GraphicsOutput.h
index 110691328e5d0e426eb24c5842e7f35a88436487..c1340301b535ea0fff4d92639f91d0906311d046 100644 (file)
--- a/MdePkg/Include/Protocol/GraphicsOutput.h
+++ b/MdePkg/Include/Protocol/GraphicsOutput.h
@@ -72,8 +72,7 @@ EFI_STATUS
   IN  UINT32                                ModeNumber,\r
   OUT UINTN                                 *SizeOfInfo,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   IN  UINT32                                ModeNumber,\r
   OUT UINTN                                 *SizeOfInfo,\r
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Return the current video mode information.\r
 \r
 /**\r
   Return the current video mode information.\r


@@ -91,8 +90,7 @@ EFI_STATUS
 (EFIAPI *EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE)(\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
   IN  UINT32                       ModeNumber\r
 (EFIAPI *EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE)(\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
   IN  UINT32                       ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   UINT8 Blue;\r
 \r
 typedef struct {\r
   UINT8 Blue;\r

diff --git a/MdePkg/Include/Protocol/Hash.h b/MdePkg/Include/Protocol/Hash.h
index 3a30c62afd56aa00afb870ad3c71c92c88c4f113..bb4d6515816927ef71fcdde6d609230da90ca886 100644 (file)
--- a/MdePkg/Include/Protocol/Hash.h
+++ b/MdePkg/Include/Protocol/Hash.h
@@ -97,8 +97,7 @@ EFI_STATUS
   IN  CONST EFI_HASH_PROTOCOL     *This,\r
   IN  CONST EFI_GUID              *HashAlgorithm,\r
   OUT UINTN                       *HashSize\r
   IN  CONST EFI_HASH_PROTOCOL     *This,\r
   IN  CONST EFI_GUID              *HashAlgorithm,\r
   OUT UINTN                       *HashSize\r

-  )\r
-;      \r
+  );      \r

 \r
 /**\r
   Returns the size of the hash which results from a specific algorithm.\r
 \r
 /**\r
   Returns the size of the hash which results from a specific algorithm.\r


@@ -127,8 +126,7 @@ EFI_STATUS
   IN CONST UINT8                  *Message,\r
   IN UINT64                       MessageSize,\r
   IN OUT EFI_HASH_OUTPUT          *Hash\r
   IN CONST UINT8                  *Message,\r
   IN UINT64                       MessageSize,\r
   IN OUT EFI_HASH_OUTPUT          *Hash\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   @par Protocol Description:\r
 \r
 /**\r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/HiiConfigRouting.h b/MdePkg/Include/Protocol/HiiConfigRouting.h
index 535723936c0487036efb92fd1af96ce91d1ed133..176e09604f7c2c16b19bd13629a3a91253b02602 100644 (file)
--- a/MdePkg/Include/Protocol/HiiConfigRouting.h
+++ b/MdePkg/Include/Protocol/HiiConfigRouting.h
@@ -389,8 +389,7 @@ EFI_STATUS
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,  \r
   IN  CONST UINT16                             *AltCfgId,\r
   OUT EFI_STRING                               *AltCfgResp \r
   IN  CONST EFI_DEVICE_PATH_PROTOCOL           *DevicePath,  \r
   IN  CONST UINT16                             *AltCfgId,\r
   OUT EFI_STRING                               *AltCfgResp \r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Protocol Description:   \r
 \r
 /**\r
   @par Protocol Description:   \r

diff --git a/MdePkg/Include/Protocol/IScsiInitiatorName.h b/MdePkg/Include/Protocol/IScsiInitiatorName.h
index 009610c70a35f8083c8bdae386b6b117a326e9f4..e760bff416fdb3a62770936ffb434f9969842a47 100644 (file)
--- a/MdePkg/Include/Protocol/IScsiInitiatorName.h
+++ b/MdePkg/Include/Protocol/IScsiInitiatorName.h
@@ -44,8 +44,7 @@ EFI_STATUS
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   OUT VOID                             *Buffer\r
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   OUT VOID                             *Buffer\r

-  )\r
-;\r
+  );\r

 \r
   \r
 \r
 \r
   \r
 \r


@@ -70,8 +69,7 @@ typedef EFI_STATUS
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   IN VOID                              *Buffer\r
   IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This,\r
   IN OUT UINTN                         *BufferSize,\r
   IN VOID                              *Buffer\r

-  )\r
-;  \r
+  );  \r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Ip4.h b/MdePkg/Include/Protocol/Ip4.h
index d3576acc7d0637a9e3a259ca867b69556aeb6486..215a3ceef19e9af56a76ffefd34db53daf2bf3c9 100644 (file)
--- a/MdePkg/Include/Protocol/Ip4.h
+++ b/MdePkg/Include/Protocol/Ip4.h
@@ -177,8 +177,7 @@ EFI_STATUS
   OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
   OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Assigns an IPv4 address and subnet mask to this EFI IPv4 Protocol driver instance.\r
 \r
 /**\r
   Assigns an IPv4 address and subnet mask to this EFI IPv4 Protocol driver instance.\r


@@ -208,8 +207,7 @@ EFI_STATUS
 (EFIAPI *EFI_IP4_CONFIGURE)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN EFI_IP4_CONFIG_DATA *IpConfigData     OPTIONAL\r
 (EFIAPI *EFI_IP4_CONFIGURE)(\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN EFI_IP4_CONFIG_DATA *IpConfigData     OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Joins and leaves multicast groups.\r
 \r
 /**\r
   Joins and leaves multicast groups.\r


@@ -241,8 +239,7 @@ EFI_STATUS
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             JoinFlag,\r
   IN EFI_IPv4_ADDRESS    *GroupAddress  OPTIONAL\r
   IN EFI_IP4_PROTOCOL    *This,\r
   IN BOOLEAN             JoinFlag,\r
   IN EFI_IPv4_ADDRESS    *GroupAddress  OPTIONAL\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
 /**\r
   Adds and deletes routing table entries.\r


@@ -281,8 +278,7 @@ EFI_STATUS
   IN EFI_IPv4_ADDRESS    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS    *SubnetMask,\r
   IN EFI_IPv4_ADDRESS    *GatewayAddress  \r
   IN EFI_IPv4_ADDRESS    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS    *SubnetMask,\r
   IN EFI_IPv4_ADDRESS    *GatewayAddress  \r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Places outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Places outgoing data packets into the transmit queue.\r


@@ -314,8 +310,7 @@ EFI_STATUS
 (EFIAPI *EFI_IP4_TRANSMIT)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_IP4_TRANSMIT)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   Places a receiving request into the receiving queue.\r
 \r
 /**\r
   Places a receiving request into the receiving queue.\r


@@ -346,8 +341,7 @@ EFI_STATUS
 (EFIAPI *EFI_IP4_RECEIVE)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_IP4_RECEIVE)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token\r

-  )\r
-;      \r
+  );      \r

 \r
 /**\r
   Abort an asynchronous transmit or receive request.\r
 \r
 /**\r
   Abort an asynchronous transmit or receive request.\r


@@ -376,8 +370,7 @@ EFI_STATUS
 (EFIAPI *EFI_IP4_CANCEL)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token OPTIONAL\r
 (EFIAPI *EFI_IP4_CANCEL)(\r
   IN EFI_IP4_PROTOCOL          *This,\r
   IN EFI_IP4_COMPLETION_TOKEN  *Token OPTIONAL\r

-  )\r
-;      \r
+  );      \r

   \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
   \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r


@@ -399,8 +392,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_POLL)(\r
   IN EFI_IP4_PROTOCOL          *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_POLL)(\r
   IN EFI_IP4_PROTOCOL          *This\r

-  )\r
-;  \r
+  );  \r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Ip4Config.h b/MdePkg/Include/Protocol/Ip4Config.h
index 6dc9e615bc4006ed60ab3cea32a80ab15b1d1f45..444be530ce12bd172f35342606edcc2b5a7bfce7 100644 (file)
--- a/MdePkg/Include/Protocol/Ip4Config.h
+++ b/MdePkg/Include/Protocol/Ip4Config.h
@@ -65,8 +65,7 @@ EFI_STATUS
   IN EFI_IP4_CONFIG_PROTOCOL   *This,\r
   IN EFI_EVENT                 DoneEvent,\r
   IN EFI_EVENT                 ReconfigEvent\r
   IN EFI_IP4_CONFIG_PROTOCOL   *This,\r
   IN EFI_EVENT                 DoneEvent,\r
   IN EFI_EVENT                 ReconfigEvent\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Stops running the configuration policy for the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Stops running the configuration policy for the EFI IPv4 Protocol driver.\r


@@ -82,8 +81,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIG_STOP)(\r
   IN EFI_IP4_CONFIG_PROTOCOL   *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_CONFIG_STOP)(\r
   IN EFI_IP4_CONFIG_PROTOCOL   *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns the default configuration data (if any) for the EFI IPv4 Protocol driver.\r
 \r
 /**\r
   Returns the default configuration data (if any) for the EFI IPv4 Protocol driver.\r


@@ -110,8 +108,7 @@ EFI_STATUS
   IN EFI_IP4_CONFIG_PROTOCOL   *This,\r
   IN OUT UINTN                 *IpConfigDataSize,\r
   OUT EFI_IP4_IPCONFIG_DATA    *IpConfigData    OPTIONAL\r
   IN EFI_IP4_CONFIG_PROTOCOL   *This,\r
   IN OUT UINTN                 *IpConfigDataSize,\r
   OUT EFI_IP4_IPCONFIG_DATA    *IpConfigData    OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 8ee5128277d0e0fdd95fce2ac30af429b7aeb870..6e5e65ae0c2a241e04be230e6af2f1d7589bb425 100644 (file)
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -74,8 +74,7 @@ EFI_STATUS
   IN BOOLEAN                          BootPolicy,\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *Buffer OPTIONAL\r
   IN BOOLEAN                          BootPolicy,\r
   IN OUT UINTN                        *BufferSize,\r
   IN VOID                             *Buffer OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/ManagedNetwork.h b/MdePkg/Include/Protocol/ManagedNetwork.h
index c04e6ce89ae1d958dc147dcc0c993cd9fe53e8b3..f397b6b627832d576fa4d6e8d6e71e0d6a5f5e21 100644 (file)
--- a/MdePkg/Include/Protocol/ManagedNetwork.h
+++ b/MdePkg/Include/Protocol/ManagedNetwork.h
@@ -106,8 +106,7 @@ EFI_STATUS
   IN  EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   IN  EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets or clears the operational parameters for the MNP child driver.\r
 \r
 /**\r
   Sets or clears the operational parameters for the MNP child driver.\r


@@ -133,8 +132,7 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_CONFIGURE)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
   IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL\r
 (EFIAPI *EFI_MANAGED_NETWORK_CONFIGURE)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL     *This,\r
   IN EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Translates an IP multicast address to a hardware (MAC) multicast address.\r
 \r
 /**\r
   Translates an IP multicast address to a hardware (MAC) multicast address.\r


@@ -164,8 +162,7 @@ EFI_STATUS
   IN  BOOLEAN                       Ipv6Flag,\r
   IN  EFI_IP_ADDRESS                *IpAddress,\r
   OUT EFI_MAC_ADDRESS               *MacAddress\r
   IN  BOOLEAN                       Ipv6Flag,\r
   IN  EFI_IP_ADDRESS                *IpAddress,\r
   OUT EFI_MAC_ADDRESS               *MacAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Enables and disables receive filters for multicast address.\r
 \r
 /**\r
   Enables and disables receive filters for multicast address.\r


@@ -194,8 +191,7 @@ EFI_STATUS
   IN EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
   IN BOOLEAN                       JoinFlag,\r
   IN EFI_MAC_ADDRESS               *MacAddress  OPTIONAL\r
   IN EFI_MANAGED_NETWORK_PROTOCOL  *This,\r
   IN BOOLEAN                       JoinFlag,\r
   IN EFI_MAC_ADDRESS               *MacAddress  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Places asynchronous outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Places asynchronous outgoing data packets into the transmit queue.\r


@@ -218,8 +214,7 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_TRANSMIT)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_MANAGED_NETWORK_TRANSMIT)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Places an asynchronous receiving request into the receiving queue.\r
 \r
 /**\r
   Places an asynchronous receiving request into the receiving queue.\r


@@ -245,8 +240,7 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_RECEIVE)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_MANAGED_NETWORK_RECEIVE)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -273,8 +267,7 @@ EFI_STATUS
 (EFIAPI *EFI_MANAGED_NETWORK_CANCEL)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token  OPTIONAL\r
 (EFIAPI *EFI_MANAGED_NETWORK_CANCEL)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL          *This,\r
   IN EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *Token  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r


@@ -294,8 +287,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_POLL)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL    *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_MANAGED_NETWORK_POLL)(\r
   IN EFI_MANAGED_NETWORK_PROTOCOL    *This\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Mtftp4.h b/MdePkg/Include/Protocol/Mtftp4.h
index 99ca29a148cb0e1143518e961dc88cb1336cd6c4..c69e56eafb2a559c0afb01e972d269e681df907a 100644 (file)
--- a/MdePkg/Include/Protocol/Mtftp4.h
+++ b/MdePkg/Include/Protocol/Mtftp4.h
@@ -179,8 +179,7 @@ EFI_STATUS
   IN EFI_MTFTP4_TOKEN     *Token,\r
   IN UINT16               PacketLen,\r
   IN EFI_MTFTP4_PACKET    *Paket\r
   IN EFI_MTFTP4_TOKEN     *Token,\r
   IN UINT16               PacketLen,\r
   IN EFI_MTFTP4_PACKET    *Paket\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Timeout callback funtion.            \r
 \r
 /**\r
   Timeout callback funtion.            \r


@@ -201,8 +200,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_TIMEOUT_CALLBACK)( \r
   IN EFI_MTFTP4_PROTOCOL  *This,\r
   IN EFI_MTFTP4_TOKEN     *Token\r
 (EFIAPI *EFI_MTFTP4_TIMEOUT_CALLBACK)( \r
   IN EFI_MTFTP4_PROTOCOL  *This,\r
   IN EFI_MTFTP4_TOKEN     *Token\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   a callback function that the caller provides to feed data to the\r
 \r
 /**\r
   a callback function that the caller provides to feed data to the\r


@@ -226,8 +224,7 @@ EFI_STATUS
   IN  EFI_MTFTP4_TOKEN    *Token,\r
   IN  OUT UINT16          *Length,\r
   OUT VOID                **Buffer\r
   IN  EFI_MTFTP4_TOKEN    *Token,\r
   IN  OUT UINT16          *Length,\r
   OUT VOID                **Buffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -246,8 +243,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_GET_MODE_DATA)(\r
   IN  EFI_MTFTP4_PROTOCOL     *This,\r
   OUT EFI_MTFTP4_MODE_DATA    *ModeData\r
 (EFIAPI *EFI_MTFTP4_GET_MODE_DATA)(\r
   IN  EFI_MTFTP4_PROTOCOL     *This,\r
   OUT EFI_MTFTP4_MODE_DATA    *ModeData\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -277,8 +273,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_CONFIGURE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_CONFIG_DATA    *MtftpConfigData OPTIONAL\r
 (EFIAPI *EFI_MTFTP4_CONFIGURE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_CONFIG_DATA    *MtftpConfigData OPTIONAL\r

-  )\r
-;   \r
+  );   \r

     \r
     \r
 /**\r
     \r
     \r
 /**\r


@@ -324,8 +319,7 @@ EFI_STATUS
   IN  EFI_MTFTP4_OPTION        *OptionList,\r
   OUT UINT32                   *PacketLength,\r
   OUT EFI_MTFTP4_PACKET        **Packet        OPTIONAL\r
   IN  EFI_MTFTP4_OPTION        *OptionList,\r
   OUT UINT32                   *PacketLength,\r
   OUT EFI_MTFTP4_PACKET        **Packet        OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Parses the options in an MTFTPv4 OACK packet.\r
 \r
 /**\r
   Parses the options in an MTFTPv4 OACK packet.\r


@@ -357,8 +351,7 @@ EFI_STATUS
   IN  EFI_MTFTP4_PACKET        *Packet,\r
   OUT UINT32                   *OptionCount,\r
   OUT EFI_MTFTP4_OPTION        **OptionList OPTIONAL\r
   IN  EFI_MTFTP4_PACKET        *Packet,\r
   OUT UINT32                   *OptionCount,\r
   OUT EFI_MTFTP4_OPTION        **OptionList OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -384,8 +377,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_READ_FILE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r
 (EFIAPI *EFI_MTFTP4_READ_FILE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r

-  )\r
-;  \r
+  );  \r

   \r
 \r
 \r
   \r
 \r
 \r


@@ -415,8 +407,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_WRITE_FILE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r
 (EFIAPI *EFI_MTFTP4_WRITE_FILE)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r

-  )\r
-;  \r
+  );  \r

   \r
 \r
 /**\r
   \r
 \r
 /**\r


@@ -446,8 +437,7 @@ EFI_STATUS
 (EFIAPI *EFI_MTFTP4_READ_DIRECTORY)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r
 (EFIAPI *EFI_MTFTP4_READ_DIRECTORY)(\r
   IN EFI_MTFTP4_PROTOCOL       *This,\r
   IN EFI_MTFTP4_TOKEN          *Token\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r


@@ -468,8 +458,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_MTFTP4_POLL)(\r
   IN EFI_MTFTP4_PROTOCOL       *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_MTFTP4_POLL)(\r
   IN EFI_MTFTP4_PROTOCOL       *This\r

-  )\r
-;                                                                                                                 \r
+  );                                                                                                                 \r

                                                                                                                   \r
 /**  \r
   The EFI MTFTPv4 Protocol provides basic services for client-side unicast \r
                                                                                                                   \r
 /**  \r
   The EFI MTFTPv4 Protocol provides basic services for client-side unicast \r

diff --git a/MdePkg/Include/Protocol/ScsiIo.h b/MdePkg/Include/Protocol/ScsiIo.h
index 6437efb55e06fa47ce5eab7b345b11e13976a6df..93bbea6ba87a0d275ea7b31e72e9c5a05196f583 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiIo.h
+++ b/MdePkg/Include/Protocol/ScsiIo.h
@@ -96,8 +96,7 @@ EFI_STATUS
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_GET_DEVICE_TYPE)(\r
   IN  EFI_SCSI_IO_PROTOCOL            *This,\r
   OUT UINT8                           *DeviceType\r
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_GET_DEVICE_TYPE)(\r
   IN  EFI_SCSI_IO_PROTOCOL            *This,\r
   OUT UINT8                           *DeviceType\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the device location in the SCSI channel.\r
 \r
 /**\r
   Retrieves the device location in the SCSI channel.\r


@@ -118,8 +117,7 @@ EFI_STATUS
   IN EFI_SCSI_IO_PROTOCOL           *This,\r
   IN OUT UINT8                      **Target,\r
   OUT UINT64                        *Lun\r
   IN EFI_SCSI_IO_PROTOCOL           *This,\r
   IN OUT UINT8                      **Target,\r
   OUT UINT64                        *Lun\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets the SCSI Bus that the SCSI Controller is attached to.\r
 \r
 /**\r
   Resets the SCSI Bus that the SCSI Controller is attached to.\r


@@ -138,8 +136,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_RESET_BUS)(\r
   IN EFI_SCSI_IO_PROTOCOL     *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_RESET_BUS)(\r
   IN EFI_SCSI_IO_PROTOCOL     *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets the SCSI Controller that the device handle specifies.\r
 \r
 /**\r
   Resets the SCSI Controller that the device handle specifies.\r


@@ -159,8 +156,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_RESET_DEVICE)(\r
   IN EFI_SCSI_IO_PROTOCOL     *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_IO_PROTOCOL_RESET_DEVICE)(\r
   IN EFI_SCSI_IO_PROTOCOL     *This\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -217,8 +213,7 @@ EFI_STATUS
   IN EFI_SCSI_IO_PROTOCOL                   *This,\r
   IN OUT  EFI_SCSI_IO_SCSI_REQUEST_PACKET   *Packet,\r
   IN EFI_EVENT                              Event  OPTIONAL\r
   IN EFI_SCSI_IO_PROTOCOL                   *This,\r
   IN OUT  EFI_SCSI_IO_SCSI_REQUEST_PACKET   *Packet,\r
   IN EFI_EVENT                              Event  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/ScsiPassThru.h b/MdePkg/Include/Protocol/ScsiPassThru.h
index f40619311817392f832333566089a7a8d811d4a3..9ccf5321f6c1ec6f617fa5c836974214fc0bd5b9 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiPassThru.h
+++ b/MdePkg/Include/Protocol/ScsiPassThru.h
@@ -146,8 +146,7 @@ EFI_STATUS
   IN UINT64                                               Lun,\r
   IN OUT EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET           *Packet,\r
   IN EFI_EVENT                                            Event   OPTIONAL\r
   IN UINT64                                               Lun,\r
   IN OUT EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET           *Packet,\r
   IN EFI_EVENT                                            Event   OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Used to retrieve the list of legal Target IDs for SCSI devices \r
 \r
 /**\r
   Used to retrieve the list of legal Target IDs for SCSI devices \r


@@ -179,8 +178,7 @@ EFI_STATUS
   IN EFI_SCSI_PASS_THRU_PROTOCOL            *This,\r
   IN OUT UINT32                             *Target,\r
   IN OUT UINT64                             *Lun\r
   IN EFI_SCSI_PASS_THRU_PROTOCOL            *This,\r
   IN OUT UINT32                             *Target,\r
   IN OUT UINT64                             *Lun\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device \r
 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device \r


@@ -216,8 +214,7 @@ EFI_STATUS
   IN     UINT32                             Target,\r
   IN     UINT64                             Lun,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL           **DevicePath\r
   IN     UINT32                             Target,\r
   IN     UINT64                             Lun,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL           **DevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Used to translate a device path node to a Target ID and LUN.\r
 \r
 /**\r
   Used to translate a device path node to a Target ID and LUN.\r


@@ -249,8 +246,7 @@ EFI_STATUS
   IN  EFI_DEVICE_PATH_PROTOCOL              *DevicePath,\r
   OUT UINT32                                *Target,\r
   OUT UINT64                                *Lun\r
   IN  EFI_DEVICE_PATH_PROTOCOL              *DevicePath,\r
   OUT UINT32                                *Target,\r
   OUT UINT64                                *Lun\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets a SCSI channel.This operation resets all the \r
 \r
 /**\r
   Resets a SCSI channel.This operation resets all the \r


@@ -271,8 +267,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_SCSI_PASS_THRU_PROTOCOL             *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_SCSI_PASS_THRU_PROTOCOL             *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets a SCSI device that is connected to a SCSI channel.\r
 \r
 /**\r
   Resets a SCSI device that is connected to a SCSI channel.\r


@@ -299,8 +294,7 @@ EFI_STATUS
   IN EFI_SCSI_PASS_THRU_PROTOCOL             *This,\r
   IN UINT32                                  Target,\r
   IN UINT64                                  Lun\r
   IN EFI_SCSI_PASS_THRU_PROTOCOL             *This,\r
   IN UINT32                                  Target,\r
   IN UINT64                                  Lun\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/ScsiPassThruExt.h b/MdePkg/Include/Protocol/ScsiPassThruExt.h
index 7635818ff82fae7855b0f2bf9dcf96d6c9295c50..eae16ad3f1651252b2004d8087a008812430d037 100644 (file)
--- a/MdePkg/Include/Protocol/ScsiPassThruExt.h
+++ b/MdePkg/Include/Protocol/ScsiPassThruExt.h
@@ -135,8 +135,7 @@ EFI_STATUS
   IN UINT64                                         Lun,\r
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
   IN EFI_EVENT                                      Event     OPTIONAL\r
   IN UINT64                                         Lun,\r
   IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
   IN EFI_EVENT                                      Event     OPTIONAL\r

-  )\r
-;      \r
+  );      \r

 \r
 /**\r
   Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These       \r
 \r
 /**\r
   Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These       \r


@@ -170,8 +169,7 @@ EFI_STATUS
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
   IN OUT UINT8                                      **Target,\r
   IN OUT UINT64                                     *Lun\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
   IN OUT UINT8                                      **Target,\r
   IN OUT UINT64                                     *Lun\r

-  )\r
-;   \r
+  );   \r

 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device on a SCSI channel.\r
 \r
 /**\r
   Used to allocate and build a device path node for a SCSI device on a SCSI channel.\r


@@ -207,8 +205,7 @@ EFI_STATUS
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL                  **DevicePath\r
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun,\r
   IN OUT EFI_DEVICE_PATH_PROTOCOL                  **DevicePath\r

-  )\r
-;     \r
+  );     \r

 \r
 /**\r
   Used to translate a device path node to a Target ID and LUN.\r
 \r
 /**\r
   Used to translate a device path node to a Target ID and LUN.\r


@@ -236,8 +233,7 @@ EFI_STATUS
   IN EFI_DEVICE_PATH_PROTOCOL                      *DevicePath,\r
   OUT UINT8                                        **Target,\r
   OUT UINT64                                       *Lun\r
   IN EFI_DEVICE_PATH_PROTOCOL                      *DevicePath,\r
   OUT UINT8                                        **Target,\r
   OUT UINT64                                       *Lun\r

-  )\r
-;       \r
+  );       \r

 \r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r
 \r
 /**\r
   Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.\r


@@ -254,8 +250,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_RESET_CHANNEL)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This\r

-  )\r
-;    \r
+  );    \r

   \r
 /**\r
   Resets a SCSI logical unit that is connected to a SCSI channel.\r
   \r
 /**\r
   Resets a SCSI logical unit that is connected to a SCSI channel.\r


@@ -282,8 +277,7 @@ EFI_STATUS
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN UINT8                                         *Target,\r
   IN UINT64                                        Lun\r

-  )\r
-;         \r
+  );         \r

 \r
 /**\r
   Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either     \r
 \r
 /**\r
   Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either     \r


@@ -312,8 +306,7 @@ EFI_STATUS
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN OUT UINT8                                     **Target\r
 (EFIAPI *EFI_EXT_SCSI_PASS_THRU_GET_NEXT_TARGET)(\r
   IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL               *This,\r
   IN OUT UINT8                                     **Target\r

-  )\r
-;          \r
+  );          \r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Security.h b/MdePkg/Include/Protocol/Security.h
index c79c3dc52c93ca81e6bfb92c62a51d398885bb17..9028fb3511494efbb04a11d58a2b6bde15c0390f 100644 (file)
--- a/MdePkg/Include/Protocol/Security.h
+++ b/MdePkg/Include/Protocol/Security.h
@@ -89,8 +89,7 @@ EFI_STATUS
   IN EFI_SECURITY_ARCH_PROTOCOL     *This,\r
   IN  UINT32                        AuthenticationStatus,\r
   IN  EFI_DEVICE_PATH_PROTOCOL      *File\r
   IN EFI_SECURITY_ARCH_PROTOCOL     *This,\r
   IN  UINT32                        AuthenticationStatus,\r
   IN  EFI_DEVICE_PATH_PROTOCOL      *File\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Interface stucture for the Timer Architectural Protocol\r
 \r
 //\r
 // Interface stucture for the Timer Architectural Protocol\r

diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h
index cf73f87708623b1a5e4866db4beb93979de7b739..5c69f8996e273a0c0dfe007c92def65e53b95d70 100644 (file)
--- a/MdePkg/Include/Protocol/SerialIo.h
+++ b/MdePkg/Include/Protocol/SerialIo.h
@@ -97,8 +97,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SERIAL_RESET)(\r
   IN EFI_SERIAL_IO_PROTOCOL *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SERIAL_RESET)(\r
   IN EFI_SERIAL_IO_PROTOCOL *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the baud rate, receive FIFO depth, transmit/receice time out, parity, \r
 \r
 /**\r
   Sets the baud rate, receive FIFO depth, transmit/receice time out, parity, \r


@@ -136,8 +135,7 @@ EFI_STATUS
   IN EFI_PARITY_TYPE                Parity,\r
   IN UINT8                          DataBits,\r
   IN EFI_STOP_BITS_TYPE             StopBits\r
   IN EFI_PARITY_TYPE                Parity,\r
   IN UINT8                          DataBits,\r
   IN EFI_STOP_BITS_TYPE             StopBits\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the control bits on a serial device\r
 \r
 /**\r
   Set the control bits on a serial device\r


@@ -155,8 +153,7 @@ EFI_STATUS
 (EFIAPI *EFI_SERIAL_SET_CONTROL_BITS)(\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN UINT32                         Control\r
 (EFIAPI *EFI_SERIAL_SET_CONTROL_BITS)(\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN UINT32                         Control\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the status of thecontrol bits on a serial device\r
 \r
 /**\r
   Retrieves the status of thecontrol bits on a serial device\r


@@ -173,8 +170,7 @@ EFI_STATUS
 (EFIAPI *EFI_SERIAL_GET_CONTROL_BITS)(\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   OUT UINT32                        *Control\r
 (EFIAPI *EFI_SERIAL_GET_CONTROL_BITS)(\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   OUT UINT32                        *Control\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes data to a serial device.\r
 \r
 /**\r
   Writes data to a serial device.\r


@@ -195,8 +191,7 @@ EFI_STATUS
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN OUT UINTN                      *BufferSize,\r
   IN VOID                           *Buffer\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN OUT UINTN                      *BufferSize,\r
   IN VOID                           *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Writes data to a serial device.\r
 \r
 /**\r
   Writes data to a serial device.\r


@@ -217,8 +212,7 @@ EFI_STATUS
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN OUT UINTN                      *BufferSize,\r
   OUT VOID                          *Buffer\r
   IN EFI_SERIAL_IO_PROTOCOL         *This,\r
   IN OUT UINTN                      *BufferSize,\r
   OUT VOID                          *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Data Structure Description:\r
 \r
 /**\r
   @par Data Structure Description:\r

diff --git a/MdePkg/Include/Protocol/ServiceBinding.h b/MdePkg/Include/Protocol/ServiceBinding.h
index 5f37727d6e7907787768a6d27ba9b2c452855577..510ac673d9f528caa8360c66eee34c89bdc49b4b 100644 (file)
--- a/MdePkg/Include/Protocol/ServiceBinding.h
+++ b/MdePkg/Include/Protocol/ServiceBinding.h
@@ -43,8 +43,7 @@ EFI_STATUS
 (EFIAPI *EFI_SERVICE_BINDING_CREATE_CHILD)(\r
   IN     EFI_SERVICE_BINDING_PROTOCOL  *This,\r
   IN OUT EFI_HANDLE                    *ChildHandle\r
 (EFIAPI *EFI_SERVICE_BINDING_CREATE_CHILD)(\r
   IN     EFI_SERVICE_BINDING_PROTOCOL  *This,\r
   IN OUT EFI_HANDLE                    *ChildHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Destroys a child handle with a set of I/O services.\r
 \r
 /**\r
   Destroys a child handle with a set of I/O services.\r


@@ -66,8 +65,7 @@ EFI_STATUS
 (EFIAPI *EFI_SERVICE_BINDING_DESTROY_CHILD)(\r
   IN EFI_SERVICE_BINDING_PROTOCOL          *This,\r
   IN EFI_HANDLE                            ChildHandle\r
 (EFIAPI *EFI_SERVICE_BINDING_DESTROY_CHILD)(\r
   IN EFI_SERVICE_BINDING_PROTOCOL          *This,\r
   IN EFI_HANDLE                            ChildHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h
index feead3fb1a2f81b0c2627fd91c88f1327fd4edd2..bea935977762ccb1b9bf9595b4f757369b197b6f 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/MdePkg/Include/Protocol/SimpleFileSystem.h
@@ -63,8 +63,7 @@ EFI_STATUS
 (EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME)(\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL    *This,\r
   OUT EFI_FILE_PROTOCOL                 **Root\r
 (EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME)(\r
   IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL    *This,\r
   OUT EFI_FILE_PROTOCOL                 **Root\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION  0x00010000\r
 ///\r
 \r
 #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION  0x00010000\r
 ///\r


@@ -105,8 +104,7 @@ EFI_STATUS
   IN CHAR16                   *FileName,\r
   IN UINT64                   OpenMode,\r
   IN UINT64                   Attributes\r
   IN CHAR16                   *FileName,\r
   IN UINT64                   OpenMode,\r
   IN UINT64                   Attributes\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Open modes\r
 \r
 //\r
 // Open modes\r


@@ -138,8 +136,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_CLOSE)(\r
   IN EFI_FILE  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_CLOSE)(\r
   IN EFI_FILE  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Close and delete the file handle\r
 \r
 /**\r
   Close and delete the file handle\r


@@ -154,8 +151,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_DELETE)(\r
   IN EFI_FILE  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_DELETE)(\r
   IN EFI_FILE  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Read data from the file.\r
 \r
 /**\r
   Read data from the file.\r


@@ -177,8 +173,7 @@ EFI_STATUS
   IN EFI_FILE_PROTOCOL        *This,\r
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r
   IN EFI_FILE_PROTOCOL        *This,\r
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write data from to the file.\r
 \r
 /**\r
   Write data from to the file.\r


@@ -203,8 +198,7 @@ EFI_STATUS
   IN EFI_FILE_PROTOCOL        *This,\r
   IN OUT UINTN                *BufferSize,\r
   IN VOID                     *Buffer\r
   IN EFI_FILE_PROTOCOL        *This,\r
   IN OUT UINTN                *BufferSize,\r
   IN VOID                     *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set a files current position\r
 \r
 /**\r
   Set a files current position\r


@@ -221,8 +215,7 @@ EFI_STATUS
 (EFIAPI *EFI_FILE_SET_POSITION)(\r
   IN EFI_FILE_PROTOCOL        *This,\r
   IN UINT64                   Position\r
 (EFIAPI *EFI_FILE_SET_POSITION)(\r
   IN EFI_FILE_PROTOCOL        *This,\r
   IN UINT64                   Position\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get a files current position\r
 \r
 /**\r
   Get a files current position\r


@@ -239,8 +232,7 @@ EFI_STATUS
 (EFIAPI *EFI_FILE_GET_POSITION)(\r
   IN EFI_FILE_PROTOCOL        *This,\r
   OUT UINT64                  *Position\r
 (EFIAPI *EFI_FILE_GET_POSITION)(\r
   IN EFI_FILE_PROTOCOL        *This,\r
   OUT UINT64                  *Position\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Get information about a file\r
 \r
 /**\r
   Get information about a file\r


@@ -267,8 +259,7 @@ EFI_STATUS
   IN EFI_GUID                 *InformationType,\r
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r
   IN EFI_GUID                 *InformationType,\r
   IN OUT UINTN                *BufferSize,\r
   OUT VOID                    *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set information about a file\r
 \r
 /**\r
   Set information about a file\r


@@ -294,8 +285,7 @@ EFI_STATUS
   IN EFI_GUID                 *InformationType,\r
   IN UINTN                    BufferSize,\r
   IN VOID                     *Buffer\r
   IN EFI_GUID                 *InformationType,\r
   IN UINTN                    BufferSize,\r
   IN VOID                     *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Flush data back for the file handle\r
 \r
 /**\r
   Flush data back for the file handle\r


@@ -316,8 +306,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_FLUSH)(\r
   IN EFI_FILE  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_FILE_FLUSH)(\r
   IN EFI_FILE  *This\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_FILE_PROTOCOL_REVISION   0x00010000\r
 //\r
 \r
 #define EFI_FILE_PROTOCOL_REVISION   0x00010000\r
 //\r

diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h
index 3766e98f972300f67aea464204782e41724b9856..875857224165e50168b90c53f4ed6c1415b4c0c4 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/MdePkg/Include/Protocol/SimpleNetwork.h
@@ -179,8 +179,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_START)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_START)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Changes the state of a network interface from "started" to "stopped".\r
 \r
 /**\r
   Changes the state of a network interface from "started" to "stopped".\r


@@ -198,8 +197,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_STOP)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_STOP)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets a network adapter and allocates the transmit and receive buffers \r
 \r
 /**\r
   Resets a network adapter and allocates the transmit and receive buffers \r


@@ -233,8 +231,7 @@ EFI_STATUS
   IN EFI_SIMPLE_NETWORK_PROTOCOL                    *This,\r
   IN UINTN                                          ExtraRxBufferSize  OPTIONAL,\r
   IN UINTN                                          ExtraTxBufferSize  OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL                    *This,\r
   IN UINTN                                          ExtraRxBufferSize  OPTIONAL,\r
   IN UINTN                                          ExtraTxBufferSize  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets a network adapter and re-initializes it with the parameters that were \r
 \r
 /**\r
   Resets a network adapter and re-initializes it with the parameters that were \r


@@ -257,8 +254,7 @@ EFI_STATUS
 (EFIAPI *EFI_SIMPLE_NETWORK_RESET)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL   *This,\r
   IN BOOLEAN                       ExtendedVerification\r
 (EFIAPI *EFI_SIMPLE_NETWORK_RESET)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL   *This,\r
   IN BOOLEAN                       ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets a network adapter and leaves it in a state that is safe for \r
 \r
 /**\r
   Resets a network adapter and leaves it in a state that is safe for \r


@@ -277,8 +273,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_SHUTDOWN)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_SIMPLE_NETWORK_SHUTDOWN)(\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL  *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Manages the multicast receive filters of a network interface.\r
 \r
 /**\r
   Manages the multicast receive filters of a network interface.\r


@@ -313,8 +308,7 @@ EFI_STATUS
   IN BOOLEAN                                                 ResetMCastFilter,\r
   IN UINTN                                                   MCastFilterCnt     OPTIONAL,\r
   IN EFI_MAC_ADDRESS                                         *MCastFilter OPTIONAL\r
   IN BOOLEAN                                                 ResetMCastFilter,\r
   IN UINTN                                                   MCastFilterCnt     OPTIONAL,\r
   IN EFI_MAC_ADDRESS                                         *MCastFilter OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Modifies or resets the current station address, if supported.\r
 \r
 /**\r
   Modifies or resets the current station address, if supported.\r


@@ -337,8 +331,7 @@ EFI_STATUS
   IN EFI_SIMPLE_NETWORK_PROTOCOL            *This,\r
   IN BOOLEAN                                Reset,\r
   IN EFI_MAC_ADDRESS                        *New OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL            *This,\r
   IN BOOLEAN                                Reset,\r
   IN EFI_MAC_ADDRESS                        *New OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Resets or collects the statistics on a network interface.\r
 \r
 /**\r
   Resets or collects the statistics on a network interface.\r


@@ -368,8 +361,7 @@ EFI_STATUS
   IN BOOLEAN                              Reset,\r
   IN OUT UINTN                            *StatisticsSize   OPTIONAL,\r
   OUT EFI_NETWORK_STATISTICS              *StatisticsTable  OPTIONAL\r
   IN BOOLEAN                              Reset,\r
   IN OUT UINTN                            *StatisticsSize   OPTIONAL,\r
   OUT EFI_NETWORK_STATISTICS              *StatisticsTable  OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r
 \r
 /**\r
   Converts a multicast IP address to a multicast HW MAC address.\r


@@ -399,8 +391,7 @@ EFI_STATUS
   IN BOOLEAN                              IPv6,\r
   IN EFI_IP_ADDRESS                       *IP,\r
   OUT EFI_MAC_ADDRESS                     *MAC\r
   IN BOOLEAN                              IPv6,\r
   IN EFI_IP_ADDRESS                       *IP,\r
   OUT EFI_MAC_ADDRESS                     *MAC\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs read and write operations on the NVRAM device attached to a \r
 \r
 /**\r
   Performs read and write operations on the NVRAM device attached to a \r


@@ -430,8 +421,7 @@ EFI_STATUS
   IN UINTN                                Offset,\r
   IN UINTN                                BufferSize,\r
   IN OUT VOID                             *Buffer\r
   IN UINTN                                Offset,\r
   IN UINTN                                BufferSize,\r
   IN OUT VOID                             *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the current interrupt status and recycled transmit buffer status from \r
 \r
 /**\r
   Reads the current interrupt status and recycled transmit buffer status from \r


@@ -464,8 +454,7 @@ EFI_STATUS
   IN EFI_SIMPLE_NETWORK_PROTOCOL          *This,\r
   OUT UINT32                              *InterruptStatus OPTIONAL,\r
   OUT VOID                                **TxBuf OPTIONAL\r
   IN EFI_SIMPLE_NETWORK_PROTOCOL          *This,\r
   OUT UINT32                              *InterruptStatus OPTIONAL,\r
   OUT VOID                                **TxBuf OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Places a packet in the transmit queue of a network interface.\r
 \r
 /**\r
   Places a packet in the transmit queue of a network interface.\r


@@ -510,8 +499,7 @@ EFI_STATUS
   IN EFI_MAC_ADDRESS                      *SrcAddr  OPTIONAL,\r
   IN EFI_MAC_ADDRESS                      *DestAddr OPTIONAL,\r
   IN UINT16                               *Protocol OPTIONAL\r
   IN EFI_MAC_ADDRESS                      *SrcAddr  OPTIONAL,\r
   IN EFI_MAC_ADDRESS                      *DestAddr OPTIONAL,\r
   IN UINT16                               *Protocol OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Receives a packet from a network interface.\r
 \r
 /**\r
   Receives a packet from a network interface.\r


@@ -555,8 +543,7 @@ EFI_STATUS
   OUT EFI_MAC_ADDRESS                     *SrcAddr    OPTIONAL,\r
   OUT EFI_MAC_ADDRESS                     *DestAddr   OPTIONAL,\r
   OUT UINT16                              *Protocol   OPTIONAL\r
   OUT EFI_MAC_ADDRESS                     *SrcAddr    OPTIONAL,\r
   OUT EFI_MAC_ADDRESS                     *DestAddr   OPTIONAL,\r
   OUT UINT16                              *Protocol   OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION  0x00010000\r
 \r
 \r
 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION  0x00010000\r
 \r

diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index d7d58874e5e0f37d38dd5114dff076b86e0c1cf2..30905072cc5dc7c40d44e36f74d35b25be89671b 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -96,8 +96,7 @@ EFI_STATUS
 (EFIAPI *EFI_INPUT_RESET)(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   IN BOOLEAN                              ExtendedVerification\r
 (EFIAPI *EFI_INPUT_RESET)(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   IN BOOLEAN                              ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can \r
 \r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can \r


@@ -117,8 +116,7 @@ EFI_STATUS
 (EFIAPI *EFI_INPUT_READ_KEY)(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   OUT EFI_INPUT_KEY                       *Key\r
 (EFIAPI *EFI_INPUT_READ_KEY)(\r
   IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL       *This,\r
   OUT EFI_INPUT_KEY                       *Key\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index 6a00cfdb784773cf2ab321b86f40521f7e4d9ee8..607d0609a8070c85fc8328c0da1055869a2bb1b5 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -164,8 +164,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_RESET)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN BOOLEAN                                ExtendedVerification\r
 (EFIAPI *EFI_TEXT_RESET)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN BOOLEAN                                ExtendedVerification\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Write a Unicode string to the output device.\r
 \r
 /**\r
   Write a Unicode string to the output device.\r


@@ -190,8 +189,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_STRING)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN CHAR16                                 *String\r
 (EFIAPI *EFI_TEXT_STRING)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN CHAR16                                 *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Verifies that all characters in a Unicode string can be output to the \r
 \r
 /**\r
   Verifies that all characters in a Unicode string can be output to the \r


@@ -212,8 +210,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_TEST_STRING)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN CHAR16                                 *String\r
 (EFIAPI *EFI_TEXT_TEST_STRING)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN CHAR16                                 *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Returns information for an available text mode that the output device(s)\r
 \r
 /**\r
   Returns information for an available text mode that the output device(s)\r


@@ -238,8 +235,7 @@ EFI_STATUS
   IN UINTN                                  ModeNumber,\r
   OUT UINTN                                 *Columns,\r
   OUT UINTN                                 *Rows\r
   IN UINTN                                  ModeNumber,\r
   OUT UINTN                                 *Columns,\r
   OUT UINTN                                 *Rows\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the output device(s) to a specified mode.\r
 \r
 /**\r
   Sets the output device(s) to a specified mode.\r


@@ -257,8 +253,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_SET_MODE)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  ModeNumber\r
 (EFIAPI *EFI_TEXT_SET_MODE)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  ModeNumber\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the background and foreground colors for the OutputString () and\r
 \r
 /**\r
   Sets the background and foreground colors for the OutputString () and\r


@@ -279,8 +274,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_SET_ATTRIBUTE)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  Attribute\r
 (EFIAPI *EFI_TEXT_SET_ATTRIBUTE)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  Attribute\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clears the output device(s) display to the currently selected background \r
 \r
 /**\r
   Clears the output device(s) display to the currently selected background \r


@@ -297,8 +291,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_CLEAR_SCREEN)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_TEXT_CLEAR_SCREEN)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *This\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets the current coordinates of the cursor position\r
 \r
 /**\r
   Sets the current coordinates of the cursor position\r


@@ -323,8 +316,7 @@ EFI_STATUS
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  Column,\r
   IN UINTN                                  Row\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN UINTN                                  Column,\r
   IN UINTN                                  Row\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Makes the cursor visible or invisible\r
 \r
 /**\r
   Makes the cursor visible or invisible\r


@@ -345,8 +337,7 @@ EFI_STATUS
 (EFIAPI *EFI_TEXT_ENABLE_CURSOR)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN BOOLEAN                                Visible\r
 (EFIAPI *EFI_TEXT_ENABLE_CURSOR)(\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL        *This,\r
   IN BOOLEAN                                Visible\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   @par Data Structure Description:\r
 \r
 /**\r
   @par Data Structure Description:\r

diff --git a/MdePkg/Include/Protocol/TapeIo.h b/MdePkg/Include/Protocol/TapeIo.h
index a0d07661329bd29a6e2da7ec3138d50ee1de367b..8f4b8692e5ec6a201477535cc8846b7a8ce2874b 100644 (file)
--- a/MdePkg/Include/Protocol/TapeIo.h
+++ b/MdePkg/Include/Protocol/TapeIo.h
@@ -76,8 +76,7 @@ EFI_STATUS
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN OUT UINTN            *BufferSize,\r
   OUT VOID                *Buffer\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN OUT UINTN            *BufferSize,\r
   OUT VOID                *Buffer\r

-  )\r
-;    \r
+  );    \r

 \r
 /**\r
   Writes to the tape.\r
 \r
 /**\r
   Writes to the tape.\r


@@ -113,8 +112,7 @@ EFI_STATUS
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                *BufferSize,\r
   IN VOID                 *Buffer\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                *BufferSize,\r
   IN VOID                 *Buffer\r

-  )\r
-; \r
+  ); \r

   \r
 \r
 /**\r
   \r
 \r
 /**\r


@@ -135,8 +133,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_REWIND)(\r
   IN EFI_TAPE_IO_PROTOCOL *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_TAPE_REWIND)(\r
   IN EFI_TAPE_IO_PROTOCOL *This\r

-  )\r
-;   \r
+  );   \r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -166,8 +163,7 @@ EFI_STATUS
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   INTN                    Direction,\r
   UINTN                   Type\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   INTN                    Direction,\r
   UINTN                   Type\r

-  )\r
-;   \r
+  );   \r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -193,8 +189,7 @@ EFI_STATUS
 (EFIAPI *EFI_TAPE_WRITEFM)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                Count\r
 (EFIAPI *EFI_TAPE_WRITEFM)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN UINTN                Count\r

-  )\r
-;   \r
+  );   \r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -217,8 +212,7 @@ EFI_STATUS
 (EFIAPI *EFI_TAPE_RESET)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN BOOLEAN              ExtendedVerification\r
 (EFIAPI *EFI_TAPE_RESET)(\r
   IN EFI_TAPE_IO_PROTOCOL *This,\r
   IN BOOLEAN              ExtendedVerification\r

-  )\r
-;    \r
+  );    \r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Tcp4.h b/MdePkg/Include/Protocol/Tcp4.h
index 01f27fcb8b070eb60f648ee08f5105de5b008e82..fe37899f74c866471cc749ae55892f15f901007c 100644 (file)
--- a/MdePkg/Include/Protocol/Tcp4.h
+++ b/MdePkg/Include/Protocol/Tcp4.h
@@ -185,8 +185,7 @@ EFI_STATUS
   OUT       EFI_IP4_MODE_DATA                  *Ip4ModeData    OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r
   OUT       EFI_IP4_MODE_DATA                  *Ip4ModeData    OPTIONAL,\r
   OUT       EFI_MANAGED_NETWORK_CONFIG_DATA    *MnpConfigData  OPTIONAL,\r
   OUT       EFI_SIMPLE_NETWORK_MODE            *SnpModeData    OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initialize or brutally reset the operational parameters for this EFI TCPv4 instance.\r
 \r
 /**\r
   Initialize or brutally reset the operational parameters for this EFI TCPv4 instance.\r


@@ -213,8 +212,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_CONFIGURE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CONFIG_DATA                *TcpConfigData OPTIONAL\r
 (EFIAPI *EFI_TCP4_CONFIGURE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CONFIG_DATA                *TcpConfigData OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -258,8 +256,7 @@ EFI_STATUS
   IN EFI_IPv4_ADDRESS                    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS                    *SubnetMask,\r
   IN EFI_IPv4_ADDRESS                    *GatewayAddress\r
   IN EFI_IPv4_ADDRESS                    *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS                    *SubnetMask,\r
   IN EFI_IPv4_ADDRESS                    *GatewayAddress\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r
 \r
 /**\r
   Initiate a nonblocking TCP connection request for an active TCP instance.\r


@@ -288,8 +285,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_CONNECT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CONNECTION_TOKEN           *ConnectionToken\r
 (EFIAPI *EFI_TCP4_CONNECT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CONNECTION_TOKEN           *ConnectionToken\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -318,8 +314,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_ACCEPT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_LISTEN_TOKEN               *ListenToken\r
 (EFIAPI *EFI_TCP4_ACCEPT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_LISTEN_TOKEN               *ListenToken\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Queues outgoing data into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data into the transmit queue.\r


@@ -357,8 +352,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_TRANSMIT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r
 (EFIAPI *EFI_TCP4_TRANSMIT)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -401,8 +395,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_RECEIVE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r
 (EFIAPI *EFI_TCP4_RECEIVE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_IO_TOKEN                   *Token\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection. This function is a\r
 \r
 /**\r
   Disconnecting a TCP connection gracefully or reset a TCP connection. This function is a\r


@@ -432,8 +425,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_CLOSE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CLOSE_TOKEN                *CloseToken\r
 (EFIAPI *EFI_TCP4_CLOSE)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_CLOSE_TOKEN                *CloseToken\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r
 \r
 /**\r
   Abort an asynchronous connection, listen, transmission or receive request.\r


@@ -461,8 +453,7 @@ EFI_STATUS
 (EFIAPI *EFI_TCP4_CANCEL)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_COMPLETION_TOKEN           *Token OPTIONAL\r
 (EFIAPI *EFI_TCP4_CANCEL)(\r
   IN EFI_TCP4_PROTOCOL                   *This,\r
   IN EFI_TCP4_COMPLETION_TOKEN           *Token OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -482,8 +473,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_TCP4_POLL)(\r
   IN EFI_TCP4_PROTOCOL                   *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_TCP4_POLL)(\r
   IN EFI_TCP4_PROTOCOL                   *This\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Udp4.h b/MdePkg/Include/Protocol/Udp4.h
index bc95bc76b5af5225e8988711692ba95dcfab835c..8e2511faabe3fde258a9a306ae55c19cf39f9a7d 100644 (file)
--- a/MdePkg/Include/Protocol/Udp4.h
+++ b/MdePkg/Include/Protocol/Udp4.h
@@ -145,8 +145,7 @@ EFI_STATUS
   OUT EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r
   OUT EFI_IP4_MODE_DATA                *Ip4ModeData    OPTIONAL,\r
   OUT EFI_MANAGED_NETWORK_CONFIG_DATA  *MnpConfigData  OPTIONAL,\r
   OUT EFI_SIMPLE_NETWORK_MODE          *SnpModeData    OPTIONAL\r

-  )\r
-;  \r
+  );  \r

   \r
 \r
 /**\r
   \r
 \r
 /**\r


@@ -176,8 +175,7 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_CONFIGURE)(\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN EFI_UDP4_CONFIG_DATA   *UdpConfigData OPTIONAL\r
 (EFIAPI *EFI_UDP4_CONFIGURE)(\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN EFI_UDP4_CONFIG_DATA   *UdpConfigData OPTIONAL\r

-  )\r
-;  \r
+  );  \r

 \r
 /**\r
   Joins and leaves multicast groups.\r
 \r
 /**\r
   Joins and leaves multicast groups.\r


@@ -210,8 +208,7 @@ EFI_STATUS
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN BOOLEAN                JoinFlag,\r
   IN EFI_IPv4_ADDRESS       *MulticastAddress    OPTIONAL\r
   IN EFI_UDP4_PROTOCOL      *This,\r
   IN BOOLEAN                JoinFlag,\r
   IN EFI_IPv4_ADDRESS       *MulticastAddress    OPTIONAL\r

-  )\r
-;   \r
+  );   \r

 \r
 /**\r
   Adds and deletes routing table entries.\r
 \r
 /**\r
   Adds and deletes routing table entries.\r


@@ -241,8 +238,7 @@ EFI_STATUS
   IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS       *SubnetMask,\r
   IN EFI_IPv4_ADDRESS       *GatewayAddress\r
   IN EFI_IPv4_ADDRESS       *SubnetAddress,\r
   IN EFI_IPv4_ADDRESS       *SubnetMask,\r
   IN EFI_IPv4_ADDRESS       *GatewayAddress\r

-  )\r
-;     \r
+  );     \r

 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r
 \r
 /**\r
   Polls for incoming data packets and processes outgoing data packets.\r


@@ -259,8 +255,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_UDP4_POLL)(\r
   IN EFI_UDP4_PROTOCOL      *This\r
 EFI_STATUS\r
 (EFIAPI *EFI_UDP4_POLL)(\r
   IN EFI_UDP4_PROTOCOL      *This\r

-  )\r
-;   \r
+  );   \r

 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r
 \r
 /**\r
   Places an asynchronous receive request into the receiving queue.\r


@@ -287,8 +282,7 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_RECEIVE)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token\r
 (EFIAPI *EFI_UDP4_RECEIVE)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token\r

-  )\r
-;   \r
+  );   \r

 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r
 \r
 /**\r
   Queues outgoing data packets into the transmit queue.\r


@@ -318,8 +312,7 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_TRANSMIT)(\r
   IN EFI_UDP4_PROTOCOL           *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN   *Token\r
 (EFIAPI *EFI_UDP4_TRANSMIT)(\r
   IN EFI_UDP4_PROTOCOL           *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN   *Token\r

-  )\r
-;     \r
+  );     \r

 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r
 \r
 /**\r
   Aborts an asynchronous transmit or receive request.\r


@@ -347,8 +340,7 @@ EFI_STATUS
 (EFIAPI *EFI_UDP4_CANCEL)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token  OPTIONAL\r
 (EFIAPI *EFI_UDP4_CANCEL)(\r
   IN EFI_UDP4_PROTOCOL          *This,\r
   IN EFI_UDP4_COMPLETION_TOKEN  *Token  OPTIONAL\r

-  )\r
-;       \r
+  );       \r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index 8b12ca34b014c1f766f1788f23ad8bca80727165..62e77ba81544e56bd690ee9061f792c3445d4b5a 100644 (file)
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -49,8 +49,7 @@ EFI_STATUS
   OUT UINT32                *VerticalResolution,\r
   OUT UINT32                *ColorDepth,\r
   OUT UINT32                *RefreshRate\r
   OUT UINT32                *VerticalResolution,\r
   OUT UINT32                *ColorDepth,\r
   OUT UINT32                *RefreshRate\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Set the current video mode information.\r
 \r
 /**\r
   Set the current video mode information.\r


@@ -73,8 +72,7 @@ EFI_STATUS
   IN  UINT32                VerticalResolution,\r
   IN  UINT32                ColorDepth,\r
   IN  UINT32                RefreshRate\r
   IN  UINT32                VerticalResolution,\r
   IN  UINT32                ColorDepth,\r
   IN  UINT32                RefreshRate\r

-  )\r
-;\r
+  );\r

 \r
 typedef struct {\r
   UINT8 Blue;\r
 \r
 typedef struct {\r
   UINT8 Blue;\r

diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index 4ca50d56f857d96a20272d8549de1b98cf028696..696e587856f3274e3a70479bfae41978e28b1a6f 100644 (file)
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/MdePkg/Include/Protocol/UnicodeCollation.h
@@ -67,8 +67,7 @@ INTN
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN CHAR16                                 *Str1,\r
   IN CHAR16                                 *Str2\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN CHAR16                                 *Str1,\r
   IN CHAR16                                 *Str2\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Performs a case-insensitive comparison of a Null-terminated Unicode \r
 \r
 /**\r
   Performs a case-insensitive comparison of a Null-terminated Unicode \r


@@ -88,8 +87,7 @@ BOOLEAN
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN CHAR16                                 *String,\r
   IN CHAR16                                 *Pattern\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN CHAR16                                 *String,\r
   IN CHAR16                                 *Pattern\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to \r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to \r


@@ -104,8 +102,7 @@ VOID
 (EFIAPI *EFI_UNICODE_COLLATION_STRLWR)(\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN OUT CHAR16                             *Str\r
 (EFIAPI *EFI_UNICODE_COLLATION_STRLWR)(\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN OUT CHAR16                             *Str\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to upper\r
 \r
 /**\r
   Converts all the Unicode characters in a Null-terminated Unicode string to upper\r


@@ -120,8 +117,7 @@ VOID
 (EFIAPI *EFI_UNICODE_COLLATION_STRUPR)(\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN OUT CHAR16                             *Str\r
 (EFIAPI *EFI_UNICODE_COLLATION_STRUPR)(\r
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,\r
   IN OUT CHAR16                             *Str\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts an 8.3 FAT file name in an OEM character set to a Null-terminated \r
 \r
 /**\r
   Converts an 8.3 FAT file name in an OEM character set to a Null-terminated \r


@@ -142,8 +138,7 @@ VOID
   IN UINTN                                  FatSize,\r
   IN CHAR8                                  *Fat,\r
   OUT CHAR16                                *String\r
   IN UINTN                                  FatSize,\r
   IN CHAR8                                  *Fat,\r
   OUT CHAR16                                *String\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Converts a Null-terminated Unicode string to legal characters in a FAT \r
 \r
 /**\r
   Converts a Null-terminated Unicode string to legal characters in a FAT \r


@@ -167,8 +162,7 @@ BOOLEAN
   IN CHAR16                                 *String,\r
   IN UINTN                                  FatSize,\r
   OUT CHAR8                                 *Fat\r
   IN CHAR16                                 *String,\r
   IN UINTN                                  FatSize,\r
   OUT CHAR8                                 *Fat\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Include/Protocol/Usb2HostController.h b/MdePkg/Include/Protocol/Usb2HostController.h
index 54f67530dcfe8f1fdfa1a4d91e855179a95bb05d..ec2415d1fa4d3fd62a38bec6e7f02b07199241b4 100644 (file)
--- a/MdePkg/Include/Protocol/Usb2HostController.h
+++ b/MdePkg/Include/Protocol/Usb2HostController.h
@@ -109,8 +109,7 @@ EFI_STATUS
   OUT UINT8                 *MaxSpeed,\r
   OUT UINT8                 *PortNumber,\r
   OUT UINT8                 *Is64BitCapable\r
   OUT UINT8                 *MaxSpeed,\r
   OUT UINT8                 *PortNumber,\r
   OUT UINT8                 *Is64BitCapable\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_USB_HC_RESET_GLOBAL             0x0001\r
 #define EFI_USB_HC_RESET_HOST_CONTROLLER    0x0002\r
 \r
 #define EFI_USB_HC_RESET_GLOBAL             0x0001\r
 #define EFI_USB_HC_RESET_HOST_CONTROLLER    0x0002\r


@@ -139,8 +138,7 @@ EFI_STATUS
 (EFIAPI *EFI_USB2_HC_PROTOCOL_RESET)(\r
   IN EFI_USB2_HC_PROTOCOL   *This,\r
   IN UINT16                 Attributes\r
 (EFIAPI *EFI_USB2_HC_PROTOCOL_RESET)(\r
   IN EFI_USB2_HC_PROTOCOL   *This,\r
   IN UINT16                 Attributes\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -200,8 +198,7 @@ EFI_STATUS
 (EFIAPI *EFI_USB2_HC_PROTOCOL_GET_STATE)(\r
   IN CONST  EFI_USB2_HC_PROTOCOL    *This,\r
   OUT       EFI_USB_HC_STATE        *State\r
 (EFIAPI *EFI_USB2_HC_PROTOCOL_GET_STATE)(\r
   IN CONST  EFI_USB2_HC_PROTOCOL    *This,\r
   OUT       EFI_USB_HC_STATE        *State\r

-)\r
-;\r
+);\r

 \r
 /**\r
   Sets the USB host controller to a specific state.\r
 \r
 /**\r
   Sets the USB host controller to a specific state.\r


@@ -220,8 +217,7 @@ EFI_STATUS
 (EFIAPI *EFI_USB2_HC_PROTOCOL_SET_STATE)(\r
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN EFI_USB_HC_STATE        State\r
 (EFIAPI *EFI_USB2_HC_PROTOCOL_SET_STATE)(\r
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN EFI_USB_HC_STATE        State\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Submits control transfer to a target USB device.\r
 \r
 /**\r
   Submits control transfer to a target USB device.\r


@@ -266,8 +262,7 @@ EFI_STATUS
   IN     UINTN                              TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r
   IN     UINTN                              TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_USB_MAX_BULK_BUFFER_NUM 10\r
 \r
 \r
 #define EFI_USB_MAX_BULK_BUFFER_NUM 10\r
 \r


@@ -315,8 +310,7 @@ EFI_STATUS
   IN     UINTN                              TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r
   IN     UINTN                              TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Submits an asynchronous interrupt transfer to an interrupt endpoint of a USB device.\r
 \r
 /**\r
   Submits an asynchronous interrupt transfer to an interrupt endpoint of a USB device.\r


@@ -365,8 +359,7 @@ EFI_STATUS
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR                  *Translator      OPTIONAL,\r
   IN     EFI_ASYNC_USB_TRANSFER_CALLBACK                     CallBackFunction OPTIONAL,\r
   IN     VOID                                                *Context         OPTIONAL\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR                  *Translator      OPTIONAL,\r
   IN     EFI_ASYNC_USB_TRANSFER_CALLBACK                     CallBackFunction OPTIONAL,\r
   IN     VOID                                                *Context         OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Submits synchronous interrupt transfer to an interrupt endpoint of a USB device.\r
 \r
 /**\r
   Submits synchronous interrupt transfer to an interrupt endpoint of a USB device.\r


@@ -412,8 +405,7 @@ EFI_STATUS
   IN     UINTN                                       TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR          *Translator,\r
   OUT    UINT32                                      *TransferResult\r
   IN     UINTN                                       TimeOut,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR          *Translator,\r
   OUT    UINT32                                      *TransferResult\r

-  )\r
-;\r
+  );\r

 \r
 #define EFI_USB_MAX_ISO_BUFFER_NUM  7\r
 #define EFI_USB_MAX_ISO_BUFFER_NUM1 2\r
 \r
 #define EFI_USB_MAX_ISO_BUFFER_NUM  7\r
 #define EFI_USB_MAX_ISO_BUFFER_NUM1 2\r


@@ -457,8 +449,7 @@ EFI_STATUS
   IN     UINTN                              DataLength,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r
   IN     UINTN                              DataLength,\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   OUT    UINT32                             *TransferResult\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Submits nonblocking isochronous transfer to an isochronous endpoint of a USB device.\r
 \r
 /**\r
   Submits nonblocking isochronous transfer to an isochronous endpoint of a USB device.\r


@@ -502,8 +493,7 @@ EFI_STATUS
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   IN     EFI_ASYNC_USB_TRANSFER_CALLBACK    IsochronousCallBack,\r
   IN     VOID                               *Context OPTIONAL\r
   IN     EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,\r
   IN     EFI_ASYNC_USB_TRANSFER_CALLBACK    IsochronousCallBack,\r
   IN     VOID                               *Context OPTIONAL\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r
 \r
 /**\r
   Retrieves the current status of a USB root hub port.\r


@@ -524,8 +514,7 @@ EFI_STATUS
   IN CONST  EFI_USB2_HC_PROTOCOL    *This,\r
   IN CONST  UINT8                   PortNumber,\r
   OUT       EFI_USB_PORT_STATUS     *PortStatus\r
   IN CONST  EFI_USB2_HC_PROTOCOL    *This,\r
   IN CONST  UINT8                   PortNumber,\r
   OUT       EFI_USB_PORT_STATUS     *PortStatus\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Sets a feature for the specified root hub port.\r
 \r
 /**\r
   Sets a feature for the specified root hub port.\r


@@ -546,8 +535,7 @@ EFI_STATUS
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN UINT8                   PortNumber,\r
   IN EFI_USB_PORT_FEATURE    PortFeature\r
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN UINT8                   PortNumber,\r
   IN EFI_USB_PORT_FEATURE    PortFeature\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   Clears a feature for the specified root hub port.\r
 \r
 /**\r
   Clears a feature for the specified root hub port.\r


@@ -568,8 +556,7 @@ EFI_STATUS
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN UINT8                   PortNumber,\r
   IN EFI_USB_PORT_FEATURE    PortFeature\r
   IN EFI_USB2_HC_PROTOCOL    *This,\r
   IN UINT8                   PortNumber,\r
   IN EFI_USB_PORT_FEATURE    PortFeature\r

-  )\r
-;\r
+  );\r

 \r
 /**  \r
   @par Protocol Description:\r
 \r
 /**  \r
   @par Protocol Description:\r

diff --git a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h b/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
index 95d9048eee7e1b75354e45dc0d71464b898a8191..8268cd821f553e137564dcd554b359b45a6b5539 100644 (file)
--- a/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
+++ b/MdePkg/Library/DxeSmbusLib/InternalSmbusLib.h
@@ -84,7 +84,6 @@ EFIAPI
 SmbusLibConstructor (\r
   IN EFI_HANDLE                ImageHandle,\r
   IN EFI_SYSTEM_TABLE          *SystemTable\r
 SmbusLibConstructor (\r
   IN EFI_HANDLE                ImageHandle,\r
   IN EFI_SYSTEM_TABLE          *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Library/HiiLib/InternalHiiLib.h b/MdePkg/Library/HiiLib/InternalHiiLib.h
index 0c7ed9d585108fea682a261cb0f6294253e2422a..f9294eb876f67df685bd0375dc305fb1c1b76952 100644 (file)
--- a/MdePkg/Library/HiiLib/InternalHiiLib.h
+++ b/MdePkg/Library/HiiLib/InternalHiiLib.h
@@ -51,8 +51,7 @@ extern CONST EFI_HII_STRING_PROTOCOL           *mHiiStringProt;
 BOOLEAN\r
 IsHiiHandleRegistered (\r
   EFI_HII_HANDLE    HiiHandle\r
 BOOLEAN\r
 IsHiiHandleRegistered (\r
   EFI_HII_HANDLE    HiiHandle\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
 \r
 \r
 /**\r
 \r


@@ -62,7 +61,6 @@ IsHiiHandleRegistered (
 VOID\r
 LocateHiiProtocols (\r
   VOID\r
 VOID\r
 LocateHiiProtocols (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibInternal.h b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibInternal.h
index 9d1f66936fdb9441b37ce04db05d0d392a9ad675..9587712e81ac1b6b22785134659afbed1fde112b 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibInternal.h
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibInternal.h
@@ -33,7 +33,6 @@ EFIAPI
 DevicePathLibConstructor (\r
   IN      EFI_HANDLE                ImageHandle,\r
   IN      EFI_SYSTEM_TABLE          *SystemTable\r
 DevicePathLibConstructor (\r
   IN      EFI_HANDLE                ImageHandle,\r
   IN      EFI_SYSTEM_TABLE          *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
index 6e392084daef0ee587509e6b058112c1ced1d280..5ff7a89763f5699682af61d5e5b5cffa3a0e152c 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -65,8 +65,7 @@ EFI_STATUS
 GetFvbInfo (\r
   IN  UINT64                            FvLength,\r
   OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r
 GetFvbInfo (\r
   IN  UINT64                            FvLength,\r
   OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbReadBlock (\r
 \r
 EFI_STATUS\r
 FvbReadBlock (\r


@@ -77,8 +76,7 @@ FvbReadBlock (
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbWriteBlock (\r
 \r
 EFI_STATUS\r
 FvbWriteBlock (\r


@@ -89,8 +87,7 @@ FvbWriteBlock (
   IN CONST UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN CONST UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbEraseBlock (\r
 \r
 EFI_STATUS\r
 FvbEraseBlock (\r


@@ -98,8 +95,7 @@ FvbEraseBlock (
   IN EFI_LBA                              Lba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN EFI_LBA                              Lba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r


@@ -107,8 +103,7 @@ FvbSetVolumeAttributes (
   IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r


@@ -116,8 +111,7 @@ FvbGetVolumeAttributes (
   OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r
 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r


@@ -125,16 +119,14 @@ FvbGetPhysicalAddress (
   OUT EFI_PHYSICAL_ADDRESS                *Address,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   OUT EFI_PHYSICAL_ADDRESS                *Address,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 \r
 VOID\r
 \r
 \r
 VOID\r


@@ -142,8 +134,7 @@ EFIAPI
 FvbClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
 FvbClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r
 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r


@@ -154,8 +145,7 @@ FvbGetLbaAddress (
   OUT UINTN                               *NumOfBlocks,\r
   IN  ESAL_FWB_GLOBAL                     *Global,\r
   IN  BOOLEAN                             Virtual\r
   OUT UINTN                               *NumOfBlocks,\r
   IN  ESAL_FWB_GLOBAL                     *Global,\r
   IN  BOOLEAN                             Virtual\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Protocol APIs\r
 \r
 //\r
 // Protocol APIs\r


@@ -165,24 +155,21 @@ EFIAPI
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   OUT EFI_FVB_ATTRIBUTES_2                              *Attributes\r
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   OUT EFI_FVB_ATTRIBUTES_2                              *Attributes\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   IN OUT EFI_FVB_ATTRIBUTES_2                           *Attributes\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   IN OUT EFI_FVB_ATTRIBUTES_2                           *Attributes\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   OUT EFI_PHYSICAL_ADDRESS                        *Address\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
   OUT EFI_PHYSICAL_ADDRESS                        *Address\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -191,8 +178,7 @@ FvbProtocolGetBlockSize (
   IN CONST EFI_LBA                                     Lba,\r
   OUT UINTN                                       *BlockSize,\r
   OUT UINTN                                       *NumOfBlocks\r
   IN CONST EFI_LBA                                     Lba,\r
   OUT UINTN                                       *BlockSize,\r
   OUT UINTN                                       *NumOfBlocks\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -202,8 +188,7 @@ FvbProtocolRead (
   IN CONST UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r
   IN CONST UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -213,16 +198,14 @@ FvbProtocolWrite (
   IN CONST UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN CONST UINT8                                        *Buffer\r
   IN CONST UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN CONST UINT8                                        *Buffer\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
   ...\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
   ...\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -232,7 +215,6 @@ FvbExtendProtocolEraseCustomBlockRange (
   IN UINTN                                OffsetStartLba,\r
   IN EFI_LBA                              LastLba,\r
   IN UINTN                                OffsetLastLba\r
   IN UINTN                                OffsetStartLba,\r
   IN EFI_LBA                              LastLba,\r
   IN UINTN                                OffsetLastLba\r

-  )\r
-;\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
index 39330cc48ebd222480d917e84c6965889c75502f..e824d1937d4e1f426b679bf0a19be4e751ff9b1e 100644 (file)
--- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
+++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
@@ -81,39 +81,33 @@ typedef struct {
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY                   *BdsDriverLists\r
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY                   *BdsDriverLists\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r
 \r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsConnectSequence (\r
   VOID\r
 \r
 VOID\r
 PlatformBdsConnectSequence (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 \r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r
 \r
 \r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformBdsConnectConsole (\r
   IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
 \r
 EFI_STATUS\r
 PlatformBdsConnectConsole (\r
   IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 PlatformBdsNoConsoleAction (\r
   VOID\r
 \r
 EFI_STATUS\r
 PlatformBdsNoConsoleAction (\r
   VOID\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 PlatformBdsEnterFrontPage (\r
 \r
 VOID\r
 PlatformBdsEnterFrontPage (\r

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGop.h b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
index cd52bc175ad2bb5172f464a753d0080ee42c364c..ee2eb9a589df2ec67cf05f1fa694ed04ad7aef07 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGop.h
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
@@ -188,8 +188,7 @@ extern EFI_GUID                      gSimpleTextInExNotifyGuid;
 EFI_STATUS\r
 WinNtGopSupported (\r
   IN  EFI_WIN_NT_IO_PROTOCOL  *WinNtIo\r
 EFI_STATUS\r
 WinNtGopSupported (\r
   IN  EFI_WIN_NT_IO_PROTOCOL  *WinNtIo\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -203,8 +202,7 @@ WinNtGopSupported (
 EFI_STATUS\r
 WinNtGopConstructor (\r
   IN  GOP_PRIVATE_DATA    *Private\r
 EFI_STATUS\r
 WinNtGopConstructor (\r
   IN  GOP_PRIVATE_DATA    *Private\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -218,8 +216,7 @@ WinNtGopConstructor (
 EFI_STATUS\r
 WinNtGopDestructor (\r
   IN  GOP_PRIVATE_DATA    *Private\r
 EFI_STATUS\r
 WinNtGopDestructor (\r
   IN  GOP_PRIVATE_DATA    *Private\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // UEFI 2.0 driver model prototypes for Win NT GOP\r
 \r
 //\r
 // UEFI 2.0 driver model prototypes for Win NT GOP\r


@@ -240,8 +237,7 @@ EFIAPI
 WinNtGopInitialize (\r
   IN EFI_HANDLE            ImageHandle,\r
   IN EFI_SYSTEM_TABLE      *SystemTable\r
 WinNtGopInitialize (\r
   IN EFI_HANDLE            ImageHandle,\r
   IN EFI_SYSTEM_TABLE      *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -260,8 +256,7 @@ WinNtGopDriverBindingSupported (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      Handle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      Handle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -280,8 +275,7 @@ WinNtGopDriverBindingStart (
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      Handle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
   IN  EFI_HANDLE                      Handle,\r
   IN  EFI_DEVICE_PATH_PROTOCOL        *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -302,8 +296,7 @@ WinNtGopDriverBindingStop (
   IN  EFI_HANDLE                   Handle,\r
   IN  UINTN                        NumberOfChildren,\r
   IN  EFI_HANDLE                   *ChildHandleBuffer\r
   IN  EFI_HANDLE                   Handle,\r
   IN  UINTN                        NumberOfChildren,\r
   IN  EFI_HANDLE                   *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -319,8 +312,7 @@ EFI_STATUS
 GopPrivateAddQ (\r
   IN  GOP_PRIVATE_DATA    *Private,\r
   IN  EFI_INPUT_KEY       Key\r
 GopPrivateAddQ (\r
   IN  GOP_PRIVATE_DATA    *Private,\r
   IN  EFI_INPUT_KEY       Key\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -334,8 +326,7 @@ GopPrivateAddQ (
 EFI_STATUS\r
 WinNtGopInitializeSimpleTextInForWindow (\r
   IN  GOP_PRIVATE_DATA    *Private\r
 EFI_STATUS\r
 WinNtGopInitializeSimpleTextInForWindow (\r
   IN  GOP_PRIVATE_DATA    *Private\r

-  )\r
-;\r
+  );\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -349,8 +340,7 @@ WinNtGopInitializeSimpleTextInForWindow (
 EFI_STATUS\r
 WinNtGopDestroySimpleTextInForWindow (\r
   IN  GOP_PRIVATE_DATA    *Private\r
 EFI_STATUS\r
 WinNtGopDestroySimpleTextInForWindow (\r
   IN  GOP_PRIVATE_DATA    *Private\r

-  )\r
-;\r
+  );\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
index 02d73585ec011f3dd1bd6c2a81a34aac6418678b..b726d54099261f10a02a69448b1882897b2cce50 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
@@ -146,14 +146,12 @@ extern EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL  gCirrusLogic5430DriverSupporte
 EFI_STATUS\r
 CirrusLogic5430UgaDrawConstructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
 EFI_STATUS\r
 CirrusLogic5430UgaDrawConstructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 CirrusLogic5430UgaDrawDestructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
 \r
 EFI_STATUS\r
 CirrusLogic5430UgaDrawDestructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // Graphics Output Hardware abstraction internal worker functions\r
 \r
 //\r
 // Graphics Output Hardware abstraction internal worker functions\r


@@ -161,14 +159,12 @@ CirrusLogic5430UgaDrawDestructor (
 EFI_STATUS\r
 CirrusLogic5430GraphicsOutputConstructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
 EFI_STATUS\r
 CirrusLogic5430GraphicsOutputConstructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 CirrusLogic5430GraphicsOutputDestructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r
 \r
 EFI_STATUS\r
 CirrusLogic5430GraphicsOutputDestructor (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA  *Private\r

-  )\r
-;\r
+  );\r

 \r
 \r
 //\r
 \r
 \r
 //\r


@@ -190,8 +186,7 @@ CirrusLogic5430ControllerDriverSupported (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -209,8 +204,7 @@ CirrusLogic5430ControllerDriverStart (
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r

-  )\r
-;\r
+  );\r

 \r
 /**\r
   TODO: Add function description\r
 \r
 /**\r
   TODO: Add function description\r


@@ -230,8 +224,7 @@ CirrusLogic5430ControllerDriverStop (
   IN EFI_HANDLE                   Controller,\r
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r
   IN EFI_HANDLE                   Controller,\r
   IN UINTN                        NumberOfChildren,\r
   IN EFI_HANDLE                   *ChildHandleBuffer\r

-  )\r
-;\r
+  );\r

 \r
 //\r
 // EFI Component Name Functions\r
 \r
 //\r
 // EFI Component Name Functions\r