diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-04 01:06:43 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-04 01:06:43 +0000 |
| commit | 2be21afb3a510874a8e085883637a42428ca7299 (patch) | |
| tree | 9acc0397ec83fce74495f6ceb8e57b77f74c2c44 | |
| parent | abfbafd5a7815f89cb9a44b3816dbe92bed02936 (diff) | |
| download | edk2-platforms-2be21afb3a510874a8e085883637a42428ca7299.tar.xz | |
1.Move the definitions of SCAN_F11 and SCAN_F12 from SimpleTextIn.h to SimpleTextInEx.h because they are defined in Table - EFI Scan Codes for EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL.
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
| -rw-r--r-- | MdePkg/Include/Protocol/SimpleTextIn.h | 4 | ||||
| -rw-r--r-- | MdePkg/Include/Protocol/SimpleTextInEx.h | 8 | ||||
| -rw-r--r-- | MdePkg/Include/Uefi/UefiSpec.h | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h index f29170c201..71dcb0bd13 100644 --- 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
terminal.
- Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -76,8 +76,6 @@ typedef struct { #define SCAN_F8 0x0012
#define SCAN_F9 0x0013
#define SCAN_F10 0x0014
-#define SCAN_F11 0x0015
-#define SCAN_F12 0x0016
#define SCAN_ESC 0x0017
/**
diff --git a/MdePkg/Include/Protocol/SimpleTextInEx.h b/MdePkg/Include/Protocol/SimpleTextInEx.h index 6420a55a9f..bb88a8ec60 100644 --- 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,
also allows one to register a notification for a particular keystroke.
- Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -19,6 +19,8 @@ #ifndef __SIMPLE_TEXT_IN_EX_H__
#define __SIMPLE_TEXT_IN_EX_H__
+#include <Protocol/SimpleTextIn.h>
+
#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
{0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } }
@@ -121,7 +123,9 @@ typedef struct { //
// EFI Scan codes
-//
+//
+#define SCAN_F11 0x0015
+#define SCAN_F12 0x0016
#define SCAN_F13 0x0068
#define SCAN_F14 0x0069
#define SCAN_F15 0x006A
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index b92dccef72..7e61a1945f 100644 --- 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. #include <Protocol/DevicePath.h>
#include <Protocol/SimpleTextIn.h>
+#include <Protocol/SimpleTextInEx.h>
#include <Protocol/SimpleTextOut.h>
///
|