Revision: 16552
http://sourceforge.net/p/edk2/code/16552
Author: hhtian
Date: 2014-12-23 08:33:06 +0000 (Tue, 23 Dec 2014)
Log Message:
-----------
MdeModulePkg: fix mixed dos and linux EOL format issue
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hot Tian <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Gcd/Gcd.c 2014-12-23 08:31:24 UTC (rev
16551)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Gcd/Gcd.c 2014-12-23 08:33:06 UTC (rev
16552)
@@ -812,22 +812,22 @@
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 @@
//
// 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 @@
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;
}
Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c 2014-12-23 08:31:24 UTC (rev
16551)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Page.c 2014-12-23 08:33:06 UTC (rev
16552)
@@ -1396,14 +1396,14 @@
)
{
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
can be merged with any of the other memory map descriptors in a memorymap.
Modified: trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c
===================================================================
--- trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c 2014-12-23 08:31:24 UTC (rev
16551)
+++ trunk/edk2/MdeModulePkg/Core/Dxe/Mem/Pool.c 2014-12-23 08:33:06 UTC (rev
16552)
@@ -433,14 +433,14 @@
)
{
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.
Caller must have the memory lock held
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
