Changeset 51345 in vbox for trunk

Timestamp:

May 22, 2014 11:31:45 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7382: Settings Dialog: Support for xHCI USB controller.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialogSpecific.cpp (modified) (1 diff)
• machine/UIMachineSettingsSystem.cpp (modified) (3 diffs)
• machine/UIMachineSettingsSystem.h (modified) (2 diffs)
• machine/UIMachineSettingsUSB.cpp (modified) (10 diffs)
• machine/UIMachineSettingsUSB.h (modified) (3 diffs)
• machine/UIMachineSettingsUSB.ui (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -944 +944 @@
             UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
             if (pUsbPage && pSystemPage)
-                pSystemPage->setOHCIEnabled(pUsbPage->isOHCIEnabled());
+                pSystemPage->setUSBEnabled(pUsbPage->isUSBEnabled());
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -37 +37 @@
     : m_uMinGuestCPU(0), m_uMaxGuestCPU(0)
     , m_uMinGuestCPUExecCap(0), m_uMedGuestCPUExecCap(0), m_uMaxGuestCPUExecCap(0)
-    , m_fOHCIEnabled(false)
+    , m_fIsUSBEnabled(false)
 {
     /* Prepare: */
@@ -58 +58 @@
 }
 
-void UIMachineSettingsSystem::setOHCIEnabled(bool fEnabled)
-{
-    /* Make sure OHCI status has changed: */
-    if (m_fOHCIEnabled == fEnabled)
+void UIMachineSettingsSystem::setUSBEnabled(bool fEnabled)
+{
+    /* Make sure USB status has changed: */
+    if (m_fIsUSBEnabled == fEnabled)
         return;
 
-    /* Update OHCI status value: */
-    m_fOHCIEnabled = fEnabled;
+    /* Update USB status value: */
+    m_fIsUSBEnabled = fEnabled;
 
     /* Revalidate: */
@@ -325 +325 @@
         }
 
-        /* HID vs OHCI test: */
-        if (isHIDEnabled() && !m_fOHCIEnabled)
+        /* HID vs USB test: */
+        if (isHIDEnabled() && !m_fIsUSBEnabled)
         {
             message.second << tr(

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -131 +131 @@
     bool isHIDEnabled() const;
     KChipsetType chipsetType() const;
-    void setOHCIEnabled(bool fEnabled);
+    void setUSBEnabled(bool fEnabled);
 
 protected:
@@ -211 +211 @@
 
     /* Variable: Correlation stuff: */
-    bool m_fOHCIEnabled;
+    bool m_fIsUSBEnabled;
 
     /* Cache: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -228 +228 @@
 }
 
-bool UIMachineSettingsUSB::isOHCIEnabled() const
+bool UIMachineSettingsUSB::isUSBEnabled() const
 {
     return mGbUSB->isChecked();
@@ -247 +247 @@
 
     /* Gather USB values: */
-    usbData.m_fUSBEnabled = m_machine.GetUSBControllerCountByType(KUSBControllerType_OHCI) > 0;
-    usbData.m_fEHCIEnabled = m_machine.GetUSBControllerCountByType(KUSBControllerType_EHCI) > 0;
+    usbData.m_fUSBEnabled = !m_machine.GetUSBControllers().isEmpty();
+    usbData.m_USBControllerType = m_machine.GetUSBControllerCountByType(KUSBControllerType_XHCI) > 0 ? KUSBControllerType_XHCI :
+                                  m_machine.GetUSBControllerCountByType(KUSBControllerType_EHCI) > 0 ? KUSBControllerType_EHCI :
+                                  m_machine.GetUSBControllerCountByType(KUSBControllerType_OHCI) > 0 ? KUSBControllerType_OHCI :
+                                  KUSBControllerType_Null;
 
     /* Check if controller is valid: */
@@ -301 +304 @@
     /* Load USB data to page: */
     mGbUSB->setChecked(usbData.m_fUSBEnabled);
-    mCbUSB2->setChecked(usbData.m_fEHCIEnabled);
+    switch (usbData.m_USBControllerType)
+    {
+        default:
+        case KUSBControllerType_OHCI: mRbUSB1->setChecked(true); break;
+        case KUSBControllerType_EHCI: mRbUSB2->setChecked(true); break;
+        case KUSBControllerType_XHCI: mRbUSB3->setChecked(true); break;
+    }
 
     /* For each USB filter => load it to the page: */
@@ -327 +336 @@
     UIDataSettingsMachineUSB usbData = m_cache.base();
 
-    /* USB 1.0 (OHCI): */
+    /* Is USB controller enabled? */
     usbData.m_fUSBEnabled = mGbUSB->isChecked();
-    /* USB 2.0 (EHCI): */
-    usbData.m_fEHCIEnabled = mCbUSB2->isChecked();
+    /* Of which type? */
+    if (!usbData.m_fUSBEnabled)
+        usbData.m_USBControllerType = KUSBControllerType_Null;
+    else
+    {
+        if (mRbUSB1->isChecked())
+            usbData.m_USBControllerType = KUSBControllerType_OHCI;
+        else if (mRbUSB2->isChecked())
+            usbData.m_USBControllerType = KUSBControllerType_EHCI;
+        else if (mRbUSB3->isChecked())
+            usbData.m_USBControllerType = KUSBControllerType_XHCI;
+    }
 
     /* Update USB cache: */
@@ -361 +380 @@
                 ULONG cOhciCtls = m_machine.GetUSBControllerCountByType(KUSBControllerType_OHCI);
                 ULONG cEhciCtls = m_machine.GetUSBControllerCountByType(KUSBControllerType_EHCI);
-
-                if (!cOhciCtls && usbData.m_fUSBEnabled)
-                    m_machine.AddUSBController("OHCI", KUSBControllerType_OHCI);
-                else if (cOhciCtls && !usbData.m_fUSBEnabled)
-                    m_machine.RemoveUSBController("OHCI");
-
-                if (!cEhciCtls && usbData.m_fEHCIEnabled)
-                    m_machine.AddUSBController("EHCI", KUSBControllerType_EHCI);
-                else if (cEhciCtls && !usbData.m_fEHCIEnabled)
-                    m_machine.RemoveUSBController("EHCI");
+                ULONG cXhciCtls = m_machine.GetUSBControllerCountByType(KUSBControllerType_XHCI);
+
+                /* Removing USB controllers: */
+                if (!usbData.m_fUSBEnabled)
+                {
+                    if (cXhciCtls)
+                        m_machine.RemoveUSBController("XHCI");
+                    if (cEhciCtls)
+                        m_machine.RemoveUSBController("EHCI");
+                    if (cOhciCtls)
+                        m_machine.RemoveUSBController("OHCI");
+                }
+                /* Creating/replacing USB controllers: */
+                else
+                {
+                    switch (usbData.m_USBControllerType)
+                    {
+                        case KUSBControllerType_OHCI:
+                        {
+                            if (cEhciCtls)
+                                m_machine.RemoveUSBController("EHCI");
+                            if (cXhciCtls)
+                                m_machine.RemoveUSBController("XHCI");
+                            if (!cOhciCtls)
+                                m_machine.AddUSBController("OHCI", KUSBControllerType_OHCI);
+                            break;
+                        }
+                        case KUSBControllerType_EHCI:
+                        {
+                            if (cXhciCtls)
+                                m_machine.RemoveUSBController("XHCI");
+                            if (!cOhciCtls)
+                                m_machine.AddUSBController("OHCI", KUSBControllerType_OHCI);
+                            if (!cEhciCtls)
+                                m_machine.AddUSBController("EHCI", KUSBControllerType_EHCI);
+                            break;
+                        }
+                        case KUSBControllerType_XHCI:
+                        {
+                            if (cEhciCtls)
+                                m_machine.RemoveUSBController("EHCI");
+                            if (cOhciCtls)
+                                m_machine.RemoveUSBController("OHCI");
+                            if (!cXhciCtls)
+                                m_machine.AddUSBController("XHCI", KUSBControllerType_XHCI);
+                            break;
+                        }
+                        default:
+                            break;
+                    }
+                }
             }
             /* Store USB filters data: */
@@ -432 +492 @@
     /* USB 2.0 Extension Pack presence test: */
     CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
-    if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable()))
+    if (   mGbUSB->isChecked()
+        && (mRbUSB2->isChecked() || mRbUSB3->isChecked())
+        && (extPack.isNull() || !extPack.GetUsable()))
     {
         /* Prepare message: */
@@ -454 +516 @@
 {
     setTabOrder (aWidget, mGbUSB);
-    setTabOrder (mGbUSB, mCbUSB2);
-    setTabOrder (mCbUSB2, mTwFilters);
+    setTabOrder (mGbUSB, mRbUSB1);
+    setTabOrder (mRbUSB1, mRbUSB2);
+    setTabOrder (mRbUSB2, mRbUSB3);
+    setTabOrder (mRbUSB3, mTwFilters);
 }
 
@@ -502 +566 @@
     /* Enable/disable USB children: */
     mUSBChild->setEnabled(isMachineInValidMode() && fEnabled);
-    mCbUSB2->setEnabled(isMachineOffline() && fEnabled);
+    mRbUSB1->setEnabled(isMachineOffline() && fEnabled);
+    mRbUSB2->setEnabled(isMachineOffline() && fEnabled);
+    mRbUSB3->setEnabled(isMachineOffline() && fEnabled);
     if (fEnabled)
     {
@@ -730 +796 @@
     /* Prepare validation: */
     connect(mGbUSB, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
-    connect(mCbUSB2, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
+    connect(mRbUSB1, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
+    connect(mRbUSB2, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
+    connect(mRbUSB3, SIGNAL(stateChanged(int)), this, SLOT(revalidate()));
 }
 
@@ -798 +866 @@
     mGbUSB->setEnabled(isMachineOffline());
     mUSBChild->setEnabled(isMachineInValidMode() && mGbUSB->isChecked());
-    mCbUSB2->setEnabled(isMachineOffline() && mGbUSB->isChecked());
+    mRbUSB1->setEnabled(isMachineOffline() && mGbUSB->isChecked());
+    mRbUSB2->setEnabled(isMachineOffline() && mGbUSB->isChecked());
+    mRbUSB3->setEnabled(isMachineOffline() && mGbUSB->isChecked());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

@@ -88 +88 @@
     UIDataSettingsMachineUSB()
         : m_fUSBEnabled(false)
-        , m_fEHCIEnabled(false) {}
+        , m_USBControllerType(KUSBControllerType_Null) {}
     /* Functions: */
     bool equal(const UIDataSettingsMachineUSB &other) const
     {
         return (m_fUSBEnabled == other.m_fUSBEnabled) &&
-               (m_fEHCIEnabled == other.m_fEHCIEnabled);
+               (m_USBControllerType == other.m_USBControllerType);
     }
     /* Operators: */
@@ -100 +100 @@
     /* Variables: */
     bool m_fUSBEnabled;
-    bool m_fEHCIEnabled;
+    KUSBControllerType m_USBControllerType;
 };
 typedef UISettingsCachePool<UIDataSettingsMachineUSB, UICacheSettingsMachineUSBFilter> UICacheSettingsMachineUSB;
@@ -121 +121 @@
     UIMachineSettingsUSB();
 
-    bool isOHCIEnabled() const;
+    bool isUSBEnabled() const;
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.ui

@@ -23 +23 @@
    </rect>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" columnstretch="0,1,0">
    <item row="0" column="0" colspan="2" >
     <widget class="QCheckBox" name="mGbUSB" >
@@ -48 +48 @@
       <size>
        <width>20</width>
-       <height>20</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="1" column="1" >
-    <widget class="QWidget" native="1" name="mUSBChild" >
-     <layout class="QGridLayout" >
+   <item row="1" column="1" colspan="2" >
+    <widget class="QWidget" name="mUSBChild" >
+     <layout class="QVBoxLayout" >
       <property name="leftMargin" >
        <number>0</number>
@@ -68 +68 @@
        <number>0</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="mCbUSB2" >
-        <property name="whatsThis" >
-         <string>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</string>
-        </property>
-        <property name="text" >
-         <string>Enable USB 2.0 (E&amp;HCI) Controller</string>
-        </property>
+      <item>
+       <widget class="QWidget" native="1" name="mRbContainer" >
+        <layout class="QVBoxLayout">
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QRadioButton" name="mRbUSB1">
+           <property name="whatsThis">
+            <string>When checked, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</string>
+           </property>
+           <property name="text">
+            <string>USB &amp;1.0 (OHCI) Controller</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="mRbUSB2">
+           <property name="whatsThis">
+            <string>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</string>
+           </property>
+           <property name="text">
+            <string>USB &amp;2.0 (EHCI) Controller</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="mRbUSB3">
+           <property name="whatsThis">
+            <string>When checked, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</string>
+           </property>
+           <property name="text">
+            <string>USB &amp;3.0 (xHCI) Controller</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="1" column="0" >
+      <item>
        <widget class="QILabelSeparator" name="mGbUSBFilters" >
         <property name="text" >
@@ -88 +126 @@
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item>
        <widget class="QWidget" native="1" name="mWtFilterHandler" >
         <layout class="QHBoxLayout" >