From 0b4db1399462dc8febb6d5c798b68c257f9055b1 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 5 May 2016 20:21:47 -0700 Subject: vendorcode/intel/fsp1_0: Don't break GCC strict aliasing Change-Id: I6b345670db7df652b8b712b721dfe2905373e0d5 Signed-off-by: Stefan Reinauer Reviewed-on: https://review.coreboot.org/14630 Tested-by: build bot (Jenkins) Reviewed-by: Leroy P Leahy Reviewed-by: York Yang --- .../intel/fsp1_0/baytrail/include/fsphob.h | 12 +++++----- .../intel/fsp1_0/baytrail/srx/board_fsp.c | 12 +++++----- src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c | 6 ++--- .../intel/fsp1_0/broadwell_de/include/fsphob.h | 12 +++++----- .../intel/fsp1_0/broadwell_de/srx/fspsupport.c | 26 +++++++++++----------- .../fsp1_0/ivybridge_bd82x6x/include/fsphob.h | 12 +++++----- .../intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c | 6 ++--- .../intel/fsp1_0/ivybridge_i89xx/include/fsphob.h | 12 +++++----- .../intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c | 6 ++--- .../intel/fsp1_0/rangeley/include/fsphob.h | 12 +++++----- .../intel/fsp1_0/rangeley/srx/fsp_support.c | 12 +++++----- src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c | 6 ++--- 12 files changed, 67 insertions(+), 67 deletions(-) (limited to 'src/vendorcode/intel') diff --git a/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h index 7edef0d69e..04e2123b9b 100644 --- a/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h +++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h @@ -313,7 +313,7 @@ typedef union { **/ #define GET_HOB_TYPE(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType) /** Returns the length, in bytes, of a HOB. @@ -327,7 +327,7 @@ typedef union { **/ #define GET_HOB_LENGTH(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength) /** Returns a pointer to the next HOB in the HOB list. @@ -341,7 +341,7 @@ typedef union { **/ #define GET_NEXT_HOB(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart)) + (VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart)) /** Determines if a HOB is the last HOB in the HOB list. @@ -356,7 +356,7 @@ typedef union { @retval FALSE The HOB specified by HobStart is not the last HOB in the HOB list. **/ -#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) +#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) /** Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -370,7 +370,7 @@ typedef union { **/ #define GET_GUID_HOB_DATA(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE)) + (VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE)) /** Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -383,7 +383,7 @@ typedef union { @return The size of the data buffer. **/ #define GET_GUID_HOB_DATA_SIZE(HobStart) \ - (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE)) + (UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE)) /** Returns the pointer to the HOB list. diff --git a/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c b/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c index 2cb3492fa4..85673ea2f7 100644 --- a/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c +++ b/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c @@ -54,7 +54,7 @@ GetLowMemorySize ( // // Collect memory ranges // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { // @@ -66,7 +66,7 @@ GetLowMemorySize ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return; @@ -89,7 +89,7 @@ GetHighMemorySize ( // // Collect memory ranges // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { // @@ -100,7 +100,7 @@ GetHighMemorySize ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return; @@ -125,7 +125,7 @@ GetFspReservedMemoryFromGuid ( // // Collect memory ranges // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) { if (CompareGuid(&Hob.ResourceDescriptor->Owner, &FspReservedMemoryGuid)) { @@ -135,7 +135,7 @@ GetFspReservedMemoryFromGuid ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return; diff --git a/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c index 5d6e890300..018682e418 100644 --- a/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c +++ b/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c @@ -136,11 +136,11 @@ GetNextHob ( // // Parse the HOB list until end of list or matching type is found. // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == Type) { return Hob.Raw; } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return NULL; } @@ -177,7 +177,7 @@ GetNextGuidHob ( if (CompareGuid (Guid, &GuidHob.Guid->Name)) { break; } - GuidHob.Raw = GET_NEXT_HOB (GuidHob); + GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw); } return GuidHob.Raw; } diff --git a/src/vendorcode/intel/fsp1_0/broadwell_de/include/fsphob.h b/src/vendorcode/intel/fsp1_0/broadwell_de/include/fsphob.h index 59e34ef5d7..7f80479857 100644 --- a/src/vendorcode/intel/fsp1_0/broadwell_de/include/fsphob.h +++ b/src/vendorcode/intel/fsp1_0/broadwell_de/include/fsphob.h @@ -313,7 +313,7 @@ typedef union { **/ #define GET_HOB_TYPE(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType) /** Returns the length, in bytes, of a HOB. @@ -327,7 +327,7 @@ typedef union { **/ #define GET_HOB_LENGTH(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength) /** Returns a pointer to the next HOB in the HOB list. @@ -341,7 +341,7 @@ typedef union { **/ #define GET_NEXT_HOB(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart)) + (VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart)) /** Determines if a HOB is the last HOB in the HOB list. @@ -356,7 +356,7 @@ typedef union { @retval FALSE The HOB specified by HobStart is not the last HOB in the HOB list. **/ -#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) +#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) /** Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -370,7 +370,7 @@ typedef union { **/ #define GET_GUID_HOB_DATA(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE)) + (VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE)) /** Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -383,7 +383,7 @@ typedef union { @return The size of the data buffer. **/ #define GET_GUID_HOB_DATA_SIZE(HobStart) \ - (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE)) + (UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE)) /** diff --git a/src/vendorcode/intel/fsp1_0/broadwell_de/srx/fspsupport.c b/src/vendorcode/intel/fsp1_0/broadwell_de/srx/fspsupport.c index 96fd98471e..93a166879e 100644 --- a/src/vendorcode/intel/fsp1_0/broadwell_de/srx/fspsupport.c +++ b/src/vendorcode/intel/fsp1_0/broadwell_de/srx/fspsupport.c @@ -114,11 +114,11 @@ GetNextHob ( /* * Parse the HOB list until end of list or matching type is found. */ - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == Type) { return Hob.Raw; } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return NULL; @@ -142,11 +142,11 @@ GetNextGuidHob ( EFI_PEI_HOB_POINTERS GuidHob; GuidHob.Raw = (UINT8 *) HobStart; - while ((GuidHob.Raw = GetNextHob (EFI_HOB_TYPE_GUID_EXTENSION, GuidHob.Raw)) != NULL) { + while ((GuidHob.Raw = GetNextHob(EFI_HOB_TYPE_GUID_EXTENSION, GuidHob.Raw)) != NULL) { if (CompareGuid (Guid, &GuidHob.Guid->Name)) { break; } - GuidHob.Raw = GET_NEXT_HOB (GuidHob); + GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw); } return GuidHob.Raw; @@ -175,7 +175,7 @@ GetUsableLowMemTop ( * Collect memory ranges */ MemLen = 0x100000; - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { /* @@ -187,7 +187,7 @@ GetUsableLowMemTop ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return MemLen; @@ -219,7 +219,7 @@ GetPhysicalLowMemTop ( */ MemBase = 0x100000; MemLen = 0; - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) || (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED)) { @@ -233,7 +233,7 @@ GetPhysicalLowMemTop ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return MemBase + MemLen; @@ -262,7 +262,7 @@ GetUsableHighMemTop ( * Collect memory ranges */ MemTop = 0x100000000; - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { /* @@ -273,7 +273,7 @@ GetUsableHighMemTop ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return MemTop; @@ -306,7 +306,7 @@ GetFspReservedMemoryFromGuid ( /* * Collect memory ranges */ - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) { if (CompareGuid(&Hob.ResourceDescriptor->Owner, OwnerGuid)) { @@ -317,7 +317,7 @@ GetFspReservedMemoryFromGuid ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return 0; @@ -451,4 +451,4 @@ GetBootloaderTempMemoryBuffer ( { const EFI_GUID FspBootloaderTemporaryMemoryHobGuid = FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID; return GetGuidHobDataBuffer (HobListPtr, Length, (EFI_GUID *)&FspBootloaderTemporaryMemoryHobGuid); -} \ No newline at end of file +} diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h index 58409074bc..5d64e51ceb 100644 --- a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h +++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h @@ -313,7 +313,7 @@ typedef union { **/ #define GET_HOB_TYPE(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType) /** Returns the length, in bytes, of a HOB. @@ -327,7 +327,7 @@ typedef union { **/ #define GET_HOB_LENGTH(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength) /** Returns a pointer to the next HOB in the HOB list. @@ -341,7 +341,7 @@ typedef union { **/ #define GET_NEXT_HOB(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart)) + (VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart)) /** Determines if a HOB is the last HOB in the HOB list. @@ -356,7 +356,7 @@ typedef union { @retval FALSE The HOB specified by HobStart is not the last HOB in the HOB list. **/ -#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) +#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) /** Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -370,7 +370,7 @@ typedef union { **/ #define GET_GUID_HOB_DATA(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE)) + (VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE)) /** Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -383,7 +383,7 @@ typedef union { @return The size of the data buffer. **/ #define GET_GUID_HOB_DATA_SIZE(HobStart) \ - (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE)) + (UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE)) /** Returns the pointer to the HOB list. diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c index 4214b3ae22..5a1c600a24 100644 --- a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c +++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c @@ -145,11 +145,11 @@ GetNextHob ( // // Parse the HOB list until end of list or matching type is found. // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == Type) { return Hob.Raw; } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return NULL; } @@ -186,7 +186,7 @@ GetNextGuidHob ( if (CompareGuid (Guid, &GuidHob.Guid->Name)) { break; } - GuidHob.Raw = GET_NEXT_HOB (GuidHob); + GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw); } return GuidHob.Raw; } diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h index 58409074bc..5d64e51ceb 100644 --- a/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h +++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h @@ -313,7 +313,7 @@ typedef union { **/ #define GET_HOB_TYPE(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType) /** Returns the length, in bytes, of a HOB. @@ -327,7 +327,7 @@ typedef union { **/ #define GET_HOB_LENGTH(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength) /** Returns a pointer to the next HOB in the HOB list. @@ -341,7 +341,7 @@ typedef union { **/ #define GET_NEXT_HOB(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart)) + (VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart)) /** Determines if a HOB is the last HOB in the HOB list. @@ -356,7 +356,7 @@ typedef union { @retval FALSE The HOB specified by HobStart is not the last HOB in the HOB list. **/ -#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) +#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) /** Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -370,7 +370,7 @@ typedef union { **/ #define GET_GUID_HOB_DATA(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE)) + (VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE)) /** Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -383,7 +383,7 @@ typedef union { @return The size of the data buffer. **/ #define GET_GUID_HOB_DATA_SIZE(HobStart) \ - (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE)) + (UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE)) /** Returns the pointer to the HOB list. diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c index 4214b3ae22..5a1c600a24 100644 --- a/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c +++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c @@ -145,11 +145,11 @@ GetNextHob ( // // Parse the HOB list until end of list or matching type is found. // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == Type) { return Hob.Raw; } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return NULL; } @@ -186,7 +186,7 @@ GetNextGuidHob ( if (CompareGuid (Guid, &GuidHob.Guid->Name)) { break; } - GuidHob.Raw = GET_NEXT_HOB (GuidHob); + GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw); } return GuidHob.Raw; } diff --git a/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h index 0f743b50d4..a4200c53c1 100644 --- a/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h +++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h @@ -315,7 +315,7 @@ typedef union { **/ #define GET_HOB_TYPE(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType) /** Returns the length, in bytes, of a HOB. @@ -329,7 +329,7 @@ typedef union { **/ #define GET_HOB_LENGTH(HobStart) \ - ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength) + (((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength) /** Returns a pointer to the next HOB in the HOB list. @@ -343,7 +343,7 @@ typedef union { **/ #define GET_NEXT_HOB(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart)) + (VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart)) /** Determines if a HOB is the last HOB in the HOB list. @@ -358,7 +358,7 @@ typedef union { @retval FALSE The HOB specified by HobStart is not the last HOB in the HOB list. **/ -#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) +#define END_OF_HOB_LIST(HobStart) (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST) /** Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -372,7 +372,7 @@ typedef union { **/ #define GET_GUID_HOB_DATA(HobStart) \ - (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE)) + (VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE)) /** Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION. @@ -385,7 +385,7 @@ typedef union { @return The size of the data buffer. **/ #define GET_GUID_HOB_DATA_SIZE(HobStart) \ - (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE)) + (UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE)) /** Returns the pointer to the HOB list. diff --git a/src/vendorcode/intel/fsp1_0/rangeley/srx/fsp_support.c b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsp_support.c index 9f15b3e8db..68e6fa0e85 100644 --- a/src/vendorcode/intel/fsp1_0/rangeley/srx/fsp_support.c +++ b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsp_support.c @@ -56,7 +56,7 @@ GetUsableLowMemTop ( * Collect memory ranges */ MemLen = 0x100000; - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { /* @@ -68,7 +68,7 @@ GetUsableLowMemTop ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return MemLen; @@ -98,7 +98,7 @@ GetUsableHighMemTop ( * Collect memory ranges */ MemTop = 0x100000000; - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) { /* @@ -109,7 +109,7 @@ GetUsableHighMemTop ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return MemTop; @@ -143,7 +143,7 @@ GetFspReservedMemoryFromGuid ( /* * Collect memory ranges */ - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) { if (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) { if (CompareGuid(&Hob.ResourceDescriptor->Owner, OwnerGuid)) { @@ -153,7 +153,7 @@ GetFspReservedMemoryFromGuid ( } } } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } } diff --git a/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c index 4986d52436..ba56543975 100644 --- a/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c +++ b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c @@ -142,11 +142,11 @@ GetNextHob ( // // Parse the HOB list until end of list or matching type is found. // - while (!END_OF_HOB_LIST (Hob)) { + while (!END_OF_HOB_LIST(Hob.Raw)) { if (Hob.Header->HobType == Type) { return Hob.Raw; } - Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GET_NEXT_HOB(Hob.Raw); } return NULL; } @@ -183,7 +183,7 @@ GetNextGuidHob ( if (CompareGuid (Guid, &GuidHob.Guid->Name)) { break; } - GuidHob.Raw = GET_NEXT_HOB (GuidHob); + GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw); } return GuidHob.Raw; } -- cgit v1.2.3