tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Both FrameworkHii and UefiHii declare some macros and structure with the same name. To make a Framework Hii to Uefi HII thunk layer to be able to be built. We need to define the Framework Hii names with a prefix "FRAMEWORK_". 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4992 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2008-04-03 10:02:13 +00:00
parent 14246993c8
commit c1adc63d02
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
View File

@ -50,7 +50,7 @@ typedef struct {
UINTN RightColumn; UINTN RightColumn;
UINTN TopRow; UINTN TopRow;
UINTN BottomRow; UINTN BottomRow;
} EFI_SCREEN_DESCRIPTOR; } FRAMEWORK_EFI_SCREEN_DESCRIPTOR;
/** /**
Provides direction to the configuration driver whether to use the HII Provides direction to the configuration driver whether to use the HII
@ -99,7 +99,7 @@ EFI_STATUS
IN FRAMEWORK_EFI_IFR_PACKET *Packet, OPTIONAL IN FRAMEWORK_EFI_IFR_PACKET *Packet, OPTIONAL
IN EFI_HANDLE CallbackHandle, OPTIONAL IN EFI_HANDLE CallbackHandle, OPTIONAL
IN UINT8 *NvMapOverride, OPTIONAL IN UINT8 *NvMapOverride, OPTIONAL
IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL IN FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL
OUT BOOLEAN *ResetRequired OPTIONAL OUT BOOLEAN *ResetRequired OPTIONAL
); );

68
IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
View File

@ -303,7 +303,7 @@ typedef struct _EFI_HII_VARIABLE_PACK_LIST {
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_NEW_PACK) ( (EFIAPI *FRAMEWORK_EFI_HII_NEW_PACK) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN EFI_HII_PACKAGES *Packages, IN EFI_HII_PACKAGES *Packages,
OUT FRAMEWORK_EFI_HII_HANDLE *Handle OUT FRAMEWORK_EFI_HII_HANDLE *Handle
@ -323,7 +323,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_REMOVE_PACK) ( (EFIAPI *FRAMEWORK_EFI_HII_REMOVE_PACK) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
); );
@ -344,7 +344,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_FIND_HANDLES) ( (EFIAPI *FRAMEWORK_EFI_HII_FIND_HANDLES) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN OUT UINT16 *HandleBufferLength, IN OUT UINT16 *HandleBufferLength,
OUT FRAMEWORK_EFI_HII_HANDLE *Handle OUT FRAMEWORK_EFI_HII_HANDLE *Handle
@ -369,7 +369,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_EXPORT) ( (EFIAPI *FRAMEWORK_EFI_HII_EXPORT) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
@ -389,7 +389,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_RESET_STRINGS) ( (EFIAPI *FRAMEWORK_EFI_HII_RESET_STRINGS) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle IN FRAMEWORK_EFI_HII_HANDLE Handle
); );
@ -415,7 +415,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_TEST_STRING) ( (EFIAPI *FRAMEWORK_EFI_HII_TEST_STRING) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *StringToTest, IN CHAR16 *StringToTest,
IN OUT UINT32 *FirstMissing, IN OUT UINT32 *FirstMissing,
@ -445,7 +445,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_GLYPH) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_GLYPH) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *Source, IN CHAR16 *Source,
IN OUT UINT16 *Index, IN OUT UINT16 *Index,
@ -476,7 +476,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GLYPH_TO_BLT) ( (EFIAPI *FRAMEWORK_EFI_HII_GLYPH_TO_BLT) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN UINT8 *GlyphBuffer, IN UINT8 *GlyphBuffer,
IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground, IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground,
@ -506,7 +506,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_NEW_STRING) ( (EFIAPI *FRAMEWORK_EFI_HII_NEW_STRING) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN CHAR16 *Language, IN CHAR16 *Language,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
@ -529,7 +529,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_PRI_LANGUAGES) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_PRI_LANGUAGES) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
OUT EFI_STRING *LanguageString OUT EFI_STRING *LanguageString
@ -552,7 +552,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_SEC_LANGUAGES) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_SEC_LANGUAGES) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN CHAR16 *PrimaryLanguage, IN CHAR16 *PrimaryLanguage,
@ -584,7 +584,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_STRING) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_STRING) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
@ -618,7 +618,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_LINE) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_LINE) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN STRING_REF Token, IN STRING_REF Token,
@ -652,7 +652,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_FORMS) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_FORMS) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_ID FormId, IN EFI_FORM_ID FormId,
@ -679,7 +679,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_DEFAULT_IMAGE) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_DEFAULT_IMAGE) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN UINTN DefaultMask, IN UINTN DefaultMask,
@ -705,7 +705,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_UPDATE_FORM) ( (EFIAPI *FRAMEWORK_EFI_HII_UPDATE_FORM) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
IN FRAMEWORK_EFI_HII_HANDLE Handle, IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_LABEL Label, IN EFI_FORM_LABEL Label,
@ -727,7 +727,7 @@ EFI_STATUS
**/ **/
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_HII_GET_KEYBOARD_LAYOUT) ( (EFIAPI *FRAMEWORK_EFI_HII_GET_KEYBOARD_LAYOUT) (
IN EFI_HII_PROTOCOL *This, IN EFI_HII_PROTOCOL *This,
OUT UINT16 *DescriptorCount, OUT UINT16 *DescriptorCount,
OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor
@ -796,26 +796,26 @@ EFI_STATUS
**/ **/
struct _EFI_HII_PROTOCOL { struct _EFI_HII_PROTOCOL {
EFI_HII_NEW_PACK NewPack; FRAMEWORK_EFI_HII_NEW_PACK NewPack;
EFI_HII_REMOVE_PACK RemovePack; FRAMEWORK_EFI_HII_REMOVE_PACK RemovePack;
EFI_HII_FIND_HANDLES FindHandles; FRAMEWORK_EFI_HII_FIND_HANDLES FindHandles;
EFI_HII_EXPORT ExportDatabase; FRAMEWORK_EFI_HII_EXPORT ExportDatabase;
EFI_HII_TEST_STRING TestString; FRAMEWORK_EFI_HII_TEST_STRING TestString;
EFI_HII_GET_GLYPH GetGlyph; FRAMEWORK_EFI_HII_GET_GLYPH GetGlyph;
EFI_HII_GLYPH_TO_BLT GlyphToBlt; FRAMEWORK_EFI_HII_GLYPH_TO_BLT GlyphToBlt;
EFI_HII_NEW_STRING NewString; FRAMEWORK_EFI_HII_NEW_STRING NewString;
EFI_HII_GET_PRI_LANGUAGES GetPrimaryLanguages; FRAMEWORK_EFI_HII_GET_PRI_LANGUAGES GetPrimaryLanguages;
EFI_HII_GET_SEC_LANGUAGES GetSecondaryLanguages; FRAMEWORK_EFI_HII_GET_SEC_LANGUAGES GetSecondaryLanguages;
EFI_HII_GET_STRING GetString; FRAMEWORK_EFI_HII_GET_STRING GetString;
EFI_HII_RESET_STRINGS ResetStrings; FRAMEWORK_EFI_HII_RESET_STRINGS ResetStrings;
EFI_HII_GET_LINE GetLine; FRAMEWORK_EFI_HII_GET_LINE GetLine;
EFI_HII_GET_FORMS GetForms; FRAMEWORK_EFI_HII_GET_FORMS GetForms;
EFI_HII_GET_DEFAULT_IMAGE GetDefaultImage; FRAMEWORK_EFI_HII_GET_DEFAULT_IMAGE GetDefaultImage;
EFI_HII_UPDATE_FORM UpdateForm; FRAMEWORK_EFI_HII_UPDATE_FORM UpdateForm;
EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout; FRAMEWORK_EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout;
}; };
extern EFI_GUID gEfiHiiProtocolGuid; extern EFI_GUID gEfiHiiProtocolGuid;