Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Console

Timestamp:

Mar 31, 2025 11:31:09 AM (5 weeks ago)

Author:

vboxsync

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

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c (modified) (2 diffs)
• MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h (modified) (1 diff)
• MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c

@@ -27 +27 @@
   NULL
 };
+
+//
+// Values from Usb Inteface Association Descriptor Device
+//  Class Code and Usage Model specification (iadclasscode_r10.pdf)
+//  from Usb.org
+//
+#define USB_BASE_CLASS_MISCELLANEOUS       0xEF
+#define USB_MISCELLANEOUS_SUBCLASS_COMMON  0x02
+#define USB_MISCELLANEOUS_PROTOCOL_IAD     0x01
 
 /**
@@ -809 +818 @@
   DeviceSubClass = DevDesc.DeviceSubClass;
   DeviceProtocol = DevDesc.DeviceProtocol;
-  if (DeviceClass == 0) {
-    //
-    // If Class in Device Descriptor is set to 0, use the Class, SubClass and
-    // Protocol in Interface Descriptor instead.
+
+  if ((DeviceClass == 0) ||
+      ((DeviceClass == USB_BASE_CLASS_MISCELLANEOUS) &&
+       (DeviceSubClass == USB_MISCELLANEOUS_SUBCLASS_COMMON) &&
+       (DeviceProtocol == USB_MISCELLANEOUS_PROTOCOL_IAD)))
+  {
+    //
+    // If Class in Device Descriptor is set to 0 (Device), or
+    // Class/SubClass/Protocol is 0xEF/0x02/0x01 (IAD), use the Class, SubClass
+    // and Protocol in Interface Descriptor instead.
     //
     Status = UsbIo->UsbGetInterfaceDescriptor (UsbIo, &IfDesc);

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h

@@ -1217 +1217 @@
   +=========+======+===========+=============+=============+=============+=========+
   |         | EFI  |           |             |             |             |         |
-  |         | Scan |           |             |  Normal     |             |         |
-  |   KEY   | Code |  VT100+   | Xterm R6    |  VT400      | Linux       | SCO     |
+  |         | Scan |  VT100+   |             |  Normal     |             |         |
+  |   KEY   | Code |  VTUTF8   | Xterm R6    |  VT400      | Linux       | SCO     |
   +=========+======+===========+=============+=============+=============+=========+
   | F1      | 0x0B | ESC O P   | ESC O P     | ESC [ 1 1 ~ | ESC [ [ A   | ESC [ M |

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c

@@ -94 +94 @@
       TerminalDevice->DevicePath
       );
+  }
+
+  if (!EFI_ERROR (Status)) {
+    Status = TerminalDevice->SerialIo->SetControl (TerminalDevice->SerialIo, EFI_SERIAL_DATA_TERMINAL_READY|EFI_SERIAL_REQUEST_TO_SEND);
+    if (Status == EFI_UNSUPPORTED) {
+      Status = EFI_SUCCESS;
+    }
   }
 
@@ -1314 +1321 @@
   +=========+======+===========+=============+=============+=============+=========+
   |         | EFI  |           |             |             |             |         |
-  |         | Scan |           |             |  Normal     |             |         |
-  |   KEY   | Code |  VT100+   | Xterm R6    |  VT400      | Linux       | SCO     |
+  |         | Scan |  VT100+   |             |  Normal     |             |         |
+  |   KEY   | Code |  VTUTF8   | Xterm R6    |  VT400      | Linux       | SCO     |
   +=========+======+===========+=============+=============+=============+=========+
   | F1      | 0x0B | ESC O P   | ESC O P     | ESC [ 1 1 ~ | ESC [ [ A   | ESC [ M |
@@ -1392 +1399 @@
                                      (TerminalDevice->TerminalType == TerminalTypeTtyTerm) ||
                                      (TerminalDevice->TerminalType == TerminalTypeXtermR6) ||
-                                     (TerminalDevice->TerminalType == TerminalTypeVt100Plus)))
+                                     (TerminalDevice->TerminalType == TerminalTypeVt100Plus) ||
+                                     (TerminalDevice->TerminalType == TerminalTypeVtUtf8)))
         {
           TerminalDevice->InputState |= INPUT_STATE_O;
@@ -1566 +1574 @@
               break;
           }
-        } else if (TerminalDevice->TerminalType == TerminalTypeVt100Plus) {
+        } else if ((TerminalDevice->TerminalType == TerminalTypeVt100Plus) ||
+                   (TerminalDevice->TerminalType == TerminalTypeVtUtf8))
+        {
           switch (UnicodeChar) {
             case 'P':