Minor coding style adjustment for DiskIo, Partition, English and Ebc modules.

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

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
index 5223ae7b905d5e1f8a17a9876ea1b50e61b558e6..f4a378133b13d9d8562115e46c8826cb49007ef2 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef _DISK_IO_H\r
-#define _DISK_IO_H\r
+#ifndef _DISK_IO_H_\r
+#define _DISK_IO_H_\r

 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r


@@ -69,9 +69,9 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gDiskIoComponentName2;
 EFI_STATUS\r
 EFIAPI\r
 DiskIoDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 DiskIoDriverBindingSupported (\r

-  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 OPTIONAL\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -91,9 +91,9 @@ DiskIoDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 DiskIoDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 DiskIoDriverBindingStart (\r

-  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 OPTIONAL\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index f208194eacf5045c78eba38277f818a69633a81c..ce3305039d674e0bffefe8229356fe373ca42a4b 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -166,7 +166,7 @@ PartitionInstallElToritoChildHandles (
       Check += CheckBuffer[Index];\r
     }\r
 \r
       Check += CheckBuffer[Index];\r
     }\r
 \r

-    if (Check & 0xFFFF) {\r
+    if ((Check & 0xFFFF) != 0) {\r

       DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));\r
       continue;\r
     }\r
       DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));\r
       continue;\r
     }\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index ef3c766e536ecfcdf0cab564965e6d417a5e5808..6d3abae843c2a530198350fdab097156f6e7bffc 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -79,7 +79,7 @@ PartitionRestoreGptTable (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Restore Partition Table to its alternate place\r
+  Restore Partition Table to its alternate place.\r

   (Primary -> Backup or Backup -> Primary)\r
 \r
   @param[in]    PartHeader    Partition table header structure\r
   (Primary -> Backup or Backup -> Primary)\r
 \r
   @param[in]    PartHeader    Partition table header structure\r


@@ -97,7 +97,7 @@ PartitionCheckGptEntry (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Checks the CRC32 value in the table header\r
+  Checks the CRC32 value in the table header.\r

 \r
   @param  MaxSize   Max Size limit\r
   @param  Size      The size of the table\r
 \r
   @param  MaxSize   Max Size limit\r
   @param  Size      The size of the table\r


@@ -116,7 +116,7 @@ PartitionCheckCrcAltSize (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Checks the CRC32 value in the table header\r
+  Checks the CRC32 value in the table header.\r

 \r
   @param  MaxSize   Max Size limit\r
   @param  Hdr       Table to check\r
 \r
   @param  MaxSize   Max Size limit\r
   @param  Hdr       Table to check\r


@@ -133,7 +133,7 @@ PartitionCheckCrc (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Updates the CRC32 value in the table header\r
+  Updates the CRC32 value in the table header.\r

 \r
   @param  Size   The size of the table\r
   @param  Hdr    Table to update\r
 \r
   @param  Size   The size of the table\r
   @param  Hdr    Table to update\r


@@ -147,7 +147,7 @@ PartitionSetCrcAltSize (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Updates the CRC32 value in the table header\r
+  Updates the CRC32 value in the table header.\r

 \r
   @param  Hdr    Table to update\r
 \r
 \r
   @param  Hdr    Table to update\r
 \r


@@ -619,7 +619,7 @@ Done:
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Restore Partition Table to its alternate place\r
+  Restore Partition Table to its alternate place.\r

   (Primary -> Backup or Backup -> Primary)\r
 \r
   @param[in]    PartHeader    Partition table header structure\r
   (Primary -> Backup or Backup -> Primary)\r
 \r
   @param[in]    PartHeader    Partition table header structure\r


@@ -681,7 +681,7 @@ PartitionCheckGptEntry (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Updates the CRC32 value in the table header\r
+  Updates the CRC32 value in the table header.\r

 \r
   @param  Hdr    Table to update\r
 \r
 \r
   @param  Hdr    Table to update\r
 \r


@@ -696,7 +696,7 @@ PartitionSetCrc (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Updates the CRC32 value in the table header\r
+  Updates the CRC32 value in the table header.\r

 \r
   @param  Size   The size of the table\r
   @param  Hdr    Table to update\r
 \r
   @param  Size   The size of the table\r
   @param  Hdr    Table to update\r


@@ -707,7 +707,6 @@ PartitionSetCrcAltSize (
   IN UINTN                 Size,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   )\r
   IN UINTN                 Size,\r
   IN OUT EFI_TABLE_HEADER  *Hdr\r
   )\r

-\r

 {\r
   UINT32  Crc;\r
 \r
 {\r
   UINT32  Crc;\r
 \r


@@ -718,7 +717,7 @@ PartitionSetCrcAltSize (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Checks the CRC32 value in the table header\r
+  Checks the CRC32 value in the table header.\r

 \r
   @param  MaxSize   Max Size limit\r
   @param  Hdr       Table to check\r
 \r
   @param  MaxSize   Max Size limit\r
   @param  Hdr       Table to check\r


@@ -738,7 +737,7 @@ PartitionCheckCrc (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Checks the CRC32 value in the table header\r
+  Checks the CRC32 value in the table header.\r

 \r
   @param  MaxSize   Max Size limit\r
   @param  Size      The size of the table\r
 \r
   @param  MaxSize   Max Size limit\r
   @param  Size      The size of the table\r


@@ -768,7 +767,7 @@ PartitionCheckCrcAltSize (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (MaxSize && Size > MaxSize) {\r
+  if ((MaxSize != 0) && (Size > MaxSize)) {\r

     DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));\r
     return FALSE;\r
   }\r
     DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));\r
     return FALSE;\r
   }\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index c95a866e7587ce5612fb2f91669fc305178b1a8b..68b389ae91cb2d1c8e63bafd9141ea944c5cbfd9 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -93,7 +93,7 @@ PartitionValidMbr (
     }\r
   }\r
   //\r
     }\r
   }\r
   //\r

-  // Non of the regions overlapped so MBR is O.K.\r
+  // None of the regions overlapped so MBR is O.K.\r

   //\r
   return MbrValid;\r
 }\r
   //\r
   return MbrValid;\r
 }\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index 9d6477cc3a09859e9b04306810e032e267880d84..6dcbd9b1393875baa03af80f66134cac5046f8e1 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef _PARTITION_H \r
-#define _PARTITION_H \r
+#ifndef _PARTITION_H_ \r
+#define _PARTITION_H_ \r

 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r


@@ -150,10 +150,10 @@ PartitionDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 PartitionDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 PartitionDriverBindingStop (\r

-  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  UINTN                        NumberOfChildren,\r
-  IN  EFI_HANDLE                   *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
+  IN  EFI_HANDLE                    ControllerHandle,\r
+  IN  UINTN                         NumberOfChildren,\r
+  IN  EFI_HANDLE                    *ChildHandleBuffer\r

   );\r
 \r
 //\r
   );\r
 \r
 //\r


@@ -313,12 +313,11 @@ PartitionInstallChildHandle (
   IN  EFI_BLOCK_IO_PROTOCOL        *ParentBlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePathNode,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *ParentBlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePathNode,\r

-  IN  UINT64                       Start,\r
-  IN  UINT64                       End,\r
+  IN  EFI_LBA                      Start,\r
+  IN  EFI_LBA                      End,\r

   IN  UINT32                       BlockSize,\r
   IN  BOOLEAN                      InstallEspGuid\r
   IN  UINT32                       BlockSize,\r
   IN  BOOLEAN                      InstallEspGuid\r

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

 \r
 /**\r
   Install child handles if the Handle supports GPT partition structure.\r
 \r
 /**\r
   Install child handles if the Handle supports GPT partition structure.\r


@@ -341,8 +340,7 @@ PartitionInstallGptChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r

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

 \r
 /**\r
   Install child handles if the Handle supports El Torito format.\r
 \r
 /**\r
   Install child handles if the Handle supports El Torito format.\r


@@ -366,8 +364,7 @@ PartitionInstallElToritoChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r

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

 \r
 /**\r
   Install child handles if the Handle supports MBR format.\r
 \r
 /**\r
   Install child handles if the Handle supports MBR format.\r


@@ -390,8 +387,7 @@ PartitionInstallMbrChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r

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

 \r
 typedef\r
 EFI_STATUS\r
 \r
 typedef\r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
index 07bb2f446d4bbb5b2dd2aee850e936af2acd0c99..67f1db1c6cfcd02048af7a887c1552d04db56a47 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
@@ -122,7 +122,7 @@ InitializeUnicodeCollationEng (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  for (Index = 0; mOtherChars[Index]; Index++) {\r
+  for (Index = 0; mOtherChars[Index] != 0; Index++) {\r

     Index2 = mOtherChars[Index];\r
     mEngInfoMap[Index2] |= CHAR_FAT_VALID;\r
   }\r
     Index2 = mOtherChars[Index];\r
     mEngInfoMap[Index2] |= CHAR_FAT_VALID;\r
   }\r


@@ -191,8 +191,8 @@ EngStriColl (
   IN CHAR16                           *Str2\r
   )\r
 {\r
   IN CHAR16                           *Str2\r
   )\r
 {\r

-  while (*Str1) {\r
-    if (ToUpper (*Str1) != ToUpper (*Str2)) {\r
+  while (*Str1 != 0) {\r
+    if (TO_UPPER (*Str1) != TO_UPPER (*Str2)) {\r

       break;\r
     }\r
 \r
       break;\r
     }\r
 \r


@@ -200,7 +200,7 @@ EngStriColl (
     Str2 += 1;\r
   }\r
 \r
     Str2 += 1;\r
   }\r
 \r

-  return ToUpper (*Str1) - ToUpper (*Str2);\r
+  return TO_UPPER (*Str1) - TO_UPPER (*Str2);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -219,8 +219,8 @@ EngStrLwr (
   IN OUT CHAR16                       *Str\r
   )\r
 {\r
   IN OUT CHAR16                       *Str\r
   )\r
 {\r

-  while (*Str) {\r
-    *Str = ToLower (*Str);\r
+  while (*Str != 0) {\r
+    *Str = TO_LOWER (*Str);\r

     Str += 1;\r
   }\r
 }\r
     Str += 1;\r
   }\r
 }\r


@@ -241,8 +241,8 @@ EngStrUpr (
   IN OUT CHAR16                       *Str\r
   )\r
 {\r
   IN OUT CHAR16                       *Str\r
   )\r
 {\r

-  while (*Str) {\r
-    *Str = ToUpper (*Str);\r
+  while (*Str != 0) {\r
+    *Str = TO_UPPER (*Str);\r

     Str += 1;\r
   }\r
 }\r
     Str += 1;\r
   }\r
 }\r


@@ -280,7 +280,7 @@ EngMetaiMatch (
       //\r
       // End of pattern.  If end of string, TRUE match\r
       //\r
       //\r
       // End of pattern.  If end of string, TRUE match\r
       //\r

-      if (*String) {\r
+      if (*String != 0) {\r

         return FALSE;\r
       } else {\r
         return TRUE;\r
         return FALSE;\r
       } else {\r
         return TRUE;\r


@@ -290,7 +290,7 @@ EngMetaiMatch (
       //\r
       // Match zero or more chars\r
       //\r
       //\r
       // Match zero or more chars\r
       //\r

-      while (*String) {\r
+      while (*String != 0) {\r

         if (EngMetaiMatch (This, String, Pattern)) {\r
           return TRUE;\r
         }\r
         if (EngMetaiMatch (This, String, Pattern)) {\r
           return TRUE;\r
         }\r


@@ -304,7 +304,7 @@ EngMetaiMatch (
       //\r
       // Match any one char\r
       //\r
       //\r
       // Match any one char\r
       //\r

-      if (!*String) {\r
+      if (*String == 0) {\r

         return FALSE;\r
       }\r
 \r
         return FALSE;\r
       }\r
 \r


@@ -316,7 +316,7 @@ EngMetaiMatch (
       // Match char set\r
       //\r
       CharC = *String;\r
       // Match char set\r
       //\r
       CharC = *String;\r

-      if (!CharC) {\r
+      if (CharC == 0) {\r

         //\r
         // syntax problem\r
         //\r
         //\r
         // syntax problem\r
         //\r


@@ -325,7 +325,7 @@ EngMetaiMatch (
 \r
       Index3  = 0;\r
       CharP   = *Pattern++;\r
 \r
       Index3  = 0;\r
       CharP   = *Pattern++;\r

-      while (CharP) {\r
+      while (CharP != 0) {\r

         if (CharP == ']') {\r
           return FALSE;\r
         }\r
         if (CharP == ']') {\r
           return FALSE;\r
         }\r


@@ -342,7 +342,7 @@ EngMetaiMatch (
             return FALSE;\r
           }\r
 \r
             return FALSE;\r
           }\r
 \r

-          if (ToUpper (CharC) >= ToUpper (Index3) && ToUpper (CharC) <= ToUpper (CharP)) {\r
+          if (TO_UPPER (CharC) >= TO_UPPER (Index3) && TO_UPPER (CharC) <= TO_UPPER (CharP)) {\r

             //\r
             // if in range, it's a match\r
             //\r
             //\r
             // if in range, it's a match\r
             //\r


@@ -351,7 +351,7 @@ EngMetaiMatch (
         }\r
 \r
         Index3 = CharP;\r
         }\r
 \r
         Index3 = CharP;\r

-        if (ToUpper (CharC) == ToUpper (CharP)) {\r
+        if (TO_UPPER (CharC) == TO_UPPER (CharP)) {\r

           //\r
           // if char matches\r
           //\r
           //\r
           // if char matches\r
           //\r


@@ -363,7 +363,7 @@ EngMetaiMatch (
       //\r
       // skip to end of match char set\r
       //\r
       //\r
       // skip to end of match char set\r
       //\r

-      while (CharP && CharP != ']') {\r
+      while ((CharP != 0) && (CharP != ']')) {\r

         CharP = *Pattern;\r
         Pattern += 1;\r
       }\r
         CharP = *Pattern;\r
         Pattern += 1;\r
       }\r


@@ -373,7 +373,7 @@ EngMetaiMatch (
 \r
     default:\r
       CharC = *String;\r
 \r
     default:\r
       CharC = *String;\r

-      if (ToUpper (CharC) != ToUpper (CharP)) {\r
+      if (TO_UPPER (CharC) != TO_UPPER (CharP)) {\r

         return FALSE;\r
       }\r
 \r
         return FALSE;\r
       }\r
 \r


@@ -408,7 +408,7 @@ EngFatToStr (
   //\r
   // No DBCS issues, just expand and add null terminate to end of string\r
   //\r
   //\r
   // No DBCS issues, just expand and add null terminate to end of string\r
   //\r

-  while (*Fat && FatSize) {\r
+  while ((*Fat != 0) && (FatSize != 0)) {\r

     *String = *Fat;\r
     String += 1;\r
     Fat += 1;\r
     *String = *Fat;\r
     String += 1;\r
     Fat += 1;\r


@@ -446,7 +446,7 @@ EngStrToFat (
   BOOLEAN SpecialCharExist;\r
 \r
   SpecialCharExist = FALSE;\r
   BOOLEAN SpecialCharExist;\r
 \r
   SpecialCharExist = FALSE;\r

-  while (*String && FatSize) {\r
+  while ((*String != 0) && (FatSize != 0)) {\r

     //\r
     // Skip '.' or ' ' when making a fat name\r
     //\r
     //\r
     // Skip '.' or ' ' when making a fat name\r
     //\r


@@ -455,7 +455,7 @@ EngStrToFat (
       // If this is a valid fat char, move it.\r
       // Otherwise, move a '_' and flag the fact that the name needs an Lfn\r
       //\r
       // If this is a valid fat char, move it.\r
       // Otherwise, move a '_' and flag the fact that the name needs an Lfn\r
       //\r

-      if (*String < 0x100 && (mEngInfoMap[*String] & CHAR_FAT_VALID)) {\r
+      if (*String < 0x100 && ((mEngInfoMap[*String] & CHAR_FAT_VALID) != 0)) {\r

         *Fat = mEngUpperMap[*String];\r
       } else {\r
         *Fat              = '_';\r
         *Fat = mEngUpperMap[*String];\r
       } else {\r
         *Fat              = '_';\r

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
index 7cab7088cf3e05a5d28cd1b455ce6dca523c6193..85dc5937894a43cb04cf9d3571880bddd57d3349 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef _UNICODE_COLLATION_ENG_H\r
-#define _UNICODE_COLLATION_ENG_H\r
+#ifndef _UNICODE_COLLATION_ENG_H_\r
+#define _UNICODE_COLLATION_ENG_H_\r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -32,8 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 #define CHAR_FAT_VALID  0x01\r
 \r
 //\r
 #define CHAR_FAT_VALID  0x01\r
 \r

-#define ToUpper(a)      (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)\r
-#define ToLower(a)      (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)\r
+#define TO_UPPER(a)      (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)\r
+#define TO_LOWER(a)      (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)\r

 \r
 //\r
 // Prototypes\r
 \r
 //\r
 // Prototypes\r


@@ -54,11 +54,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 INTN\r
 EFIAPI\r
 EngStriColl (\r
 INTN\r
 EFIAPI\r
 EngStriColl (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL           *This,\r
-  IN CHAR16                                   *Str1,\r
-  IN CHAR16                                   *Str2\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN CHAR16                           *Str1,\r
+  IN CHAR16                           *Str2\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


@@ -75,11 +74,10 @@ EngStriColl (
 BOOLEAN\r
 EFIAPI\r
 EngMetaiMatch (\r
 BOOLEAN\r
 EFIAPI\r
 EngMetaiMatch (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL          *This,\r
-  IN CHAR16                                  *String,\r
-  IN CHAR16                                  *Pattern\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN CHAR16                           *String,\r
+  IN CHAR16                           *Pattern\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


@@ -92,10 +90,9 @@ EngMetaiMatch (
 VOID\r
 EFIAPI\r
 EngStrLwr (\r
 VOID\r
 EFIAPI\r
 EngStrLwr (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL          *This,\r
-  IN OUT CHAR16                              *Str\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN OUT CHAR16                       *Str\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


@@ -108,10 +105,9 @@ EngStrLwr (
 VOID\r
 EFIAPI\r
 EngStrUpr (\r
 VOID\r
 EFIAPI\r
 EngStrUpr (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL          *This,\r
-  IN OUT CHAR16                              *Str\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN OUT CHAR16                       *Str\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


@@ -128,12 +124,11 @@ EngStrUpr (
 VOID\r
 EFIAPI\r
 EngFatToStr (\r
 VOID\r
 EFIAPI\r
 EngFatToStr (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL          *This,\r
-  IN UINTN                                   FatSize,\r
-  IN CHAR8                                   *Fat,\r
-  OUT CHAR16                                 *String\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN UINTN                            FatSize,\r
+  IN CHAR8                            *Fat,\r
+  OUT CHAR16                          *String\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


@@ -153,12 +148,11 @@ EngFatToStr (
 BOOLEAN\r
 EFIAPI\r
 EngStrToFat (\r
 BOOLEAN\r
 EFIAPI\r
 EngStrToFat (\r

-  IN EFI_UNICODE_COLLATION_PROTOCOL          *This,\r
-  IN CHAR16                                  *String,\r
-  IN UINTN                                   FatSize,\r
-  OUT CHAR8                                  *Fat\r
-  )\r
-;\r
+  IN EFI_UNICODE_COLLATION_PROTOCOL   *This,\r
+  IN CHAR16                           *String,\r
+  IN UINTN                            FatSize,\r
+  OUT CHAR8                           *Fat\r
+  );\r

 \r
 /**\r
   The user Entry Point for English module.\r
 \r
 /**\r
   The user Entry Point for English module.\r


@@ -178,7 +172,7 @@ EFIAPI
 InitializeUnicodeCollationEng (\r
   IN EFI_HANDLE       ImageHandle,\r
   IN EFI_SYSTEM_TABLE *SystemTable\r
 InitializeUnicodeCollationEng (\r
   IN EFI_HANDLE       ImageHandle,\r
   IN EFI_SYSTEM_TABLE *SystemTable\r

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

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

+\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 31ff76d80d4237562ce81b5f6f2c1c348637c11f..e4240c9b83a83b91abdb8da2ed2ccc10c208feb7 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -67,8 +67,8 @@ UINT64
 STATIC\r
 INT16\r
 VmReadIndex16 (\r
 STATIC\r
 INT16\r
 VmReadIndex16 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT32     CodeOffset\r
+  IN VM_CONTEXT     *VmPtr,\r
+  IN UINT32         CodeOffset\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -84,8 +84,8 @@ VmReadIndex16 (
 STATIC\r
 INT32\r
 VmReadIndex32 (\r
 STATIC\r
 INT32\r
 VmReadIndex32 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT32     CodeOffset\r
+  IN VM_CONTEXT     *VmPtr,\r
+  IN UINT32         CodeOffset\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -101,8 +101,8 @@ VmReadIndex32 (
 STATIC\r
 INT64\r
 VmReadIndex64 (\r
 STATIC\r
 INT64\r
 VmReadIndex64 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT32     CodeOffset\r
+  IN VM_CONTEXT     *VmPtr,\r
+  IN UINT32         CodeOffset\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -117,8 +117,8 @@ VmReadIndex64 (
 STATIC\r
 UINT8\r
 VmReadMem8 (\r
 STATIC\r
 UINT8\r
 VmReadMem8 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINTN        Addr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -165,8 +165,8 @@ VmReadMem32 (
 STATIC\r
 UINT64\r
 VmReadMem64 (\r
 STATIC\r
 UINT64\r
 VmReadMem64 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINTN        Addr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -181,8 +181,8 @@ VmReadMem64 (
 STATIC\r
 UINTN\r
 VmReadMemN (\r
 STATIC\r
 UINTN\r
 VmReadMemN (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr\r
+  IN VM_CONTEXT    *VmPtr,\r
+  IN UINTN         Addr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -211,9 +211,9 @@ VmReadMemN (
 STATIC\r
 EFI_STATUS\r
 VmWriteMem8 (\r
 STATIC\r
 EFI_STATUS\r
 VmWriteMem8 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr,\r
-  IN UINT8      Data\r
+  IN VM_CONTEXT    *VmPtr,\r
+  IN UINTN         Addr,\r
+  IN UINT8         Data\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -242,9 +242,9 @@ VmWriteMem8 (
 STATIC\r
 EFI_STATUS\r
 VmWriteMem16 (\r
 STATIC\r
 EFI_STATUS\r
 VmWriteMem16 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr,\r
-  IN UINT16     Data\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINTN        Addr,\r
+  IN UINT16       Data\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -273,9 +273,9 @@ VmWriteMem16 (
 STATIC\r
 EFI_STATUS\r
 VmWriteMem32 (\r
 STATIC\r
 EFI_STATUS\r
 VmWriteMem32 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINTN      Addr,\r
-  IN UINT32     Data\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINTN        Addr,\r
+  IN UINT32       Data\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -441,8 +441,8 @@ VmReadImmed64 (
 STATIC\r
 UINTN\r
 ConvertStackAddr (\r
 STATIC\r
 UINTN\r
 ConvertStackAddr (\r

-  IN VM_CONTEXT   *VmPtr,\r
-  IN UINTN        Addr\r
+  IN VM_CONTEXT    *VmPtr,\r
+  IN UINTN         Addr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -792,7 +792,7 @@ ExecutePOP (
 STATIC\r
 EFI_STATUS\r
 ExecuteSignedDataManip (\r
 STATIC\r
 EFI_STATUS\r
 ExecuteSignedDataManip (\r

-  IN VM_CONTEXT *VmPtr\r
+  IN VM_CONTEXT   *VmPtr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -815,7 +815,7 @@ ExecuteSignedDataManip (
 STATIC\r
 EFI_STATUS\r
 ExecuteUnsignedDataManip (\r
 STATIC\r
 EFI_STATUS\r
 ExecuteUnsignedDataManip (\r

-  IN VM_CONTEXT *VmPtr\r
+  IN VM_CONTEXT   *VmPtr\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -923,9 +923,9 @@ ExecuteMOVsnw (
 STATIC\r
 UINT64\r
 ExecuteNOT (\r
 STATIC\r
 UINT64\r
 ExecuteNOT (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT     *VmPtr,\r
+  IN UINT64         Op1,\r
+  IN UINT64         Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -944,9 +944,9 @@ ExecuteNOT (
 STATIC\r
 UINT64\r
 ExecuteNEG (\r
 STATIC\r
 UINT64\r
 ExecuteNEG (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -965,9 +965,9 @@ ExecuteNEG (
 STATIC\r
 UINT64\r
 ExecuteADD (\r
 STATIC\r
 UINT64\r
 ExecuteADD (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -986,9 +986,9 @@ ExecuteADD (
 STATIC\r
 UINT64\r
 ExecuteSUB (\r
 STATIC\r
 UINT64\r
 ExecuteSUB (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1007,9 +1007,9 @@ ExecuteSUB (
 STATIC\r
 UINT64\r
 ExecuteMUL (\r
 STATIC\r
 UINT64\r
 ExecuteMUL (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1028,9 +1028,9 @@ ExecuteMUL (
 STATIC\r
 UINT64\r
 ExecuteMULU (\r
 STATIC\r
 UINT64\r
 ExecuteMULU (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1049,9 +1049,9 @@ ExecuteMULU (
 STATIC\r
 UINT64\r
 ExecuteDIV (\r
 STATIC\r
 UINT64\r
 ExecuteDIV (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1070,9 +1070,9 @@ ExecuteDIV (
 STATIC\r
 UINT64\r
 ExecuteDIVU (\r
 STATIC\r
 UINT64\r
 ExecuteDIVU (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1091,9 +1091,9 @@ ExecuteDIVU (
 STATIC\r
 UINT64\r
 ExecuteMOD (\r
 STATIC\r
 UINT64\r
 ExecuteMOD (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1112,9 +1112,9 @@ ExecuteMOD (
 STATIC\r
 UINT64\r
 ExecuteMODU (\r
 STATIC\r
 UINT64\r
 ExecuteMODU (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1133,9 +1133,9 @@ ExecuteMODU (
 STATIC\r
 UINT64\r
 ExecuteAND (\r
 STATIC\r
 UINT64\r
 ExecuteAND (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1154,9 +1154,9 @@ ExecuteAND (
 STATIC\r
 UINT64\r
 ExecuteOR (\r
 STATIC\r
 UINT64\r
 ExecuteOR (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1175,9 +1175,9 @@ ExecuteOR (
 STATIC\r
 UINT64\r
 ExecuteXOR (\r
 STATIC\r
 UINT64\r
 ExecuteXOR (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1196,9 +1196,9 @@ ExecuteXOR (
 STATIC\r
 UINT64\r
 ExecuteSHL (\r
 STATIC\r
 UINT64\r
 ExecuteSHL (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1217,9 +1217,9 @@ ExecuteSHL (
 STATIC\r
 UINT64\r
 ExecuteSHR (\r
 STATIC\r
 UINT64\r
 ExecuteSHR (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1238,9 +1238,9 @@ ExecuteSHR (
 STATIC\r
 UINT64\r
 ExecuteASHR (\r
 STATIC\r
 UINT64\r
 ExecuteASHR (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1259,9 +1259,9 @@ ExecuteASHR (
 STATIC\r
 UINT64\r
 ExecuteEXTNDB (\r
 STATIC\r
 UINT64\r
 ExecuteEXTNDB (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1280,9 +1280,9 @@ ExecuteEXTNDB (
 STATIC\r
 UINT64\r
 ExecuteEXTNDW (\r
 STATIC\r
 UINT64\r
 ExecuteEXTNDW (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -1301,9 +1301,9 @@ ExecuteEXTNDW (
 STATIC\r
 UINT64\r
 ExecuteEXTNDD (\r
 STATIC\r
 UINT64\r
 ExecuteEXTNDD (\r

-  IN VM_CONTEXT *VmPtr,\r
-  IN UINT64     Op1,\r
-  IN UINT64     Op2\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINT64       Op1,\r
+  IN UINT64       Op2\r

   );\r
 \r
 //\r
   );\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
index 13eea0c9dc24876fc99504d6ba4b1bc3c3556d39..551236e04b6429165719794bffa6e61770008c90 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
@@ -239,8 +239,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 EbcExecute (\r
   IN VM_CONTEXT *VmPtr\r
 EFI_STATUS\r
 EbcExecute (\r
   IN VM_CONTEXT *VmPtr\r

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

 \r
 \r
 \r
 \r
 \r
 \r


@@ -253,8 +252,7 @@ EbcExecute (
 UINT64\r
 GetVmVersion (\r
   VOID\r
 UINT64\r
 GetVmVersion (\r
   VOID\r

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

 \r
 /**\r
   Writes UINTN data to memory address.\r
 \r
 /**\r
   Writes UINTN data to memory address.\r


@@ -284,8 +282,7 @@ VmWriteMemN (
   IN VM_CONTEXT   *VmPtr,\r
   IN UINTN        Addr,\r
   IN UINTN        Data\r
   IN VM_CONTEXT   *VmPtr,\r
   IN UINTN        Addr,\r
   IN UINTN        Data\r

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

 \r
 /**\r
   Writes 64-bit data to memory address.\r
 \r
 /**\r
   Writes 64-bit data to memory address.\r


@@ -312,11 +309,10 @@ VmWriteMemN (
 **/\r
 EFI_STATUS\r
 VmWriteMem64 (\r
 **/\r
 EFI_STATUS\r
 VmWriteMem64 (\r

-  IN VM_CONTEXT *VmPtr,\r
-  UINTN         Addr,\r
-  IN UINT64     Data\r
-  )\r
-;\r
+  IN VM_CONTEXT   *VmPtr,\r
+  IN UINTN        Addr,\r
+  IN UINT64       Data\r
+  );\r

 \r
 //\r
 // Define a protocol for an EBC VM test interface.\r
 \r
 //\r
 // Define a protocol for an EBC VM test interface.\r


@@ -385,7 +381,6 @@ EbcExecuteInstructions (
   IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
   IN VM_CONTEXT               *VmPtr,\r
   IN OUT UINTN                *InstructionCount\r
   IN EFI_EBC_VM_TEST_PROTOCOL *This,\r
   IN VM_CONTEXT               *VmPtr,\r
   IN OUT UINTN                *InstructionCount\r

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

 \r
 #endif // ifndef _EBC_EXECUTE_H_\r
 \r
 #endif // ifndef _EBC_EXECUTE_H_\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.c b/MdeModulePkg/Universal/EbcDxe/EbcInt.c
index f48176ef1bcc8fb9f0889d25f9b2782c29f70216..bb3dddc48735343ac0977c3c652df92d18a71127 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.c
@@ -52,8 +52,8 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcUnloadImage (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcUnloadImage (\r

-  IN EFI_EBC_PROTOCOL     *This,\r
-  IN EFI_HANDLE           ImageHandle\r
+  IN EFI_EBC_PROTOCOL   *This,\r
+  IN EFI_HANDLE         ImageHandle\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -79,10 +79,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcCreateThunk (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcCreateThunk (\r

-  IN EFI_EBC_PROTOCOL     *This,\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN VOID                 *EbcEntryPoint,\r
-  OUT VOID                **Thunk\r
+  IN EFI_EBC_PROTOCOL   *This,\r
+  IN EFI_HANDLE         ImageHandle,\r
+  IN VOID               *EbcEntryPoint,\r
+  OUT VOID              **Thunk\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -100,8 +100,8 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcGetVersion (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcGetVersion (\r

-  IN EFI_EBC_PROTOCOL     *This,\r
-  IN OUT UINT64           *Version\r
+  IN EFI_EBC_PROTOCOL   *This,\r
+  IN OUT UINT64         *Version\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -187,7 +187,7 @@ EbcDebugPeriodic (
 STATIC\r
 EFI_STATUS\r
 InitEbcVmTestProtocol (\r
 STATIC\r
 EFI_STATUS\r
 InitEbcVmTestProtocol (\r

-  IN EFI_HANDLE     *Handle\r
+  IN EFI_HANDLE     *IHandle\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -216,8 +216,8 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcRegisterICacheFlush (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcRegisterICacheFlush (\r

-  IN EFI_EBC_PROTOCOL               *This,\r
-  IN EBC_ICACHE_FLUSH               Flush\r
+  IN EFI_EBC_PROTOCOL   *This,\r
+  IN EBC_ICACHE_FLUSH   Flush\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -235,8 +235,8 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugGetMaximumProcessorIndex (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugGetMaximumProcessorIndex (\r

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,\r
-  OUT UINTN                         *MaxProcessorIndex\r
+  IN EFI_DEBUG_SUPPORT_PROTOCOL          *This,\r
+  OUT UINTN                              *MaxProcessorIndex\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -264,9 +264,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugRegisterPeriodicCallback (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugRegisterPeriodicCallback (\r

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,\r
-  IN UINTN                          ProcessorIndex,\r
-  IN EFI_PERIODIC_CALLBACK          PeriodicCallback\r
+  IN EFI_DEBUG_SUPPORT_PROTOCOL  *This,\r
+  IN UINTN                       ProcessorIndex,\r
+  IN EFI_PERIODIC_CALLBACK       PeriodicCallback\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -298,10 +298,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugRegisterExceptionCallback (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugRegisterExceptionCallback (\r

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,\r
-  IN UINTN                          ProcessorIndex,\r
-  IN EFI_EXCEPTION_CALLBACK         ExceptionCallback,\r
-  IN EFI_EXCEPTION_TYPE             ExceptionType\r
+  IN EFI_DEBUG_SUPPORT_PROTOCOL  *This,\r
+  IN UINTN                       ProcessorIndex,\r
+  IN EFI_EXCEPTION_CALLBACK      ExceptionCallback,\r
+  IN EFI_EXCEPTION_TYPE          ExceptionType\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -324,10 +324,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugInvalidateInstructionCache (\r
 EFI_STATUS\r
 EFIAPI\r
 EbcDebugInvalidateInstructionCache (\r

-  IN EFI_DEBUG_SUPPORT_PROTOCOL     *This,\r
-  IN UINTN                          ProcessorIndex,\r
-  IN VOID                           *Start,\r
-  IN UINT64                         Length\r
+  IN EFI_DEBUG_SUPPORT_PROTOCOL          *This,\r
+  IN UINTN                               ProcessorIndex,\r
+  IN VOID                                *Start,\r
+  IN UINT64                              Length\r

   );\r
 \r
 //\r
   );\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index 720ee2668a2124c26989f48697f3f91645c434f7..c08ae927b46ee66675dd69e112257d58238bc247 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -101,9 +101,8 @@ EbcCreateThunks (
   IN EFI_HANDLE           ImageHandle,\r
   IN VOID                 *EbcEntryPoint,\r
   OUT VOID                **Thunk,\r
   IN EFI_HANDLE           ImageHandle,\r
   IN VOID                 *EbcEntryPoint,\r
   OUT VOID                **Thunk,\r

-  IN UINT32               Flags\r
-  )\r
-;\r
+  IN  UINT32              Flags\r
+  );\r

 \r
 /**\r
   Add a thunk to our list of thunks for a given image handle.\r
 \r
 /**\r
   Add a thunk to our list of thunks for a given image handle.\r


@@ -120,11 +119,10 @@ EbcCreateThunks (
 **/\r
 EFI_STATUS\r
 EbcAddImageThunk (\r
 **/\r
 EFI_STATUS\r
 EbcAddImageThunk (\r

-  IN EFI_HANDLE     ImageHandle,\r
-  IN VOID           *ThunkBuffer,\r
-  IN UINT32         ThunkSize\r
-  )\r
-;\r
+  IN EFI_HANDLE      ImageHandle,\r
+  IN VOID            *ThunkBuffer,\r
+  IN UINT32          ThunkSize\r
+  );\r

 \r
 //\r
 // The interpreter calls these when an exception is detected,\r
 \r
 //\r
 // The interpreter calls these when an exception is detected,\r


@@ -143,11 +141,10 @@ EbcAddImageThunk (
 **/\r
 EFI_STATUS\r
 EbcDebugSignalException (\r
 **/\r
 EFI_STATUS\r
 EbcDebugSignalException (\r

-  IN EFI_EXCEPTION_TYPE ExceptionType,\r
-  IN EXCEPTION_FLAGS    ExceptionFlags,\r
-  IN VM_CONTEXT         *VmPtr\r
-  )\r
-;\r
+  IN EFI_EXCEPTION_TYPE                   ExceptionType,\r
+  IN EXCEPTION_FLAGS                      ExceptionFlags,\r
+  IN VM_CONTEXT                           *VmPtr\r
+  );\r

 \r
 //\r
 // Define a constant of how often to call the debugger periodic callback\r
 \r
 //\r
 // Define a constant of how often to call the debugger periodic callback\r


@@ -161,21 +158,20 @@ EbcDebugSignalException (
 //\r
 // External low level functions that are native-processor dependent\r
 // \r
 //\r
 // External low level functions that are native-processor dependent\r
 // \r

-/** \r
+/**\r

   The VM thunk code stuffs an EBC entry point into a processor \r
   register. Since we can't use inline assembly to get it from\r
   the interpreter C code, stuff it into the return value\r
   register and return.\r
  \r
   @return  The contents of the register in which the entry point is passed.\r
   The VM thunk code stuffs an EBC entry point into a processor \r
   register. Since we can't use inline assembly to get it from\r
   the interpreter C code, stuff it into the return value\r
   register and return.\r
  \r
   @return  The contents of the register in which the entry point is passed.\r

- \r
-**/ \r
+\r
+**/\r

 UINTN\r
 EFIAPI\r
 EbcLLGetEbcEntryPoint (\r
   VOID\r
 UINTN\r
 EFIAPI\r
 EbcLLGetEbcEntryPoint (\r
   VOID\r

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

 \r
 /**\r
   Returns the caller's value of the stack pointer.\r
 \r
 /**\r
   Returns the caller's value of the stack pointer.\r


@@ -183,15 +179,14 @@ EbcLLGetEbcEntryPoint (
   We adjust it by 4 here because when they called us, the return address\r
   is put on the stack, thereby lowering it by 4 bytes.\r
 \r
   We adjust it by 4 here because when they called us, the return address\r
   is put on the stack, thereby lowering it by 4 bytes.\r
 \r

-  @return The current value of the stack pointer for the caller. \r
+  @return The current value of the stack pointer for the caller.\r

 \r
 **/\r
 UINTN\r
 EFIAPI\r
 EbcLLGetStackPointer (\r
   VOID\r
 \r
 **/\r
 UINTN\r
 EFIAPI\r
 EbcLLGetStackPointer (\r
   VOID\r

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

 \r
 /**\r
   This function is called to execute an EBC CALLEX instruction.\r
 \r
 /**\r
   This function is called to execute an EBC CALLEX instruction.\r


@@ -204,7 +199,7 @@ EbcLLGetStackPointer (
   @param  CallAddr     The function address.\r
   @param  EbcSp        The new EBC stack pointer.\r
   @param  FramePtr     The frame pointer.\r
   @param  CallAddr     The function address.\r
   @param  EbcSp        The new EBC stack pointer.\r
   @param  FramePtr     The frame pointer.\r

-   \r
+\r

 **/\r
 VOID\r
 EFIAPI\r
 **/\r
 VOID\r
 EFIAPI\r


@@ -212,8 +207,7 @@ EbcLLCALLEXNative (
   IN UINTN        CallAddr,\r
   IN UINTN        EbcSp,\r
   IN VOID         *FramePtr\r
   IN UINTN        CallAddr,\r
   IN UINTN        EbcSp,\r
   IN VOID         *FramePtr\r

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

 \r
 /**\r
   This function is called to execute an EBC CALLEX instruction.\r
 \r
 /**\r
   This function is called to execute an EBC CALLEX instruction.\r


@@ -237,8 +231,7 @@ EbcLLCALLEX (
   IN UINTN        NewStackPointer,\r
   IN VOID         *FramePtr,\r
   IN UINT8        Size\r
   IN UINTN        NewStackPointer,\r
   IN VOID         *FramePtr,\r
   IN UINT8        Size\r

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

 \r
 /**\r
   When EBC calls native, on return the VM has to stuff the return\r
 \r
 /**\r
   When EBC calls native, on return the VM has to stuff the return\r


@@ -246,15 +239,14 @@ EbcLLCALLEX (
   in the register, so simply return and the caller should get the\r
   return result properly.\r
 \r
   in the register, so simply return and the caller should get the\r
   return result properly.\r
 \r

-  @return The unmodified value returned by the native code. \r
+  @return The unmodified value returned by the native code.\r

 \r
 **/\r
 INT64\r
 EFIAPI\r
 EbcLLGetReturnValue (\r
   VOID\r
 \r
 **/\r
 INT64\r
 EFIAPI\r
 EbcLLGetReturnValue (\r
   VOID\r

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

 \r
 /**\r
   Returns the stack index and buffer assosicated with the Handle parameter.\r
 \r
 /**\r
   Returns the stack index and buffer assosicated with the Handle parameter.\r