| Message ID | 20181106175833.26964-11-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC | expand |
On 6/11/18 18:58, Ard Biesheuvel wrote: > The Data4 member of the GUID/EFI_GUID struct type is an array of > UINT8, so literals require two sets of { } braces. Add them where > missing. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > IntelUndiPkg/GigUndiDxe/NVDataStruc.h | 4 ++-- > IntelUndiPkg/GigUndiDxe/StartStop.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > index bd7d4defc9a3..72f6a95ccb6d 100644 > --- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > +++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > @@ -34,12 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > #define E1000_HII_FORM_GUID \ > { \ > - 0x77f2ea2f, 0x4312, 0x4569, 0x85, 0xc4, 0x58, 0x3a, 0xcd, 0x8d, 0xb7, 0xe2 \ > + 0x77f2ea2f, 0x4312, 0x4569, { 0x85, 0xc4, 0x58, 0x3a, 0xcd, 0x8d, 0xb7, 0xe2 } \ > } > > #define E1000_HII_DATA_GUID \ > { \ > - 0xa31abb16, 0xc627, 0x475b, 0x98, 0x8e, 0x7e, 0xe0, 0x77, 0x67, 0x40, 0xf3 \ > + 0xa31abb16, 0xc627, 0x475b, { 0x98, 0x8e, 0x7e, 0xe0, 0x77, 0x67, 0x40, 0xf3 } \ > } > > > diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.h b/IntelUndiPkg/GigUndiDxe/StartStop.h > index 255f17aabaa4..b29a5002bb8e 100644 > --- a/IntelUndiPkg/GigUndiDxe/StartStop.h > +++ b/IntelUndiPkg/GigUndiDxe/StartStop.h > @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > #include "e1000.h" > > #define EFI_DRIVER_STOP_PROTOCOL_GUID \ > -{ 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \ > -0xb5, 0xfd, 0x7d, 0xc1 } > +{ 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \ > +0xb5, 0xfd, 0x7d, 0xc1 } } > > typedef struct EFI_DRIVER_STOP_PROTOCOL_S EFI_DRIVER_STOP_PROTOCOL; > >
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com> On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote: > The Data4 member of the GUID/EFI_GUID struct type is an array of > UINT8, so literals require two sets of { } braces. Add them where > missing. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org> > --- > IntelUndiPkg/GigUndiDxe/NVDataStruc.h | 4 ++-- > IntelUndiPkg/GigUndiDxe/StartStop.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > index bd7d4defc9a3..72f6a95ccb6d 100644 > --- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > +++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h > @@ -34,12 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF SUCH DAMAGE. > > #define E1000_HII_FORM_GUID \ > { \ > - 0x77f2ea2f, 0x4312, 0x4569, 0x85, 0xc4, 0x58, 0x3a, 0xcd, 0x8d, > 0xb7, 0xe2 \ > + 0x77f2ea2f, 0x4312, 0x4569, { 0x85, 0xc4, 0x58, 0x3a, 0xcd, > 0x8d, 0xb7, 0xe2 } \ > } > > #define E1000_HII_DATA_GUID \ > { \ > - 0xa31abb16, 0xc627, 0x475b, 0x98, 0x8e, 0x7e, 0xe0, 0x77, 0x67, > 0x40, 0xf3 \ > + 0xa31abb16, 0xc627, 0x475b, { 0x98, 0x8e, 0x7e, 0xe0, 0x77, > 0x67, 0x40, 0xf3 } \ > } > > > diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.h > b/IntelUndiPkg/GigUndiDxe/StartStop.h > index 255f17aabaa4..b29a5002bb8e 100644 > --- a/IntelUndiPkg/GigUndiDxe/StartStop.h > +++ b/IntelUndiPkg/GigUndiDxe/StartStop.h > @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF SUCH DAMAGE. > #include "e1000.h" > > #define EFI_DRIVER_STOP_PROTOCOL_GUID \ > -{ 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \ > -0xb5, 0xfd, 0x7d, 0xc1 } > +{ 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \ > +0xb5, 0xfd, 0x7d, 0xc1 } } > > typedef struct EFI_DRIVER_STOP_PROTOCOL_S EFI_DRIVER_STOP_PROTOCOL; > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h index bd7d4defc9a3..72f6a95ccb6d 100644 --- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h +++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h @@ -34,12 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define E1000_HII_FORM_GUID \ { \ - 0x77f2ea2f, 0x4312, 0x4569, 0x85, 0xc4, 0x58, 0x3a, 0xcd, 0x8d, 0xb7, 0xe2 \ + 0x77f2ea2f, 0x4312, 0x4569, { 0x85, 0xc4, 0x58, 0x3a, 0xcd, 0x8d, 0xb7, 0xe2 } \ } #define E1000_HII_DATA_GUID \ { \ - 0xa31abb16, 0xc627, 0x475b, 0x98, 0x8e, 0x7e, 0xe0, 0x77, 0x67, 0x40, 0xf3 \ + 0xa31abb16, 0xc627, 0x475b, { 0x98, 0x8e, 0x7e, 0xe0, 0x77, 0x67, 0x40, 0xf3 } \ } diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.h b/IntelUndiPkg/GigUndiDxe/StartStop.h index 255f17aabaa4..b29a5002bb8e 100644 --- a/IntelUndiPkg/GigUndiDxe/StartStop.h +++ b/IntelUndiPkg/GigUndiDxe/StartStop.h @@ -32,8 +32,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "e1000.h" #define EFI_DRIVER_STOP_PROTOCOL_GUID \ -{ 0x34d59603, 0x1428, 0x4429, 0xa4, 0x14, 0xe6, 0xb3, \ -0xb5, 0xfd, 0x7d, 0xc1 } +{ 0x34d59603, 0x1428, 0x4429, { 0xa4, 0x14, 0xe6, 0xb3, \ +0xb5, 0xfd, 0x7d, 0xc1 } } typedef struct EFI_DRIVER_STOP_PROTOCOL_S EFI_DRIVER_STOP_PROTOCOL;
The Data4 member of the GUID/EFI_GUID struct type is an array of UINT8, so literals require two sets of { } braces. Add them where missing. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- IntelUndiPkg/GigUndiDxe/NVDataStruc.h | 4 ++-- IntelUndiPkg/GigUndiDxe/StartStop.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel