Changeset 95568 in vbox for trunk/src/VBox/Devices/Input

Timestamp:

Jul 8, 2022 8:39:10 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152194

Message:

DrvKeyboardQueue: Convert unknown extended scancodes to zero so that assertion can still hit.

File:

• trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

@@ -119 +119 @@
 /* Generic Desktop Control usage page (01h). */
 #define DC(key)     (RT_MAKE_U32(0, USB_HID_DC_PAGE) | (uint16_t)key)
+/* Untranslated/unised, shouldn't be encountered. */
+#define XX(key)     0
 
 /** Lookup table for extended scancodes (arrow keys etc.).
@@ -125 +127 @@
 static const uint32_t aExtScan2Hid[] =
 {
-    KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), /* 00-07 */
-    KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), /* 08-1F */
-    CC(0x0B6), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), /* 10-17 */
-    KB(0x000), CC(0x0B5), KB(0x000), KB(0x000), KB(0x058), KB(0x0e4), KB(0x000), KB(0x000), /* 18-1F */
-    CC(0x0E2), CC(0x192), CC(0x0CD), KB(0x000), CC(0x0B7), KB(0x000), KB(0x000), KB(0x000), /* 20-27 */
-    KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), CC(0x0EA), KB(0x000), /* 28-2F */
-    CC(0x0E9), KB(0x000), CC(0x223), KB(0x000), KB(0x000), KB(0x054), KB(0x000), KB(0x046), /* 30-37 */
+    XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), /* 00-07 */
+    XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), /* 08-1F */
+    CC(0x0B6), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), /* 10-17 */
+    XX(0x000), CC(0x0B5), XX(0x000), XX(0x000), KB(0x058), KB(0x0e4), XX(0x000), XX(0x000), /* 18-1F */
+    CC(0x0E2), CC(0x192), CC(0x0CD), XX(0x000), CC(0x0B7), XX(0x000), XX(0x000), XX(0x000), /* 20-27 */
+    XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), CC(0x0EA), XX(0x000), /* 28-2F */
+    CC(0x0E9), XX(0x000), CC(0x223), XX(0x000), XX(0x000), KB(0x054), XX(0x000), KB(0x046), /* 30-37 */
     /* Sun-specific keys.  Most of the XT codes are made up  */
-    KB(0x0e6), KB(0x000), KB(0x000), KB(0x075), KB(0x076), KB(0x077), KB(0x0A3), KB(0x078), /* 38-3F */
-    KB(0x080), KB(0x081), KB(0x082), KB(0x079), KB(0x000), KB(0x000), KB(0x048), KB(0x04a), /* 40-47 */
-    KB(0x052), KB(0x04b), KB(0x000), KB(0x050), KB(0x000), KB(0x04f), KB(0x000), KB(0x04d), /* 48-4F */
-    KB(0x051), KB(0x04e), KB(0x049), KB(0x04c), KB(0x000), KB(0x000), KB(0x000), KB(0x000), /* 50-57 */
-    KB(0x000), KB(0x000), KB(0x000), KB(0x0e3), KB(0x0e7), KB(0x065), KB(0x066), DC(0x082), /* 58-5F */
-    KB(0x000), KB(0x000), KB(0x000), DC(0x083), KB(0x000), CC(0x221), CC(0x22A), CC(0x227), /* 60-67 */
-    CC(0x226), CC(0x225), CC(0x224), CC(0x194), CC(0x18A), CC(0x183), KB(0x000), KB(0x000), /* 68-6F */
-    KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), /* 70-77 */
-    KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000), KB(0x000)  /* 78-7F */
+    KB(0x0e6), XX(0x000), XX(0x000), KB(0x075), KB(0x076), KB(0x077), KB(0x0A3), KB(0x078), /* 38-3F */
+    KB(0x080), KB(0x081), KB(0x082), KB(0x079), XX(0x000), XX(0x000), KB(0x048), KB(0x04a), /* 40-47 */
+    KB(0x052), KB(0x04b), XX(0x000), KB(0x050), XX(0x000), KB(0x04f), XX(0x000), KB(0x04d), /* 48-4F */
+    KB(0x051), KB(0x04e), KB(0x049), KB(0x04c), XX(0x000), XX(0x000), XX(0x000), XX(0x000), /* 50-57 */
+    XX(0x000), XX(0x000), XX(0x000), KB(0x0e3), KB(0x0e7), KB(0x065), KB(0x066), DC(0x082), /* 58-5F */
+    XX(0x000), XX(0x000), XX(0x000), DC(0x083), XX(0x000), CC(0x221), CC(0x22A), CC(0x227), /* 60-67 */
+    CC(0x226), CC(0x225), CC(0x224), CC(0x194), CC(0x18A), CC(0x183), XX(0x000), XX(0x000), /* 68-6F */
+    XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), /* 70-77 */
+    XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000), XX(0x000)  /* 78-7F */
 };