Changeset 30976 in vbox

Timestamp:

Jul 22, 2010 10:06:58 AM (14 years ago)

Author:

vboxsync

Message:

add support for Intel HD Audio, now built by default

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (1 diff)
• Devices/Builtins.h (modified) (1 diff)
• Devices/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp (modified) (1 diff)
• Main/AudioAdapterImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)
• Main/ProgressProxyImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/webservice/vboxweb.cpp (modified) (1 diff)
• Main/xml/Settings.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -121 +121 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_AUDIO_INTELHD
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceICH6_HDA);
     if (RT_FAILURE(rc))
         return rc;
-#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioSniffer);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Builtins.h

@@ -61 +61 @@
 extern const PDMDEVREG g_DeviceICHAC97;
 extern const PDMDEVREG g_DeviceSB16;
-#ifdef VBOX_WITH_AUDIO_INTELHD
 extern const PDMDEVREG g_DeviceICH6_HDA;
-#endif
 extern const PDMDEVREG g_DeviceAudioSniffer;
 extern const PDMDEVREG g_DeviceOHCI;

trunk/src/VBox/Devices/Makefile.kmk

@@ -314 +314 @@
         Audio/DevIchAc97.cpp \
         Audio/DevSB16.cpp \
+        Audio/DevIchIntelHDA.cpp \
+        Audio/DevCodec.cpp \
         PC/DevDMA.cpp \
         Storage/fdc.c \
         Serial/DevSerial.cpp \
         Parallel/DevParallel.cpp
-
-ifdef VBOX_WITH_AUDIO_INTELHD
-    DevicesR3_SOURCES += Audio/DevIchIntelHDA.cpp
-    DevicesR3_SOURCES += Audio/DevCodec.cpp
-    DevicesR3_DEFS    += VBOX_WITH_AUDIO_INTELHD
-    VBoxDD_DEFS    += VBOX_WITH_AUDIO_INTELHD
-endif
 
 ifdef VBOX_DYNAMIC_NET_ATTACH

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -295 +295 @@
         }
         RTPrintf(                            "]\n");
-        RTPrintf("                            [--audiocontroller ac97|sb16]\n"
+        RTPrintf("                            [--audiocontroller ac97|hda|sb16]\n"
                  "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
                  "                                         bidirectional]\n");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1215 +1215 @@
                         pszCtrl = "SB16";
                     break;
+                case AudioControllerType_HDA:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszCtrl = "hda";
+                    else
+                        pszCtrl = "HDA";
+                    break;
             }
         }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1726 +1726 @@
                 else if (!strcmp(ValueUnion.psz, "ac97"))
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_AC97));
+                else if (!strcmp(ValueUnion.psz, "hda"))
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_HDA));
                 else
                 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2744 +2744 @@
     mAudioControllerTypes [KAudioControllerType_SB16] =
         tr ("SoundBlaster 16", "AudioControllerType");
+    mAudioControllerTypes [KAudioControllerType_HDA] =
+    tr ("Intel HD Audio", "AudioControllerType");
 
     mNetworkAdapterTypes [KNetworkAdapterType_Am79C970A] =

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsAudio.cpp

@@ -108 +108 @@
     /* Refill them */
     mCbAudioController->insertItem (mCbAudioController->count(),
+        vboxGlobal().toString (KAudioControllerType_HDA));
+    mCbAudioController->insertItem (mCbAudioController->count(),
         vboxGlobal().toString (KAudioControllerType_AC97));
     mCbAudioController->insertItem (mCbAudioController->count(),

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp

@@ -406 +406 @@
                     e->addItem (vboxGlobal().toString (KAudioControllerType_AC97), KAudioControllerType_AC97);
                     e->addItem (vboxGlobal().toString (KAudioControllerType_SB16), KAudioControllerType_SB16);
+                    e->addItem (vboxGlobal().toString (KAudioControllerType_HDA),  KAudioControllerType_HDA);
                     editor = e;
                     break;

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -301 +301 @@
             case AudioControllerType_AC97:
             case AudioControllerType_SB16:
+            case AudioControllerType_HDA:
             {
                 mData.backup();

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1811 +1811 @@
 
         /*
-         * AC'97 ICH / SoundBlaster16 audio
+         * AC'97 ICH / SoundBlaster16 audio / Intel HD Audio
          */
         BOOL enabled;
@@ -1829 +1829 @@
                     /* default: ICH AC97 */
                     InsertConfigNode(pDevices, "ichac97", &pDev);
-                    rc = CFGMR3InsertNode(pDev,     "0", &pInst);
+                    InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
                     InsertConfigInteger(pInst, "PCIDeviceNo",      5);
@@ -1851 +1851 @@
                     InsertConfigInteger(pCfg,  "Version", 0x0405);
                     break;
+                }
+                case AudioControllerType_HDA:
+                {
+                    /* Intel HD Audio */
+                    InsertConfigNode(pDevices, "hda", &pDev);
+                    InsertConfigNode(pDev,     "0", &pInst);
+                    InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
+                    InsertConfigInteger(pInst, "PCIDeviceNo",      5);
+                    Assert(!afPciDeviceNo[5]);
+                    afPciDeviceNo[5] = true;
+                    InsertConfigInteger(pInst, "PCIFunctionNo",    0);
+                    InsertConfigNode(pInst,    "Config", &pCfg);
                 }
             }

