From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 18 Jun 2009 09:24:42 +0000 (+0000)
Subject: The unicode char and shift unicode char should be unicode but not ascii char.
X-Git-Tag: edk2-stable201903~17710
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=67319626746e9bb373a95f38746c32408cc1681e

The unicode char and shift unicode char should be unicode but not ascii char.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 3662340149..04571c2f95 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Ps2Keyboard.h"
 
 struct {
-  UINT8  ScanCode;
+  UINT8   ScanCode;             ///< follows value defined in Scan Code Set1
   UINT16  EfiScanCode;
   CHAR16  UnicodeChar;
   CHAR16  ShiftUnicodeChar;
@@ -26,530 +26,530 @@ ConvertKeyboardScanCodeToEfiKey[] = {
   {
     0x01,  //   Escape
     SCAN_ESC,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x02,
     SCAN_NULL,
-    '1',
-    '!'
+    L'1',
+    L'!'
   },
   {
     0x03,
     SCAN_NULL,
-    '2',
-    '@'
+    L'2',
+    L'@'
   },
   {
     0x04,
     SCAN_NULL,
-    '3',
-    '#'
+    L'3',
+    L'#'
   },
   {
     0x05,
     SCAN_NULL,
-    '4',
-    '$'
+    L'4',
+    L'$'
   },
   {
     0x06,
     SCAN_NULL,
-    '5',
-    '%'
+    L'5',
+    L'%'
   },
   {
     0x07,
     SCAN_NULL,
-    '6',
-    '^'
+    L'6',
+    L'^'
   },
   {
     0x08,
     SCAN_NULL,
-    '7',
-    '&'
+    L'7',
+    L'&'
   },
   {
     0x09,
     SCAN_NULL,
-    '8',
-    '*'
+    L'8',
+    L'*'
   },
   {
     0x0A,
     SCAN_NULL,
-    '9',
-    '('
+    L'9',
+    L'('
   },
   {
     0x0B,
     SCAN_NULL,
-    '0',
-    ')'
+    L'0',
+    L')'
   },
   {
     0x0C,
     SCAN_NULL,
-    '-',
-    '_'
+    L'-',
+    L'_'
   },
   {
     0x0D,
     SCAN_NULL,
-    '=',
-    '+'
+    L'=',
+    L'+'
   },
   {
     0x0E, //  BackSpace
     SCAN_NULL,
-    0x08,
-    0x08
+    0x0008,
+    0x0008
   },
   {
     0x0F, //  Tab
     SCAN_NULL,
-    0x09,
-    0x09
+    0x0009,
+    0x0009
   },
   {
     0x10,
     SCAN_NULL,
-    'q',
-    'Q'
+    L'q',
+    L'Q'
   },
   {
     0x11,
     SCAN_NULL,
-    'w',
-    'W'
+    L'w',
+    L'W'
   },
   {
     0x12,
     SCAN_NULL,
-    'e',
-    'E'
+    L'e',
+    L'E'
   },
   {
     0x13,
     SCAN_NULL,
-    'r',
-    'R'
+    L'r',
+    L'R'
   },
   {
     0x14,
     SCAN_NULL,
-    't',
-    'T'
+    L't',
+    L'T'
   },
   {
     0x15,
     SCAN_NULL,
-    'y',
-    'Y'
+    L'y',
+    L'Y'
   },
   {
     0x16,
     SCAN_NULL,
-    'u',
-    'U'
+    L'u',
+    L'U'
   },
   {
     0x17,
     SCAN_NULL,
-    'i',
-    'I'
+    L'i',
+    L'I'
   },
   {
     0x18,
     SCAN_NULL,
-    'o',
-    'O'
+    L'o',
+    L'O'
   },
   {
     0x19,
     SCAN_NULL,
-    'p',
-    'P'
+    L'p',
+    L'P'
   },
   {
     0x1a,
     SCAN_NULL,
-    '[',
-    '{'
+    L'[',
+    L'{'
   },
   {
     0x1b,
     SCAN_NULL,
-    ']',
-    '}'
+    L']',
+    L'}'
   },
   {
     0x1c, //   Enter
     SCAN_NULL,
-    0x0d,
-    0x0d
+    0x000d,
+    0x000d
   },
   {
     0x1d,
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x1e,
     SCAN_NULL,
-    'a',
-    'A'
+    L'a',
+    L'A'
   },
   {
     0x1f,
     SCAN_NULL,
-    's',
-    'S'
+    L's',
+    L'S'
   },
   {
     0x20,
     SCAN_NULL,
-    'd',
-    'D'
+    L'd',
+    L'D'
   },
   {
     0x21,
     SCAN_NULL,
-    'f',
-    'F'
+    L'f',
+    L'F'
   },
   {
     0x22,
     SCAN_NULL,
-    'g',
-    'G'
+    L'g',
+    L'G'
   },
   {
     0x23,
     SCAN_NULL,
-    'h',
-    'H'
+    L'h',
+    L'H'
   },
   {
     0x24,
     SCAN_NULL,
-    'j',
-    'J'
+    L'j',
+    L'J'
   },
   {
     0x25,
     SCAN_NULL,
-    'k',
-    'K'
+    L'k',
+    L'K'
   },
   {
     0x26,
     SCAN_NULL,
-    'l',
-    'L'
+    L'l',
+    L'L'
   },
   {
     0x27,
     SCAN_NULL,
-    ';',
-    ':'
+    L';',
+    L':'
   },
   {
     0x28,
     SCAN_NULL,
-    '\'',
-    '"'
+    L'\'',
+    L'"'
   },
   {
     0x29,
     SCAN_NULL,
-    '`',
-    '~'
+    L'`',
+    L'~'
   },
   {
     0x2a, //   Left Shift
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x2b,
     SCAN_NULL,
-    '\\',
-    '|'
+    L'\\',
+    L'|'
   },
   {
     0x2c,
     SCAN_NULL,
-    'z',
-    'Z'
+    L'z',
+    L'Z'
   },
   {
     0x2d,
     SCAN_NULL,
-    'x',
-    'X'
+    L'x',
+    L'X'
   },
   {
     0x2e,
     SCAN_NULL,
-    'c',
-    'C'
+    L'c',
+    L'C'
   },
   {
     0x2f,
     SCAN_NULL,
-    'v',
-    'V'
+    L'v',
+    L'V'
   },
   {
     0x30,
     SCAN_NULL,
-    'b',
-    'B'
+    L'b',
+    L'B'
   },
   {
     0x31,
     SCAN_NULL,
-    'n',
-    'N'
+    L'n',
+    L'N'
   },
   {
     0x32,
     SCAN_NULL,
-    'm',
-    'M'
+    L'm',
+    L'M'
   },
   {
     0x33,
     SCAN_NULL,
-    ',',
-    '<'
+    L',',
+    L'<'
   },
   {
     0x34,
     SCAN_NULL,
-    '.',
-    '>'
+    L'.',
+    L'>'
   },
   {
     0x35,
     SCAN_NULL,
-    '/',
-    '?'
+    L'/',
+    L'?'
   },
   {
     0x36, //Right Shift
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x37, // Numeric Keypad *
     SCAN_NULL,
-    '*',
-    '*'
+    L'*',
+    L'*'
   },
   {
     0x38,  //Left Alt/Extended Right Alt
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x39,
     SCAN_NULL,
-    ' ',
-    ' '
+    L' ',
+    L' '
   },
   {
     0x3A, //CapsLock
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x3B,
     SCAN_F1,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x3C,
     SCAN_F2,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x3D,
     SCAN_F3,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x3E,
     SCAN_F4,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x3F,
     SCAN_F5,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x40,
     SCAN_F6,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x41,
     SCAN_F7,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x42,
     SCAN_F8,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x43,
     SCAN_F9,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x44,
     SCAN_F10,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x45, // NumLock
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x46, //  ScrollLock
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x47,
     SCAN_HOME,
-    '7',
-    '7'
+    L'7',
+    L'7'
   },
   {
     0x48,
     SCAN_UP,
-    '8',
-    '8'
+    L'8',
+    L'8'
   },
   {
     0x49,
     SCAN_PAGE_UP,
-    '9',
-    '9'
+    L'9',
+    L'9'
   },
   {
     0x4a,
     SCAN_NULL,
-    '-',
-    '-'
+    L'-',
+    L'-'
   },
   {
     0x4b,
     SCAN_LEFT,
-    '4',
-    '4'
+    L'4',
+    L'4'
   },
   {
     0x4c, //  Numeric Keypad 5
     SCAN_NULL,
-    '5',
-    '5'
+    L'5',
+    L'5'
   },
   {
     0x4d,
     SCAN_RIGHT,
-    '6',
-    '6'
+    L'6',
+    L'6'
   },
   {
     0x4e,
     SCAN_NULL,
-    '+',
-    '+'
+    L'+',
+    L'+'
   },
   {
     0x4f,
     SCAN_END,
-    '1',
-    '1'
+    L'1',
+    L'1'
   },
   {
     0x50,
     SCAN_DOWN,
-    '2',
-    '2'
+    L'2',
+    L'2'
   },
   {
     0x51,
     SCAN_PAGE_DOWN,
-    '3',
-    '3'
+    L'3',
+    L'3'
   },
   {
     0x52,
     SCAN_INSERT,
-    '0',
-    '0'
+    L'0',
+    L'0'
   },
   {
     0x53,
     SCAN_DELETE,
-    '.',
-    '.'
+    L'.',
+    L'.'
   },
   {
     0x57,
     SCAN_F11,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x58,
     SCAN_F12,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },
   {
     0x5B,  //Left LOGO
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },  
   {
     0x5C,  //Right LOGO
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },  
   {
     0x5D,  //Menu key
     SCAN_NULL,
-    0x00,
-    0x00
+    0x0000,
+    0x0000
   },    
   {
     TABLE_END,