From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=supreeth.venkatesh@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 591C321959CB2 for ; Thu, 28 Mar 2019 16:13:16 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 15218A78; Thu, 28 Mar 2019 16:13:16 -0700 (PDT) Received: from u201365.uas.Arm.com (supven01-ThinkStation-P720.austin.arm.com [10.118.28.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CFD193F557; Thu, 28 Mar 2019 16:13:15 -0700 (PDT) From: Supreeth Venkatesh To: edk2-devel@lists.01.org Cc: Supreeth Venkatesh , eric.jin@intel.com Date: Thu, 28 Mar 2019 18:12:16 -0500 Message-Id: <20190328231222.4717-24-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190328231222.4717-1-supreeth.venkatesh@arm.com> References: <20190328231222.4717-1-supreeth.venkatesh@arm.com> Subject: [edk2-test][PATCH v1 24/30] UEFI/Protocol: Remove struct and enum in Hii defines file. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 X-List-Received-Date: Thu, 28 Mar 2019 23:13:16 -0000 Fix compilation issues in definition file when compiled against edk2 stable tag edk2-stable201903 to avoid mutliple definitions of structures and enumerations which conflict with MdePkg definitions. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh --- uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h | 234 ------------------------- 1 file changed, 234 deletions(-) diff --git a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h index aed64edb..f352a21e 100644 --- a/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h +++ b/uefi-sct/SctPkg/UEFI/Protocol/HiiDef.h @@ -41,19 +41,6 @@ typedef UINT16 EFI_DEFAULT_ID; typedef UINT32 EFI_HII_FONT_STYLE; typedef VOID *EFI_FONT_HANDLE; -// -// HII package list -// -typedef struct { - EFI_GUID PackageListGuid; - UINT32 PackageLength; -} EFI_HII_PACKAGE_LIST_HEADER; - -typedef struct { - UINT32 Length:24; - UINT32 Type:8; -} EFI_HII_PACKAGE_HEADER; - #define EFI_HII_PACKAGE_TYPE_ALL 0x00 #define EFI_HII_PACKAGE_TYPE_GUID 0x01 #define EFI_HII_PACKAGE_FORM 0x02 @@ -80,29 +67,6 @@ typedef struct { #define EFI_GLYPH_NON_SPACING 0x01 #define EFI_GLYPH_WIDE 0x02 - -typedef struct { - CHAR16 UnicodeWeight; - UINT8 Attributes; - UINT8 GlyphCol1[EFI_GLYPH_HEIGHT]; -} EFI_NARROW_GLYPH; - -typedef struct { - CHAR16 UnicodeWeight; - UINT8 Attributes; - UINT8 GlyphCol1[EFI_GLYPH_HEIGHT]; - UINT8 GlyphCol2[EFI_GLYPH_HEIGHT]; - UINT8 Pad[3]; -} EFI_WIDE_GLYPH; - -typedef struct _EFI_HII_SIMPLE_FONT_PACKAGE_HDR { - EFI_HII_PACKAGE_HEADER Header; - UINT16 NumberOfNarrowGlyphs; - UINT16 NumberOfWideGlyphs; - EFI_NARROW_GLYPH *NarrowGlyphs; - EFI_WIDE_GLYPH *WideGlyphs; -} EFI_HII_SIMPLE_FONT_PACKAGE_HDR; - // // Font Package // @@ -151,14 +115,6 @@ typedef struct _EFI_FONT_DISPLAY_INFO { EFI_FONT_INFO FontInfo; } EFI_FONT_DISPLAY_INFO; -typedef struct _EFI_HII_GLYPH_INFO { - UINT16 Width; - UINT16 Height; - INT16 OffsetX; - INT16 OffsetY; - INT16 AdvanceX; -} EFI_HII_GLYPH_INFO; - typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL;; typedef struct _EFI_IMAGE_OUTPUT { @@ -178,15 +134,6 @@ typedef struct _EFI_HII_ROW_INFO { UINTN BaselineOffset; } EFI_HII_ROW_INFO; -typedef struct _EFI_HII_FONT_PACKAGE_HDR { - EFI_HII_PACKAGE_HEADER Header; - UINT32 HdrSize; - UINT32 GlyphBlockOffset; - EFI_HII_GLYPH_INFO Cell; - EFI_HII_FONT_STYLE FontStyle; - CHAR16 FontFamily[1]; -} EFI_HII_FONT_PACKAGE_HDR; - #define EFI_HII_GIBT_END 0x00 #define EFI_HII_GIBT_GLYPH 0x10 #define EFI_HII_GIBT_GLYPHS 0x11 @@ -208,14 +155,6 @@ typedef struct _EFI_HII_DEVICE_PATH_PACKAGE { EFI_DEVICE_PATH_PROTOCOL *DevicePath; } EFI_HII_DEVICE_PATH_PACKAGE; -// -// GUID Package -// -typedef struct _EFI_HII_GUID_PACKAGE_HDR { - EFI_HII_PACKAGE_HEADER Header; - EFI_GUID Guid; -} EFI_HII_GUID_PACKAGE_HDR; - // // String Package // @@ -223,20 +162,6 @@ typedef struct _EFI_HII_GUID_PACKAGE_HDR { #define UEFI_CONFIG_LANG L"x-UEFI" #define UEFI_CONFIG_LANG2 L"x-i-UEFI" // BUGBUG, spec need to be updated. -typedef struct _EFI_HII_STRING_PACKAGE_HDR { - EFI_HII_PACKAGE_HEADER Header; - UINT32 HdrSize; - UINT32 StringInfoOffset; - CHAR16 LanguageWindow[16]; - EFI_STRING_ID LanguageName; - CHAR8 Language[1]; -} EFI_HII_STRING_PACKAGE_HDR; - -typedef struct { - UINT8 BlockType; - //UINT8 BlockBody[]; -} EFI_HII_STRING_BLOCK; - #define EFI_HII_SIBT_END 0x00 #define EFI_HII_SIBT_STRING_SCSU 0x10 #define EFI_HII_SIBT_STRING_SCSU_FONT 0x11 @@ -258,16 +183,6 @@ typedef struct { // Image Packages // -typedef struct _EFI_HII_IMAGE_PACKAGE_HDR { - EFI_HII_PACKAGE_HEADER Header; - UINT32 ImageInfoOffset; - UINT32 PaletteInfoOffset; -} EFI_HII_IMAGE_PACKAGE_HDR; - -typedef struct _EFI_HII_IMAGE_BLOCK { - UINT8 BlockType; -} EFI_HII_IMAGE_BLOCK; - #define EFI_IMAGE_TRANSPARENT 0x00000001 typedef struct _EFI_IMAGE_INPUT { @@ -306,29 +221,6 @@ typedef UINT32 EFI_HII_DRAW_FLAGS; // Forms Package // -typedef struct { - UINT8 Hour; - UINT8 Minute; - UINT8 Second; -} EFI_HII_TIME; - -typedef struct { - UINT16 Year; - UINT8 Month; - UINT8 Day; -} EFI_HII_DATE; - -typedef union { - UINT8 u8; - UINT16 u16; - UINT32 u32; - UINT64 u64; - BOOLEAN b; - EFI_HII_TIME time; - EFI_HII_DATE date; - EFI_STRING_ID string; -} EFI_IFR_TYPE_VALUE; - #define EFI_IFR_FORM_OP 0x01 #define EFI_IFR_SUBTITLE_OP 0x02 #define EFI_IFR_TEXT_OP 0x03 @@ -437,114 +329,6 @@ EFI_STATUS IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType ); -typedef enum { - EfiKeyLCtrl, - EfiKeyA0, - EfiKeyLAlt, - EfiKeySpaceBar, - EfiKeyA2, - EfiKeyA3, - EfiKeyA4, - EfiKeyRCtrl, - EfiKeyLeftArrow, - EfiKeyDownArrow, - EfiKeyRightArrow, - EfiKeyZero, - EfiKeyPeriod, - EfiKeyEnter, - EfiKeyLShift, - EfiKeyB0, - EfiKeyB1, - EfiKeyB2, - EfiKeyB3, - EfiKeyB4, - EfiKeyB5, - EfiKeyB6, - EfiKeyB7, - EfiKeyB8, - EfiKeyB9, - EfiKeyB10, - EfiKeyRshift, - EfiKeyUpArrow, - EfiKeyOne, - EfiKeyTwo, - EfiKeyThree, - EfiKeyCapsLock, - EfiKeyC1, - EfiKeyC2, - EfiKeyC3, - EfiKeyC4, - EfiKeyC5, - EfiKeyC6, - EfiKeyC7, - EfiKeyC8, - EfiKeyC9, - EfiKeyC10, - EfiKeyC11, - EfiKeyC12, - EfiKeyFour, - EfiKeyFive, - EfiKeySix, - EfiKeyPlus, - EfiKeyTab, - EfiKeyD1, - EfiKeyD2, - EfiKeyD3, - EfiKeyD4, - EfiKeyD5, - EfiKeyD6, - EfiKeyD7, - EfiKeyD8, - EfiKeyD9, - EfiKeyD10, - EfiKeyD11, - EfiKeyD12, - EfiKeyD13, - EfiKeyDel, - EfiKeyEnd, - EfiKeyPgDn, - EfiKeySeven, - EfiKeyEight, - EfiKeyNine, - EfiKeyE0, - EfiKeyE1, - EfiKeyE2, - EfiKeyE3, - EfiKeyE4, - EfiKeyE5, - EfiKeyE6, - EfiKeyE7, - EfiKeyE8, - EfiKeyE9, - EfiKeyE10, - EfiKeyE11, - EfiKeyE12, - EfiKeyBackSpace, - EfiKeyIns, - EfiKeyHome, - EfiKeyPgUp, - EfiKeyNLck, - EfiKeySlash, - EfiKeyAsterisk, - EfiKeyMinus, - EfiKeyEsc, - EfiKeyF1, - EfiKeyF2, - EfiKeyF3, - EfiKeyF4, - EfiKeyF5, - EfiKeyF6, - EfiKeyF7, - EfiKeyF8, - EfiKeyF9, - EfiKeyF10, - EfiKeyF11, - EfiKeyF12, - EfiKeyPrint, - EfiKeySLck, - EfiKeyPause -} EFI_KEY; - #define EFI_NULL_MODIFIER 0x0000 #define EFI_LEFT_CONTROL_MODIFIER 0x0001 #define EFI_RIGHT_CONTROL_MODIFIER 0x0002 @@ -580,22 +364,4 @@ typedef enum { #define EFI_FUNCTION_KEY_ELEVEN_MODIFIER 0x0020 #define EFI_FUNCTION_KEY_TWELVE_MODIFIER 0x0021 -typedef struct { - EFI_KEY Key; - CHAR16 Unicode; - CHAR16 ShiftedUnicode; - CHAR16 AltGrUnicode; - CHAR16 ShiftedAltGrUnicode; - UINT16 Modifier; - UINT16 AffectedAttribute; -} EFI_KEY_DESCRIPTOR; - -typedef struct { - UINT16 LayoutLength; - EFI_GUID Guid; - UINT32 LayoutDescriptorStringOffset; - UINT8 DescriptorCount; - EFI_KEY_DESCRIPTOR Descriptors[1]; -} EFI_HII_KEYBOARD_LAYOUT; - #endif -- 2.17.1