Update EFI_SIMPLE_TEXT_INPUT_EX protocol definitions according to UEFI spec 2.1b

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4175 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 61 insertions, 31 deletions

diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h
index ab09be1a72..a32260a5a3 100644
--- a/MdePkg/Include/Protocol/SimpleTextInEx.h
+++ b/MdePkg/Include/Protocol/SimpleTextInEx.h
@@ -54,19 +54,15 @@ typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL EFI_SIMPLE_TEXT_INPUT_EX_PROTO
 typedef

 EFI_STATUS

 (EFIAPI *EFI_INPUT_RESET_EX) (

-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

-  IN CONST  BOOLEAN                           ExtendedVerification

+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

+  IN BOOLEAN                           ExtendedVerification

 );

 

 

 //

 // EFI_KEY_TOGGLE_STATE

 //

-typedef UINT8   EFI_KEY_TOGGLE_STATE;

-#define TOGGLE_STATE_VALID    0x80

-#define SCROLL_LOCK_ACTIVE    0x01

-#define NUM_LOCK_ACTIVE       0x02

-#define CAPS_LOCK_ACTIVE      0x04

+typedef UINT8 EFI_KEY_TOGGLE_STATE;

 

 /**

   Definition of EFI_KEY_STATE

@@ -103,22 +99,56 @@ typedef struct {
 } EFI_KEY_DATA;

 

 //

-// Shift State.

-//

 // Any Shift or Toggle State that is valid should have

 // high order bit set.

 //

-#define SHIFT_STATE_VALID     0x80000000

-#define RIGHT_SHIFT_PRESSED   0x00000001

-#define LEFT_SHIFT_PRESSED    0x00000002

-#define RIGHT_CONTROL_PRESSED 0x00000004

-#define LEFT_CONTROL_PRESSED  0x00000008

-#define RIGHT_ALT_PRESSED     0x00000010

-#define LEFT_ALT_PRESSED      0x00000020

-#define RIGHT_LOGO_PRESSED    0x00000040

-#define LEFT_LOGO_PRESSED     0x00000080

-#define MENU_KEY_PRESSED      0x00000100

-#define SYS_REQ_PRESSED       0x00000200

+// Shift state

+//

+#define EFI_SHIFT_STATE_VALID     0x80000000

+#define EFI_RIGHT_SHIFT_PRESSED   0x00000001

+#define EFI_LEFT_SHIFT_PRESSED    0x00000002

+#define EFI_RIGHT_CONTROL_PRESSED 0x00000004

+#define EFI_LEFT_CONTROL_PRESSED  0x00000008

+#define EFI_RIGHT_ALT_PRESSED     0x00000010

+#define EFI_LEFT_ALT_PRESSED      0x00000020

+#define EFI_RIGHT_LOGO_PRESSED    0x00000040

+#define EFI_LEFT_LOGO_PRESSED     0x00000080

+#define EFI_MENU_KEY_PRESSED      0x00000100

+#define EFI_SYS_REQ_PRESSED       0x00000200

+

+//                            

+// Toggle state               

+//                            

+#define EFI_TOGGLE_STATE_VALID    0x80

+#define EFI_SCROLL_LOCK_ACTIVE    0x01

+#define EFI_NUM_LOCK_ACTIVE       0x02

+#define EFI_CAPS_LOCK_ACTIVE      0x04

+                              

+//                            

+// EFI Scan codes             

+//                            

+#define SCAN_F13                  0x0068

+#define SCAN_F14                  0x0069

+#define SCAN_F15                  0x006A

+#define SCAN_F16                  0x006B

+#define SCAN_F17                  0x006C

+#define SCAN_F18                  0x006D

+#define SCAN_F19                  0x006E

+#define SCAN_F20                  0x006F

+#define SCAN_F21                  0x0070

+#define SCAN_F22                  0x0071

+#define SCAN_F23                  0x0072

+#define SCAN_F24                  0x0073

+#define SCAN_MUTE                 0x007F

+#define SCAN_VOLUME_UP            0x0080

+#define SCAN_VOLUME_DOWN          0x0081

+#define SCAN_BRIGHTNESS_UP        0x0100

+#define SCAN_BRIGHTNESS_DOWN      0x0101

+#define SCAN_SUSPEND              0x0102

+#define SCAN_HIBERNATE            0x0103

+#define SCAN_TOGGLE_DISPLAY       0x0104

+#define SCAN_RECOVERY             0x0105

+#define SCAN_EJECT                0x0106

 

 /**

   The function reads the next keystroke from the input device. If

@@ -173,8 +203,8 @@ typedef struct {
 typedef

 EFI_STATUS

 (EFIAPI *EFI_INPUT_READ_KEY_EX) (

-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

-  OUT       EFI_KEY_DATA                      *KeyData

+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

+  OUT EFI_KEY_DATA                      *KeyData

 );

 

 /**

@@ -202,8 +232,8 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_SET_STATE) (

-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

-  IN CONST  EFI_KEY_TOGGLE_STATE              *KeyToggleState

+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

+  IN EFI_KEY_TOGGLE_STATE              *KeyToggleState

 );

 

 //

@@ -212,7 +242,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_KEY_NOTIFY_FUNCTION) (

-  IN CONST  EFI_KEY_DATA *KeyData

+  IN EFI_KEY_DATA *KeyData

 );

 

 /**

@@ -245,10 +275,10 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY) (

-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

-  IN CONST  EFI_KEY_DATA            *KeyData,

-  IN CONST  EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,

-  OUT       EFI_HANDLE              *NotifyHandle

+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

+  IN  EFI_KEY_DATA                      *KeyData,

+  IN  EFI_KEY_NOTIFY_FUNCTION           KeyNotificationFunction,

+  OUT EFI_HANDLE                        *NotifyHandle

 );

 

 /**

@@ -270,8 +300,8 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY) (

-IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,

-IN EFI_HANDLE NotificationHandle

+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,

+  IN EFI_HANDLE                         NotificationHandle

 );