trunk/src/VBox/Main/ProgressProxyImpl.cpp

@@ -313 +313 @@
     HRESULT hrc;
     LogFlowThisFunc(("\n"));
+    
+    NOREF(fEarly);
 
     /*

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -466 +466 @@
            -->
     </const>
-    <const name="Future"     value="13">
+    <const name="v1_11"     value="13">
+      <desc>Settings version "1.11", written by VirtualBox 3.3.x.</desc>
+      <!-- Machine changes: HD Audio controller
+           -->
+    </const>
+    <const name="Future"     value="99999">
       <desc>Settings version greater than "1.10", written by a future VirtualBox version.</desc>
     </const>
@@ -12133 +12138 @@
     <const name="AC97" value="0"/>
     <const name="SB16" value="1"/>
+    <const name="HDA"  value="2"/>
   </enum>
 

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -421 +421 @@
     {
         // wait for a socket to arrive on the queue
-        size_t cIdleThreads, cThreads;
+        size_t cIdleThreads = 0, cThreads = 0;
         m_soap->socket = m_pQ->get(cIdleThreads, cThreads);
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -30 +30 @@
  *
  *   3) In the settings writer method, write the setting _only_ if the current settings
- *      version (stored in m->sv) is high enough. That is, for VirtualBox 3.2, write it
- *      only if (m->sv >= SettingsVersion_v1_10).
+ *      version (stored in m->sv) is high enough. That is, for VirtualBox 3.3, write it
+ *      only if (m->sv >= SettingsVersion_v1_11).
  *
  *   4) In MachineConfigFile::bumpSettingsVersionIfNeeded(), check if the new setting has
@@ -82 +82 @@
 
 /** VirtualBox XML settings version number substring ("x.y")  */
-#define VBOX_XML_VERSION        "1.10"
+#define VBOX_XML_VERSION        "1.11"
 
 /** VirtualBox XML settings version platform substring */
@@ -283 +283 @@
                 else if (ulMinor == 10)
                     m->sv = SettingsVersion_v1_10;
-                else if (ulMinor > 10)
+                else if (ulMinor == 11)
+                    m->sv = SettingsVersion_v1_11;
+                else if (ulMinor > 11)
                     m->sv = SettingsVersion_Future;
             }
@@ -303 +305 @@
         // creating new settings file:
         m->strSettingsVersionFull = VBOX_XML_VERSION_FULL;
-        m->sv = SettingsVersion_v1_10;
+        m->sv = SettingsVersion_v1_11;
     }
 }
@@ -2047 +2049 @@
         else if (strTemp == "AC97")
             aa.controllerType = AudioControllerType_AC97;
+        else if (strTemp == "HDA")
+            aa.controllerType = AudioControllerType_HDA;
         else
             throw ConfigFileError(this, &elmAudioAdapter, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
@@ -3415 +3419 @@
         {
             /* m->sv >= SettingsVersion_v1_10 */
-            xml::ElementNode *pelmDisabledNode;
+            xml::ElementNode *pelmDisabledNode= NULL;
             if (nic.fHasDisabledNAT)
                 pelmDisabledNode = pelmAdapter->createChild("DisabledModes");
@@ -3476 +3480 @@
 
     xml::ElementNode *pelmAudio = pelmHardware->createChild("AudioAdapter");
-    pelmAudio->setAttribute("controller", (hw.audioAdapter.controllerType == AudioControllerType_SB16) ? "SB16" : "AC97");
-
-    if (   m->sv >= SettingsVersion_v1_10)
+    const char *pcszController;
+    switch (hw.audioAdapter.controllerType)
+    {
+        case AudioControllerType_SB16:
+            pcszController = "SB16";
+            break;
+        case AudioControllerType_HDA:
+            if (m->sv >= SettingsVersion_v1_11)
+            {
+                pcszController = "HDA";
+                break;
+            }
+            /* fall through */
+        case AudioControllerType_AC97:
+        default:
+            pcszController = "AC97"; break;
+    }
+    pelmAudio->setAttribute("controller", pcszController);
+
+    if (m->sv >= SettingsVersion_v1_10)
     {
         xml::ElementNode *pelmRTC = pelmHardware->createChild("RTC");