Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Protocol for backward-compatible with EFI1.1. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2696 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshang1 2007-06-21 07:16:27 +00:00
parent 53f2d96e2e
commit a6508c051b
15 changed files with 209 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MdePkg/Include/Protocol/BlockIo.h
View File

@ -25,11 +25,18 @@
0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
} }
//
// Forward reference for pure ANSI compatability
//
typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL; typedef struct _EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL;
//
// Protocol GUID name defined in EFI1.1.
//
#define BLOCK_IO_PROTOCOL EFI_BLOCK_IO_PROTOCOL_GUID
//
// Protocol defined in EFI1.1.
//
typedef EFI_BLOCK_IO_PROTOCOL EFI_BLOCK_IO;
/** /**
Reset the Block Device. Reset the Block Device.
@ -155,6 +162,10 @@ typedef struct {
} EFI_BLOCK_IO_MEDIA; } EFI_BLOCK_IO_MEDIA;
#define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000 #define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000
//
// Revision defined in EFI1.1.
//
#define EFI_BLOCK_IO_INTERFACE_REVISION EFI_BLOCK_IO_PROTOCOL_REVISION
struct _EFI_BLOCK_IO_PROTOCOL { struct _EFI_BLOCK_IO_PROTOCOL {
UINT64 Revision; UINT64 Revision;

10
MdePkg/Include/Protocol/DeviceIo.h
View File

@ -27,6 +27,16 @@
typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL; typedef struct _EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL;
//
// Protocol GUID name defined in EFI1.1.
//
#define DEVICE_IO_PROTOCOL EFI_DEVICE_IO_PROTOCOL_GUID
//
// Protocol defined in EFI1.1.
//
typedef EFI_DEVICE_IO_PROTOCOL EFI_DEVICE_IO_INTERFACE;
typedef enum { typedef enum {
IO_UINT8, IO_UINT8,
IO_UINT16, IO_UINT16,

10
MdePkg/Include/Protocol/DevicePath.h
View File

@ -29,9 +29,14 @@
0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
} }
//
// Protocol GUID defined in EFI1.1.
//
// //
// Device Path information // Device Path information
// //
#define DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH_PROTOCOL_GUID
#pragma pack(1) #pragma pack(1)
@ -41,6 +46,11 @@ typedef struct {
UINT8 Length[2]; UINT8 Length[2];
} EFI_DEVICE_PATH_PROTOCOL; } EFI_DEVICE_PATH_PROTOCOL;
//
// For backward-compatible with EFI1.1.
//
typedef EFI_DEVICE_PATH_PROTOCOL EFI_DEVICE_PATH;
// //
// Hardware Device Paths // Hardware Device Paths
// //

15
MdePkg/Include/Protocol/DiskIo.h
View File

@ -26,8 +26,18 @@
0xce345171, 0xba0b, 0x11d2, {0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0xce345171, 0xba0b, 0x11d2, {0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
} }
//
// Protocol GUID name defined in EFI1.1.
//
#define DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL_GUID
typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL; typedef struct _EFI_DISK_IO_PROTOCOL EFI_DISK_IO_PROTOCOL;
//
// Protocol defined in EFI1.1.
//
typedef EFI_DISK_IO_PROTOCOL EFI_DISK_IO;
/** /**
Read BufferSize bytes from Offset into Buffer. Read BufferSize bytes from Offset into Buffer.
@ -87,6 +97,11 @@ EFI_STATUS
#define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000 #define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000
//
// Revision defined in EFI1.1
//
#define EFI_DISK_IO_INTERFACE_REVISION EFI_DISK_IO_PROTOCOL_REVISION
struct _EFI_DISK_IO_PROTOCOL { struct _EFI_DISK_IO_PROTOCOL {
UINT64 Revision; UINT64 Revision;
EFI_DISK_READ ReadDisk; EFI_DISK_READ ReadDisk;

11
MdePkg/Include/Protocol/LoadFile.h
View File

@ -23,18 +23,23 @@
#ifndef __EFI_LOAD_FILE_PROTOCOL_H__ #ifndef __EFI_LOAD_FILE_PROTOCOL_H__
#define __EFI_LOAD_FILE_PROTOCOL_H__ #define __EFI_LOAD_FILE_PROTOCOL_H__
#define LOAD_FILE_PROTOCOL_GUID \ #define EFI_LOAD_FILE_PROTOCOL_GUID \
{ \ { \
0x56EC3091, 0x954C, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \ 0x56EC3091, 0x954C, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
} }
// //
// Protocol Guid Name defined by UEFI 2.0 spec. // Protocol Guid defined by EFI1.1.
// //
#define EFI_LOAD_FILE_PROTOCOL_GUID LOAD_FILE_PROTOCOL_GUID #define LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL_GUID
typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL; typedef struct _EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_PROTOCOL;
//
// Backward-compatible with EFI1.1
//
typedef EFI_LOAD_FILE_PROTOCOL EFI_LOAD_FILE_INTERFACE;
/** /**
Causes the driver to load a specified file. Causes the driver to load a specified file.

19
MdePkg/Include/Protocol/LoadedImage.h
View File

@ -27,11 +27,21 @@
0x5B1B31A1, 0x9562, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \ 0x5B1B31A1, 0x9562, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
} }
//
// Protocol GUID defined in EFI1.1.
//
#define LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE_PROTOCOL_GUID
// //
// EFI_SYSTEM_TABLE & EFI_IMAGE_UNLOAD are defined in EfiApi.h // EFI_SYSTEM_TABLE & EFI_IMAGE_UNLOAD are defined in EfiApi.h
// //
#define EFI_LOADED_IMAGE_INFORMATION_REVISION 0x1000 #define EFI_LOADED_IMAGE_PROTOCOL_REVISION 0x1000
#define EFI_LOADED_IMAGE_PROTOCOL_REVISION EFI_LOADED_IMAGE_INFORMATION_REVISION
//
// Revision defined in EFI1.1.
//
#define EFI_LOADED_IMAGE_INFORMATION_REVISION EFI_LOADED_IMAGE_PROTOCOL_REVISION
typedef struct { typedef struct {
UINT32 Revision; UINT32 Revision;
@ -66,6 +76,11 @@ typedef struct {
} EFI_LOADED_IMAGE_PROTOCOL; } EFI_LOADED_IMAGE_PROTOCOL;
//
// For backward-compatible with EFI1.1.
//
typedef EFI_LOADED_IMAGE_PROTOCOL EFI_LOADED_IMAGE;
extern EFI_GUID gEfiLoadedImageProtocolGuid; extern EFI_GUID gEfiLoadedImageProtocolGuid;
#endif #endif

10
MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
View File

@ -27,11 +27,21 @@
#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00010000 #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION 0x00010000
//
// Revision defined in EFI1.1.
//
#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION
// //
// Forward reference for pure ANSI compatability // Forward reference for pure ANSI compatability
// //
typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL; typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL;
//
// Protocol defined in EFI1.1.
//
typedef EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE;
typedef enum { typedef enum {
EfiNetworkInterfaceUndi = 1 EfiNetworkInterfaceUndi = 1
} EFI_NETWORK_PROTOCOL_TYPE; } EFI_NETWORK_PROTOCOL_TYPE;

15
MdePkg/Include/Protocol/PxeBaseCode.h
View File

@ -24,7 +24,12 @@
0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ 0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
} }
typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL; typedef struct _EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE_PROTOCOL;
//
// Protocol defined in EFI1.1.
//
typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
// //
// Default IP TTL and ToS. // Default IP TTL and ToS.
@ -597,8 +602,12 @@ EFI_STATUS
// //
// PXE Base Code Protocol structure // PXE Base Code Protocol structure
// //
#define EFI_PXE_BASE_CODE_INTERFACE_REVISION 0x00010000 #define EFI_PXE_BASE_CODE_PROTOCOL_REVISION 0x00010000
#define EFI_PXE_BASE_CODE_PROTOCOL_REVISION EFI_PXE_BASE_CODE_INTERFACE_REVISION
//
// Revision defined in EFI1.1
//
#define EFI_PXE_BASE_CODE_INTERFACE_REVISION EFI_PXE_BASE_CODE_PROTOCOL_REVISION
struct _EFI_PXE_BASE_CODE_PROTOCOL { struct _EFI_PXE_BASE_CODE_PROTOCOL {
UINT64 Revision; UINT64 Revision;

11
MdePkg/Include/Protocol/PxeBaseCodeCallBack.h
View File

@ -28,15 +28,20 @@
// //
// Revision Number // Revision Number
// //
#define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION 0x00010000 #define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION 0x00010000
#define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION \ #define EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION \
EFI_PXE_BASE_CODE_CALLBACK_INTERFACE_REVISION EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION
// //
// Protocol definition // Protocol definition
// //
typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL; typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL;
//
// Protocol defined in EFI1.1.
//
typedef EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL EFI_PXE_BASE_CODE_CALLBACK;
typedef enum { typedef enum {
EFI_PXE_BASE_CODE_FUNCTION_FIRST, EFI_PXE_BASE_CODE_FUNCTION_FIRST,
EFI_PXE_BASE_CODE_FUNCTION_DHCP, EFI_PXE_BASE_CODE_FUNCTION_DHCP,

15
MdePkg/Include/Protocol/SerialIo.h
View File

@ -25,8 +25,19 @@
0xBB25CF6F, 0xF1D4, 0x11D2, {0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD } \ 0xBB25CF6F, 0xF1D4, 0x11D2, {0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD } \
} }
//
// Protocol GUID defined in EFI1.1.
//
#define SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL_GUID
typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL; typedef struct _EFI_SERIAL_IO_PROTOCOL EFI_SERIAL_IO_PROTOCOL;
//
// Backward-compatible with EFI1.1.
//
typedef EFI_SERIAL_IO_PROTOCOL SERIAL_IO_INTERFACE;
// //
// Serial IO Data structures // Serial IO Data structures
// //
@ -246,8 +257,8 @@ typedef struct {
UINT32 StopBits; UINT32 StopBits;
} EFI_SERIAL_IO_MODE; } EFI_SERIAL_IO_MODE;
#define SERIAL_IO_INTERFACE_REVISION 0x00010000 #define EFI_SERIAL_IO_PROTOCOL_REVISION 0x00010000
#define EFI_SERIAL_IO_PROTOCOL_REVISION SERIAL_IO_INTERFACE_REVISION #define SERIAL_IO_INTERFACE_REVISION EFI_SERIAL_IO_PROTOCOL_REVISION
struct _EFI_SERIAL_IO_PROTOCOL { struct _EFI_SERIAL_IO_PROTOCOL {
UINT32 Revision; UINT32 Revision;

49
MdePkg/Include/Protocol/SimpleFileSystem.h
View File

@ -29,9 +29,21 @@
} }
typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL; typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL;
typedef struct _EFI_FILE EFI_FILE;
typedef struct _EFI_FILE *EFI_FILE_HANDLE; typedef struct _EFI_FILE_PROTOCOL EFI_FILE_PROTOCOL;
typedef struct _EFI_FILE EFI_FILE_PROTOCOL; typedef struct _EFI_FILE_PROTOCOL *EFI_FILE_HANDLE;
//
// Protocol GUID defined in EFI1.1.
//
#define SIMPLE_FILE_SYSTEM_PROTOCOL EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID
//
// Protocol defined in EFI1.1.
//
typedef EFI_SIMPLE_FILE_SYSTEM_PROTOCOL EFI_FILE_IO_INTERFACE;
typedef struct _EFI_FILE_PROTOCOL EFI_FILE;
/** /**
Open the root directory on a volume. Open the root directory on a volume.
@ -52,11 +64,15 @@ typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME) ( (EFIAPI *EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME) (
IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This, IN EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *This,
OUT EFI_FILE **Root OUT EFI_FILE_PROTOCOL **Root
) )
; ;
#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION 0x00010000 #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION 0x00010000
//
// Revision defined in EFI1.1
//
#define EFI_FILE_IO_INTERFACE_REVISION EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION
struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL { struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
UINT64 Revision; UINT64 Revision;
@ -86,8 +102,8 @@ struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL {
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_OPEN) ( (EFIAPI *EFI_FILE_OPEN) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
OUT EFI_FILE **NewHandle, OUT EFI_FILE_PROTOCOL **NewHandle,
IN CHAR16 *FileName, IN CHAR16 *FileName,
IN UINT64 OpenMode, IN UINT64 OpenMode,
IN UINT64 Attributes IN UINT64 Attributes
@ -160,7 +176,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_READ) ( (EFIAPI *EFI_FILE_READ) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
OUT VOID *Buffer OUT VOID *Buffer
) )
@ -186,7 +202,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_WRITE) ( (EFIAPI *EFI_FILE_WRITE) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
IN VOID *Buffer IN VOID *Buffer
) )
@ -205,7 +221,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_SET_POSITION) ( (EFIAPI *EFI_FILE_SET_POSITION) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
IN UINT64 Position IN UINT64 Position
) )
; ;
@ -223,7 +239,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_GET_POSITION) ( (EFIAPI *EFI_FILE_GET_POSITION) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
OUT UINT64 *Position OUT UINT64 *Position
) )
; ;
@ -249,7 +265,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_GET_INFO) ( (EFIAPI *EFI_FILE_GET_INFO) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
IN EFI_GUID *InformationType, IN EFI_GUID *InformationType,
IN OUT UINTN *BufferSize, IN OUT UINTN *BufferSize,
OUT VOID *Buffer OUT VOID *Buffer
@ -276,7 +292,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_FILE_SET_INFO) ( (EFIAPI *EFI_FILE_SET_INFO) (
IN EFI_FILE *This, IN EFI_FILE_PROTOCOL *This,
IN EFI_GUID *InformationType, IN EFI_GUID *InformationType,
IN UINTN BufferSize, IN UINTN BufferSize,
IN VOID *Buffer IN VOID *Buffer
@ -305,10 +321,13 @@ EFI_STATUS
) )
; ;
#define EFI_FILE_HANDLE_REVISION 0x00010000 #define EFI_FILE_PROTOCOL_REVISION 0x00010000
#define EFI_FILE_PROTOCOL_REVISION EFI_FILE_HANDLE_REVISION //
// Revision defined in EFI1.1.
//
#define EFI_FILE_REVISION EFI_FILE_PROTOCOL_REVISION
struct _EFI_FILE { struct _EFI_FILE_PROTOCOL {
UINT64 Revision; UINT64 Revision;
EFI_FILE_OPEN Open; EFI_FILE_OPEN Open;
EFI_FILE_CLOSE Close; EFI_FILE_CLOSE Close;

11
MdePkg/Include/Protocol/SimpleNetwork.h
View File

@ -31,6 +31,12 @@
typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL; typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK_PROTOCOL;
//
// Protocol defined in EFI1.1.
//
typedef EFI_SIMPLE_NETWORK_PROTOCOL EFI_SIMPLE_NETWORK;
// //
// Simple Network Protocol data structures // Simple Network Protocol data structures
// //
@ -556,6 +562,11 @@ EFI_STATUS
#define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000
//
// Revision defined in EFI1.1
//
#define EFI_SIMPLE_NETWORK_INTERFACE_REVISION EFI_SIMPLE_NETWORK_PROTOCOL_REVISION
struct _EFI_SIMPLE_NETWORK_PROTOCOL { struct _EFI_SIMPLE_NETWORK_PROTOCOL {
UINT64 Revision; UINT64 Revision;
EFI_SIMPLE_NETWORK_START Start; EFI_SIMPLE_NETWORK_START Start;

20
MdePkg/Include/Protocol/SimpleTextIn.h
View File

@ -20,16 +20,22 @@
#ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__ #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
#define __SIMPLE_TEXT_IN_PROTOCOL_H__ #define __SIMPLE_TEXT_IN_PROTOCOL_H__
#define EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID \ #define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
{ \ { \
0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
} }
#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID //
// Protocol GUID defined in EFI1.1.
//
#define SIMPLE_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID
typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_IN_PROTOCOL; typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;
typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL EFI_SIMPLE_TEXT_INPUT_PROTOCOL;
//
// Backward-compatible with EFI1.1.
//
typedef struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL SIMPLE_INPUT_INTERFACE;
// //
// Data structures // Data structures
// //
@ -88,7 +94,7 @@ typedef struct {
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_INPUT_RESET) ( (EFIAPI *EFI_INPUT_RESET) (
IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This, IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,
IN BOOLEAN ExtendedVerification IN BOOLEAN ExtendedVerification
) )
; ;
@ -109,12 +115,12 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_INPUT_READ_KEY) ( (EFIAPI *EFI_INPUT_READ_KEY) (
IN EFI_SIMPLE_TEXT_IN_PROTOCOL *This, IN EFI_SIMPLE_TEXT_INPUT_PROTOCOL *This,
OUT EFI_INPUT_KEY *Key OUT EFI_INPUT_KEY *Key
) )
; ;
struct _EFI_SIMPLE_TEXT_IN_PROTOCOL { struct _EFI_SIMPLE_TEXT_INPUT_PROTOCOL {
EFI_INPUT_RESET Reset; EFI_INPUT_RESET Reset;
EFI_INPUT_READ_KEY ReadKeyStroke; EFI_INPUT_READ_KEY ReadKeyStroke;
EFI_EVENT WaitForKey; EFI_EVENT WaitForKey;

37
MdePkg/Include/Protocol/SimpleTextOut.h
View File

@ -22,15 +22,22 @@
#ifndef __SIMPLE_TEXT_OUT_H__ #ifndef __SIMPLE_TEXT_OUT_H__
#define __SIMPLE_TEXT_OUT_H__ #define __SIMPLE_TEXT_OUT_H__
#define EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID \ #define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \
{ \ { \
0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
} }
#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID //
// Protocol GUID defined in EFI1.1.
//
#define SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID
typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUT_PROTOCOL; typedef struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
//
// Backward-compatible with EFI1.1.
//
typedef EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SIMPLE_TEXT_OUTPUT_INTERFACE;
// //
// Define's for required EFI Unicode Box Draw characters // Define's for required EFI Unicode Box Draw characters
@ -155,7 +162,7 @@ typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_RESET) ( (EFIAPI *EFI_TEXT_RESET) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN BOOLEAN ExtendedVerification IN BOOLEAN ExtendedVerification
) )
; ;
@ -181,7 +188,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_STRING) ( (EFIAPI *EFI_TEXT_STRING) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN CHAR16 *String IN CHAR16 *String
) )
; ;
@ -203,7 +210,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_TEST_STRING) ( (EFIAPI *EFI_TEXT_TEST_STRING) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN CHAR16 *String IN CHAR16 *String
) )
; ;
@ -227,7 +234,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_QUERY_MODE) ( (EFIAPI *EFI_TEXT_QUERY_MODE) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN ModeNumber, IN UINTN ModeNumber,
OUT UINTN *Columns, OUT UINTN *Columns,
OUT UINTN *Rows OUT UINTN *Rows
@ -248,7 +255,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_SET_MODE) ( (EFIAPI *EFI_TEXT_SET_MODE) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN ModeNumber IN UINTN ModeNumber
) )
; ;
@ -270,7 +277,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_SET_ATTRIBUTE) ( (EFIAPI *EFI_TEXT_SET_ATTRIBUTE) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN Attribute IN UINTN Attribute
) )
; ;
@ -289,7 +296,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_CLEAR_SCREEN) ( (EFIAPI *EFI_TEXT_CLEAR_SCREEN) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This
) )
; ;
@ -313,7 +320,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_SET_CURSOR_POSITION) ( (EFIAPI *EFI_TEXT_SET_CURSOR_POSITION) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN UINTN Column, IN UINTN Column,
IN UINTN Row IN UINTN Row
) )
@ -336,7 +343,7 @@ EFI_STATUS
typedef typedef
EFI_STATUS EFI_STATUS
(EFIAPI *EFI_TEXT_ENABLE_CURSOR) ( (EFIAPI *EFI_TEXT_ENABLE_CURSOR) (
IN EFI_SIMPLE_TEXT_OUT_PROTOCOL *This, IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *This,
IN BOOLEAN Visible IN BOOLEAN Visible
) )
; ;
@ -365,7 +372,7 @@ typedef struct {
BOOLEAN CursorVisible; BOOLEAN CursorVisible;
} EFI_SIMPLE_TEXT_OUTPUT_MODE; } EFI_SIMPLE_TEXT_OUTPUT_MODE;
struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL { struct _EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL {
EFI_TEXT_RESET Reset; EFI_TEXT_RESET Reset;
EFI_TEXT_STRING OutputString; EFI_TEXT_STRING OutputString;
@ -385,6 +392,6 @@ struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL {
EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode; EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode;
}; };
extern EFI_GUID gEfiSimpleTextOutProtocolGuid; extern EFI_GUID gEfiSimpleTextOutputProtocolGuid;
#endif #endif

13
MdePkg/Include/Protocol/UnicodeCollation.h
View File

@ -22,7 +22,18 @@
0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ 0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
} }
typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL; typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;
//
// Protocol GUID name defined in EFI1.1.
//
#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID
//
// Protocol defined in EFI1.1.
//
typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE;
// //
// Protocol data structures and defines // Protocol data structures and defines