#include <Library/HobLib.h>\r
#include "StandaloneMmCoreMemoryAllocationServices.h"\r
\r
-EFI_MM_SYSTEM_TABLE *gMmst = NULL;\r
+EFI_MM_SYSTEM_TABLE *gMmst = NULL;\r
\r
/**\r
Allocates one or more 4KB pages of a certain memory type.\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
}\r
- return (VOID *) (UINTN) Memory;\r
+\r
+ return (VOID *)(UINTN)Memory;\r
}\r
\r
/**\r
EFI_STATUS Status;\r
\r
ASSERT (Pages != 0);\r
- Status = gMmst->MmFreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer, Pages);\r
+ Status = gMmst->MmFreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Pages);\r
ASSERT_EFI_ERROR (Status);\r
}\r
\r
if (Pages == 0) {\r
return NULL;\r
}\r
+\r
if (Alignment > EFI_PAGE_SIZE) {\r
//\r
// Calculate the total number of pages since alignment is larger than page size.\r
//\r
- AlignmentMask = Alignment - 1;\r
- RealPages = Pages + EFI_SIZE_TO_PAGES (Alignment);\r
+ AlignmentMask = Alignment - 1;\r
+ RealPages = Pages + EFI_SIZE_TO_PAGES (Alignment);\r
//\r
// Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
//\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
}\r
- AlignedMemory = ((UINTN) Memory + AlignmentMask) & ~AlignmentMask;\r
- UnalignedPages = EFI_SIZE_TO_PAGES (AlignedMemory - (UINTN) Memory);\r
+\r
+ AlignedMemory = ((UINTN)Memory + AlignmentMask) & ~AlignmentMask;\r
+ UnalignedPages = EFI_SIZE_TO_PAGES (AlignedMemory - (UINTN)Memory);\r
if (UnalignedPages > 0) {\r
//\r
// Free first unaligned page(s).\r
Status = gMmst->MmFreePages (Memory, UnalignedPages);\r
ASSERT_EFI_ERROR (Status);\r
}\r
- Memory = (EFI_PHYSICAL_ADDRESS) (AlignedMemory + EFI_PAGES_TO_SIZE (Pages));\r
+\r
+ Memory = (EFI_PHYSICAL_ADDRESS)(AlignedMemory + EFI_PAGES_TO_SIZE (Pages));\r
UnalignedPages = RealPages - Pages - UnalignedPages;\r
if (UnalignedPages > 0) {\r
//\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
}\r
- AlignedMemory = (UINTN) Memory;\r
+\r
+ AlignedMemory = (UINTN)Memory;\r
}\r
- return (VOID *) AlignedMemory;\r
+\r
+ return (VOID *)AlignedMemory;\r
}\r
\r
/**\r
EFI_STATUS Status;\r
\r
ASSERT (Pages != 0);\r
- Status = gMmst->MmFreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer, Pages);\r
+ Status = gMmst->MmFreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Pages);\r
ASSERT_EFI_ERROR (Status);\r
}\r
\r
if (EFI_ERROR (Status)) {\r
Memory = NULL;\r
}\r
+\r
return Memory;\r
}\r
\r
if (Memory != NULL) {\r
Memory = ZeroMem (Memory, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
VOID *Memory;\r
\r
ASSERT (Buffer != NULL);\r
- ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));\r
+ ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
\r
Memory = InternalAllocatePool (PoolType, AllocationSize);\r
if (Memory != NULL) {\r
Memory = CopyMem (Memory, Buffer, AllocationSize);\r
}\r
+\r
return Memory;\r
}\r
\r
VOID *NewBuffer;\r
\r
NewBuffer = InternalAllocateZeroPool (PoolType, NewSize);\r
- if (NewBuffer != NULL && OldBuffer != NULL) {\r
+ if ((NewBuffer != NULL) && (OldBuffer != NULL)) {\r
CopyMem (NewBuffer, OldBuffer, MIN (OldSize, NewSize));\r
FreePool (OldBuffer);\r
}\r
+\r
return NewBuffer;\r
}\r
\r
VOID\r
EFIAPI\r
FreePool (\r
- IN VOID *Buffer\r
+ IN VOID *Buffer\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = gMmst->MmFreePool (Buffer);\r
ASSERT_EFI_ERROR (Status);\r
EFI_STATUS\r
EFIAPI\r
MemoryAllocationLibConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_MM_SYSTEM_TABLE *MmSystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_MM_SYSTEM_TABLE *MmSystemTable\r
)\r
{\r
- MM_CORE_PRIVATE_DATA *MmCorePrivate;\r
+ MM_CORE_PRIVATE_DATA *MmCorePrivate;\r
EFI_HOB_GUID_TYPE *GuidHob;\r
- MM_CORE_DATA_HOB_DATA *DataInHob;\r
+ MM_CORE_DATA_HOB_DATA *DataInHob;\r
VOID *HobStart;\r
EFI_MMRAM_HOB_DESCRIPTOR_BLOCK *MmramRangesHobData;\r
EFI_MMRAM_DESCRIPTOR *MmramRanges;\r
- UINT32 MmramRangeCount;\r
+ UINTN MmramRangeCount;\r
EFI_HOB_GUID_TYPE *MmramRangesHob;\r
\r
HobStart = GetHobList ();\r
return EFI_UNSUPPORTED;\r
}\r
\r
- MmramRangeCount = MmramRangesHobData->NumberOfMmReservedRegions;\r
+ MmramRangeCount = (UINTN)MmramRangesHobData->NumberOfMmReservedRegions;\r
if (MmramRanges == NULL) {\r
return EFI_UNSUPPORTED;\r
}\r
-\r
} else {\r
- DataInHob = GET_GUID_HOB_DATA (GuidHob);\r
- MmCorePrivate = (MM_CORE_PRIVATE_DATA *)(UINTN)DataInHob->Address;\r
+ DataInHob = GET_GUID_HOB_DATA (GuidHob);\r
+ MmCorePrivate = (MM_CORE_PRIVATE_DATA *)(UINTN)DataInHob->Address;\r
MmramRanges = (EFI_MMRAM_DESCRIPTOR *)(UINTN)MmCorePrivate->MmramRanges;\r
- MmramRangeCount = MmCorePrivate->MmramRangeCount;\r
+ MmramRangeCount = (UINTN)MmCorePrivate->MmramRangeCount;\r
}\r
\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
DEBUG ((DEBUG_INFO, "MmramRangeCount - 0x%x\n", MmramRangeCount));\r
for (Index = 0; Index < MmramRangeCount; Index++) {\r
- DEBUG ((DEBUG_INFO, "MmramRanges[%d]: 0x%016lx - 0x%016lx\n",\r
- Index, MmramRanges[Index].CpuStart, MmramRanges[Index].PhysicalSize));\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "MmramRanges[%d]: 0x%016lx - 0x%016lx\n",\r
+ Index,\r
+ MmramRanges[Index].CpuStart,\r
+ MmramRanges[Index].PhysicalSize\r
+ ));\r
}\r
}\r
\r