1.Move the definitions of SCAN_F11 and SCAN_F12 from SimpleTextIn.h to SimpleTextInEx...

2.Include SimpleTextIn.h in SimpleTextInEx.h because EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL is an extension of the EFI_SIMPLE_TEXT_INPUT_PROTOCOL.
3.Include SimpleTextInEx.h in UefiSpec.h.

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

diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index f29170c201f6ca716d2254f82c09e6f10007c677..71dcb0bd13ced103f5fc3a40e5dae598f9794d27 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -4,7 +4,7 @@
   Abstraction of a very simple input device like a keyboard or serial\r
   terminal.\r
 \r
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -76,8 +76,6 @@ typedef struct {
 #define SCAN_F8         0x0012\r
 #define SCAN_F9         0x0013\r
 #define SCAN_F10        0x0014\r
-#define SCAN_F11        0x0015\r
-#define SCAN_F12        0x0016\r
 #define SCAN_ESC        0x0017\r
 \r
 /**\r

diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h
index 6420a55a9fc50d9cc719f14da889993b01b30a52..bb88a8ec60e6e869e85350419bf90aadcbf73025 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextInEx.h
+++ b/MdePkg/Include/Protocol/SimpleTextInEx.h
@@ -5,7 +5,7 @@
   which exposes much more state and modifier information from the input device,\r
   also allows one to register a notification for a particular keystroke.\r
 \r
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -19,6 +19,8 @@
 #ifndef __SIMPLE_TEXT_IN_EX_H__\r
 #define __SIMPLE_TEXT_IN_EX_H__\r
 \r
+#include <Protocol/SimpleTextIn.h>\r
+\r
 #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \\r
   {0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } }\r
 \r
@@ -121,7 +123,9 @@ typedef struct {
                               \r
 //                            \r
 // EFI Scan codes             \r
-//                            \r
+//\r
+#define SCAN_F11                  0x0015\r
+#define SCAN_F12                  0x0016\r
 #define SCAN_F13                  0x0068\r
 #define SCAN_F14                  0x0069\r
 #define SCAN_F15                  0x006A\r

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index b92dccef72f2deb0b98e715bcd008a08931a95db..7e61a1945fa298985ea9ed59bf5502061b54ebd6 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/SimpleTextIn.h>\r
+#include <Protocol/SimpleTextInEx.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 \r
 ///\r