diff options
| author | Hot Tian <hot.tian@intel.com> | 2014-12-23 08:33:06 +0000 |
|---|---|---|
| committer | hhtian <hhtian@Edk2> | 2014-12-23 08:33:06 +0000 |
| commit | 736a692e7c0210eb71c01c39731ef97383d606eb (patch) | |
| tree | b725908cfad8ca1e6c49d3b91f4feb34197d3543 /MdeModulePkg | |
| parent | b947f0cf4431769ded585ac7fd57ab1744149b26 (diff) | |
| download | edk2-platforms-736a692e7c0210eb71c01c39731ef97383d606eb.tar.xz | |
MdeModulePkg: fix mixed dos and linux EOL format issue
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hot Tian <hot.tian@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16552 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 48 | ||||
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Mem/Page.c | 14 | ||||
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Mem/Pool.c | 14 |
3 files changed, 38 insertions, 38 deletions
diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c index 7268465f36..6703c84517 100644 --- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c +++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c @@ -812,22 +812,22 @@ CoreConvertSpace ( goto Done;
}
break;
- // - // Set capabilities operation - // - case GCD_SET_CAPABILITIES_MEMORY_OPERATION: - if ((BaseAddress & EFI_PAGE_MASK) != 0 || (Length & EFI_PAGE_MASK) != 0) { - Status = EFI_INVALID_PARAMETER; - - goto Done; + //
+ // Set capabilities operation
+ //
+ case GCD_SET_CAPABILITIES_MEMORY_OPERATION:
+ if ((BaseAddress & EFI_PAGE_MASK) != 0 || (Length & EFI_PAGE_MASK) != 0) {
+ Status = EFI_INVALID_PARAMETER;
+
+ goto Done;
}
- // + //
// Current attributes must still be supported with new capabilities
- // - if ((Capabilities & Entry->Attributes) != Entry->Attributes) { - Status = EFI_UNSUPPORTED; - goto Done; - } + //
+ if ((Capabilities & Entry->Attributes) != Entry->Attributes) {
+ Status = EFI_UNSUPPORTED;
+ goto Done;
+ }
break;
}
Link = Link->ForwardLink;
@@ -916,8 +916,8 @@ CoreConvertSpace ( //
// Set capabilities operation
//
- case GCD_SET_CAPABILITIES_MEMORY_OPERATION: - Entry->Capabilities = Capabilities; + case GCD_SET_CAPABILITIES_MEMORY_OPERATION:
+ Entry->Capabilities = Capabilities;
break;
}
Link = Link->ForwardLink;
@@ -1606,16 +1606,16 @@ CoreSetMemorySpaceCapabilities ( IN UINT64 Capabilities
)
{
- EFI_STATUS Status; - + EFI_STATUS Status;
+
DEBUG ((DEBUG_GCD, "GCD:CoreSetMemorySpaceCapabilities(Base=%016lx,Length=%016lx)\n", BaseAddress, Length));
- DEBUG ((DEBUG_GCD, " Capabilities = %016lx\n", Capabilities)); - - Status = CoreConvertSpace (GCD_SET_CAPABILITIES_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, Capabilities, 0); + DEBUG ((DEBUG_GCD, " Capabilities = %016lx\n", Capabilities));
+
+ Status = CoreConvertSpace (GCD_SET_CAPABILITIES_MEMORY_OPERATION, (EFI_GCD_MEMORY_TYPE) 0, (EFI_GCD_IO_TYPE) 0, BaseAddress, Length, Capabilities, 0);
if (!EFI_ERROR(Status)) {
- CoreUpdateMemoryAttributes(BaseAddress, RShiftU64(Length, EFI_PAGE_SHIFT), Capabilities); - } - + CoreUpdateMemoryAttributes(BaseAddress, RShiftU64(Length, EFI_PAGE_SHIFT), Capabilities);
+ }
+
return Status;
}
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c index 29354b4399..fa84e26125 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Page.c +++ b/MdeModulePkg/Core/Dxe/Mem/Page.c @@ -1396,13 +1396,13 @@ CoreFreePages ( )
{
EFI_STATUS Status;
- - Status = CoreInternalFreePages (Memory, NumberOfPages); - if (!EFI_ERROR (Status)) { - CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0), MemoryProfileActionFreePages, (EFI_MEMORY_TYPE) 0, EFI_PAGES_TO_SIZE (NumberOfPages), (VOID *) (UINTN) Memory); - } - return Status; -} +
+ Status = CoreInternalFreePages (Memory, NumberOfPages);
+ if (!EFI_ERROR (Status)) {
+ CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0), MemoryProfileActionFreePages, (EFI_MEMORY_TYPE) 0, EFI_PAGES_TO_SIZE (NumberOfPages), (VOID *) (UINTN) Memory);
+ }
+ return Status;
+}
/**
This function checks to see if the last memory map descriptor in a memory map
diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c index 6bf289b38f..a40ddd51bd 100644 --- a/MdeModulePkg/Core/Dxe/Mem/Pool.c +++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c @@ -433,13 +433,13 @@ CoreFreePool ( )
{
EFI_STATUS Status;
- - Status = CoreInternalFreePool (Buffer); - if (!EFI_ERROR (Status)) { - CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0), MemoryProfileActionFreePool, (EFI_MEMORY_TYPE) 0, 0, Buffer); - } - return Status; -} +
+ Status = CoreInternalFreePool (Buffer);
+ if (!EFI_ERROR (Status)) {
+ CoreUpdateProfile ((EFI_PHYSICAL_ADDRESS) (UINTN) RETURN_ADDRESS (0), MemoryProfileActionFreePool, (EFI_MEMORY_TYPE) 0, 0, Buffer);
+ }
+ return Status;
+}
/**
Internal function to free a pool entry.
|