diff options
| author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-08-14 00:00:01 +0000 |
|---|---|---|
| committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-08-14 00:00:01 +0000 |
| commit | a1e3528b313590d31523ef8b68ce708621f35fde (patch) | |
| tree | e05dbd5e061f61d2c49be0af0afd78688a8f94f2 /IntelFrameworkModulePkg | |
| parent | 4cd79ac6e5e49e89b820df85d437b6263b8226f6 (diff) | |
| download | edk2-platforms-a1e3528b313590d31523ef8b68ce708621f35fde.tar.xz | |
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
Diffstat (limited to 'IntelFrameworkModulePkg')
5 files changed, 7 insertions, 17 deletions
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c index 2609591c0c..210d9ddf32 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/atapi.c @@ -754,7 +754,7 @@ PioReadWriteData ( WordCount = WordCount & 0xffff;
WordCount /= 2;
- WordCount = EFI_MIN (WordCount, (RequiredWordCount - ActualWordCount));
+ WordCount = MIN (WordCount, (RequiredWordCount - ActualWordCount));
if (Read) {
IDEReadPortWMultiple (
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c index 5830044752..35d489cb98 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.c @@ -393,7 +393,7 @@ IDEBusDriverBindingStart ( continue;
}
- EndIdeDevice = (UINT8) EFI_MIN ((MaxDevices - 1), EndIdeDevice);
+ EndIdeDevice = (UINT8) MIN ((MaxDevices - 1), EndIdeDevice);
//
// Now inform the IDE Controller Init Module. Sept10
diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h index 9dbf632392..9c6e41bc95 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/idebus.h @@ -43,8 +43,6 @@ //
// Extra Definition to porting
//
-#define EFI_MIN(a, b) (((a) < (b)) ? (a) : (b))
-
#define MAX_IDE_DEVICE 4
#define MAX_IDE_CHANNELS 2
#define MAX_IDE_DRIVES 2
diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c index 68820baac9..c76c3ebd17 100644 --- 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"
#include <IndustryStandard/Pci23.h>
-//
-// Min Max
-//
-#define EFI_MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define EFI_MAX(a, b) (((a) > (b)) ? (a) : (b))
-
EFI_STATUS
GetOpRomInfo (
@@ -245,7 +239,7 @@ Returns: // of the legacy length and the PCIR Image Length
//
if (CodeType == PCI_CODE_TYPE_PCAT_IMAGE) {
- RomImageSize = EFI_MAX(RomImageSize, (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512 * 512));
+ RomImageSize = MAX(RomImageSize, (((EFI_LEGACY_EXPANSION_ROM_HEADER *)RomHeader)->Size512 * 512));
}
if (RomImageSize > 0) {
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c index c689bc1ba0..bd0c853a05 100644 --- 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"
#include "Colors.h"
-#define EFI_MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b))
-
EFI_STATUS
ReadString(
IN UI_MENU_OPTION *MenuOption,
@@ -298,7 +296,7 @@ Error: // Display error popup
//
WidthOfString = GetStringWidth (Packet->String);
- ScreenSize = EFI_MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2;
+ ScreenSize = MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2;
CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);
FreePool (Packet);
@@ -407,11 +405,11 @@ Error: if (EFI_ERROR (Status)) {
if (Packet->String == NULL) {
WidthOfString = GetStringWidth (gConfirmError);
- ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
+ ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);
} else {
WidthOfString = GetStringWidth (Packet->String);
- ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
+ ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);
FreePool (Packet);
}
@@ -455,7 +453,7 @@ Error: goto Done;
} else {
WidthOfString = GetStringWidth (gConfirmError);
- ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
+ ScreenSize = MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;
CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);
StringPtr[0] = CHAR_NULL;
do {
|