Replace EFI_MIN() with MIN()
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3631
6f19259b-4bc3-4df7-8a09-
765794883524
WordCount = WordCount & 0xffff;\r
WordCount /= 2;\r
\r
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
\r
if (Read) {\r
IDEReadPortWMultiple (\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
\r
//\r
// Now inform the IDE Controller Init Module. Sept10\r
//\r
// Extra Definition to porting\r
//\r
//\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
#define MAX_IDE_DEVICE 4\r
#define MAX_IDE_CHANNELS 2\r
#define MAX_IDE_DRIVES 2\r
#include "PciResourceSupport.h"\r
\r
#include <IndustryStandard/Pci23.h>\r
#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
\r
EFI_STATUS\r
GetOpRomInfo (\r
// of the legacy length and the PCIR Image Length\r
//\r
if (CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {\r
// 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
}\r
\r
if (RomImageSize > 0) {\r
#include "Ui.h"\r
#include "Colors.h"\r
\r
#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
EFI_STATUS\r
ReadString(\r
IN UI_MENU_OPTION *MenuOption,\r
// Display error popup\r
//\r
WidthOfString = GetStringWidth (Packet->String);\r
// 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
CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
FreePool (Packet);\r
\r
if (EFI_ERROR (Status)) {\r
if (Packet->String == NULL) {\r
WidthOfString = GetStringWidth (gConfirmError);\r
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
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
CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
FreePool (Packet);\r
}\r
goto Done;\r
} else {\r
WidthOfString = GetStringWidth (gConfirmError);\r
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
CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);\r
StringPtr[0] = CHAR_NULL;\r
do {\r