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

diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h
index ab09be1a7231b10dd7736a532b8022a075ad0c29..a32260a5a35aaed22993cc61831f7f68d92527c4 100644 (file)
--- 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\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_RESET_EX) (\r
-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-  IN CONST  BOOLEAN                           ExtendedVerification\r
+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+  IN BOOLEAN                           ExtendedVerification\r
 );\r
 \r
 \r
 //\r
 // EFI_KEY_TOGGLE_STATE\r
 //\r
-typedef UINT8   EFI_KEY_TOGGLE_STATE;\r
-#define TOGGLE_STATE_VALID    0x80\r
-#define SCROLL_LOCK_ACTIVE    0x01\r
-#define NUM_LOCK_ACTIVE       0x02\r
-#define CAPS_LOCK_ACTIVE      0x04\r
+typedef UINT8 EFI_KEY_TOGGLE_STATE;\r
 \r
 /**\r
   Definition of EFI_KEY_STATE\r
@@ -102,23 +98,57 @@ typedef struct {
   EFI_KEY_STATE   KeyState;\r
 } EFI_KEY_DATA;\r
 \r
-//\r
-// Shift State.\r
 //\r
 // Any Shift or Toggle State that is valid should have\r
 // high order bit set.\r
 //\r
-#define SHIFT_STATE_VALID     0x80000000\r
-#define RIGHT_SHIFT_PRESSED   0x00000001\r
-#define LEFT_SHIFT_PRESSED    0x00000002\r
-#define RIGHT_CONTROL_PRESSED 0x00000004\r
-#define LEFT_CONTROL_PRESSED  0x00000008\r
-#define RIGHT_ALT_PRESSED     0x00000010\r
-#define LEFT_ALT_PRESSED      0x00000020\r
-#define RIGHT_LOGO_PRESSED    0x00000040\r
-#define LEFT_LOGO_PRESSED     0x00000080\r
-#define MENU_KEY_PRESSED      0x00000100\r
-#define SYS_REQ_PRESSED       0x00000200\r
+// Shift state\r
+//\r
+#define EFI_SHIFT_STATE_VALID     0x80000000\r
+#define EFI_RIGHT_SHIFT_PRESSED   0x00000001\r
+#define EFI_LEFT_SHIFT_PRESSED    0x00000002\r
+#define EFI_RIGHT_CONTROL_PRESSED 0x00000004\r
+#define EFI_LEFT_CONTROL_PRESSED  0x00000008\r
+#define EFI_RIGHT_ALT_PRESSED     0x00000010\r
+#define EFI_LEFT_ALT_PRESSED      0x00000020\r
+#define EFI_RIGHT_LOGO_PRESSED    0x00000040\r
+#define EFI_LEFT_LOGO_PRESSED     0x00000080\r
+#define EFI_MENU_KEY_PRESSED      0x00000100\r
+#define EFI_SYS_REQ_PRESSED       0x00000200\r
+\r
+//                            \r
+// Toggle state               \r
+//                            \r
+#define EFI_TOGGLE_STATE_VALID    0x80\r
+#define EFI_SCROLL_LOCK_ACTIVE    0x01\r
+#define EFI_NUM_LOCK_ACTIVE       0x02\r
+#define EFI_CAPS_LOCK_ACTIVE      0x04\r
+                              \r
+//                            \r
+// EFI Scan codes             \r
+//                            \r
+#define SCAN_F13                  0x0068\r
+#define SCAN_F14                  0x0069\r
+#define SCAN_F15                  0x006A\r
+#define SCAN_F16                  0x006B\r
+#define SCAN_F17                  0x006C\r
+#define SCAN_F18                  0x006D\r
+#define SCAN_F19                  0x006E\r
+#define SCAN_F20                  0x006F\r
+#define SCAN_F21                  0x0070\r
+#define SCAN_F22                  0x0071\r
+#define SCAN_F23                  0x0072\r
+#define SCAN_F24                  0x0073\r
+#define SCAN_MUTE                 0x007F\r
+#define SCAN_VOLUME_UP            0x0080\r
+#define SCAN_VOLUME_DOWN          0x0081\r
+#define SCAN_BRIGHTNESS_UP        0x0100\r
+#define SCAN_BRIGHTNESS_DOWN      0x0101\r
+#define SCAN_SUSPEND              0x0102\r
+#define SCAN_HIBERNATE            0x0103\r
+#define SCAN_TOGGLE_DISPLAY       0x0104\r
+#define SCAN_RECOVERY             0x0105\r
+#define SCAN_EJECT                0x0106\r
 \r
 /**\r
   The function reads the next keystroke from the input device. If\r
@@ -173,8 +203,8 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INPUT_READ_KEY_EX) (\r
-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-  OUT       EFI_KEY_DATA                      *KeyData\r
+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+  OUT EFI_KEY_DATA                      *KeyData\r
 );\r
 \r
 /**\r
@@ -202,8 +232,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SET_STATE) (\r
-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-  IN CONST  EFI_KEY_TOGGLE_STATE              *KeyToggleState\r
+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+  IN EFI_KEY_TOGGLE_STATE              *KeyToggleState\r
 );\r
 \r
 //\r
@@ -212,7 +242,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_KEY_NOTIFY_FUNCTION) (\r
-  IN CONST  EFI_KEY_DATA *KeyData\r
+  IN EFI_KEY_DATA *KeyData\r
 );\r
 \r
 /**\r
@@ -245,10 +275,10 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY) (\r
-  IN CONST  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-  IN CONST  EFI_KEY_DATA            *KeyData,\r
-  IN CONST  EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,\r
-  OUT       EFI_HANDLE              *NotifyHandle\r
+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
+  IN  EFI_KEY_DATA                      *KeyData,\r
+  IN  EFI_KEY_NOTIFY_FUNCTION           KeyNotificationFunction,\r
+  OUT EFI_HANDLE                        *NotifyHandle\r
 );\r
 \r
 /**\r
@@ -270,8 +300,8 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY) (\r
-IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-IN EFI_HANDLE NotificationHandle\r
+  IN EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
+  IN EFI_HANDLE                         NotificationHandle\r
 );\r
 \r
 \r