Replace EFI_MAX() with MAX()

Replace EFI_MIN() with MIN()

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c
index 2609591c0c768a82b290987f676afcf239101202..210d9ddf322a14b385e4dffcd3f99a06cae6c757 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c
@@ -754,7 +754,7 @@ PioReadWriteData (
     WordCount = WordCount & 0xffff;\r
     WordCount /= 2;\r
 \r
-    WordCount = EFI_MIN (WordCount, (RequiredWordCount - ActualWordCount));\r
+    WordCount = MIN (WordCount, (RequiredWordCount - ActualWordCount));\r
 \r
     if (Read) {\r
       IDEReadPortWMultiple (\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c
index 58300447524a881697c469797895b47ea2958150..35d489cb989711ba766fdeb8623502dc06b1749d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c
@@ -393,7 +393,7 @@ IDEBusDriverBindingStart (
       continue;\r
     }\r
 \r
-    EndIdeDevice = (UINT8) EFI_MIN ((MaxDevices - 1), EndIdeDevice);\r
+    EndIdeDevice = (UINT8) MIN ((MaxDevices - 1), EndIdeDevice);\r
 \r
     //\r
     // Now inform the IDE Controller Init Module. Sept10\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
index 9dbf63239233d88350fd96893e41f0083526e825..9c6e41bc95888fe17c1c8c26532806981e5f88ff 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h
@@ -43,8 +43,6 @@
 //\r
 // Extra Definition to porting\r
 //\r
-#define EFI_MIN(a, b) (((a) < (b)) ? (a) : (b))\r
-\r
 #define MAX_IDE_DEVICE    4\r
 #define MAX_IDE_CHANNELS  2\r
 #define MAX_IDE_DRIVES    2\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index 68820baac984be36b7f72b8efa538ccd5554a159..c76c3ebd174e8b32666dfbe70cc12dc694313974 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -15,12 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "PciResourceSupport.h"\r
 \r
 #include <IndustryStandard/Pci23.h>\r
-//\r
-// Min Max\r
-//\r
-#define EFI_MIN(a, b) (((a) < (b)) ? (a) : (b))\r
-#define EFI_MAX(a, b) (((a) > (b)) ? (a) : (b))\r
-\r
 \r
 EFI_STATUS\r
 GetOpRomInfo (\r
@@ -245,7 +239,7 @@ Returns:
   // of the legacy length and the PCIR Image Length\r
   //\r
   if (CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {\r
-    RomImageSize = EFI_MAX(RomImageSize, (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512 * 512));\r
+    RomImageSize = MAX(RomImageSize, (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512 * 512));\r
   }\r
 \r
   if (RomImageSize > 0) {\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index c689bc1ba0fc11621f088ef4d00d953e3c040ff7..bd0c853a05ccd66c15ef1e9c813ad6af764057ae 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Ui.h"\r
 #include "Colors.h"\r
 \r
-#define EFI_MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b))\r
-\r
 EFI_STATUS\r
 ReadString(\r
   IN  UI_MENU_OPTION              *MenuOption,\r
@@ -298,7 +296,7 @@ Error:
         // Display error popup\r
         //\r
         WidthOfString = GetStringWidth (Packet->String);\r
-        ScreenSize = EFI_MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
+        ScreenSize = MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
         CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
         FreePool (Packet);\r
 \r
@@ -407,11 +405,11 @@ Error:
             if (EFI_ERROR (Status)) {\r
               if (Packet->String == NULL) {\r
                 WidthOfString = GetStringWidth (gConfirmError);\r
-                ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
+                ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
                 CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);\r
               } else {\r
                 WidthOfString = GetStringWidth (Packet->String);\r
-                ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
+                ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
                 CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
                 FreePool (Packet);\r
               }\r
@@ -455,7 +453,7 @@ Error:
             goto Done;\r
           } else {\r
             WidthOfString = GetStringWidth (gConfirmError);\r
-            ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
+            ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
             CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);\r
             StringPtr[0] = CHAR_NULL;\r
             do {\r