Changeset 31519 in vbox

Timestamp:

Aug 10, 2010 11:35:59 AM (15 years ago)

Author:

vboxsync

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

64615

Message:

Audio: provide ACPI info for audio card to Mac guests

Location:

trunk/src/VBox

Files:

• Devices/PC/DevACPI.cpp (modified) (5 diffs)
• Devices/PC/vbox.dsl (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -161 +161 @@
     SYSTEM_INFO_INDEX_CPU_EVENT         = 14, /**< The CPU id the event is for */
     SYSTEM_INFO_INDEX_NIC_ADDRESS       = 15, /**< NIC PCI address, or 0 */
-    SYSTEM_INFO_INDEX_END               = 16,
+    SYSTEM_INFO_INDEX_AUDIO_ADDRESS     = 16, /**< Audio card PCI address, or 0 */
+    SYSTEM_INFO_INDEX_END               = 17,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -255 +256 @@
     bool                fCpuHotPlug;
     /** Primary NIC PCI address */
-    uint32_t             u32NicPciAddress;
+    uint32_t            u32NicPciAddress;
+    /** Primary audio card PCI address */
+    uint32_t            u32AudioPciAddress;
+    uint32_t            u32Pad0;
 
     /** ACPI port base interface. */
@@ -1506 +1510 @@
                     break;
 
+                case SYSTEM_INFO_INDEX_AUDIO_ADDRESS:
+                    *pu32 = s->u32AudioPciAddress;
+                    break;
+
                 /* This is only for compatability with older saved states that
                    may include ACPI code that read these values.  Legacy is
@@ -2351 +2359 @@
                               "ShowCpu\0"
                               "NicPciAddress\0"
+                              "AudioPciAddress\0"
                               "CpuHotPlug\0"
                               "AmlFilePath\0"
@@ -2404 +2413 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"NicPciAddress\""));
+
+    /* query primary NIC PCI address */
+    rc = CFGMR3QueryU32Def(pCfg, "AudioPciAddress", &s->u32AudioPciAddress, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"AudioPciAddress\""));
 
     /* query whether we are allow CPU hot plugging */

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -145 +145 @@
             CPEV,  32,
             NICA,  32,
+            HDAA,  32,
             Offset (0x80),
             ININ, 32,
@@ -787 +788 @@
                  {
                     if (LEqual (NICA, Zero)) {
+                        Return (0x00)
+                    }
+                    else {
+                        Return (0x0F)
+                    }
+                 }
+            }
+
+            // HDA Audio card
+            Device (HDEF)
+            {
+                Method(_ADR, 0, NotSerialized)
+                {
+                     Return (HDAA)
+                }
+
+                Method (_STA, 0, NotSerialized)
+                {
+                 if (LEqual (HDAA, Zero)) {
                         Return (0x00)
                     }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1809 +1809 @@
          * AC'97 ICH / SoundBlaster16 audio / Intel HD Audio
          */
-        BOOL enabled;
+        BOOL fAudioEnabled;
         ComPtr<IAudioAdapter> audioAdapter;
         hrc = pMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam());                 H();
         if (audioAdapter)
-            hrc = audioAdapter->COMGETTER(Enabled)(&enabled);                               H();
-
-        if (enabled)
+            hrc = audioAdapter->COMGETTER(Enabled)(&fAudioEnabled);                         H();
+
+        if (fAudioEnabled)
         {
             AudioControllerType_T audioController;
@@ -2262 +2262 @@
                 uint32_t u32NicPciAddr = (aNic.mPciDev << 16) | aNic.mPciFn;
                 InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPciAddr);
+            }
+            if (fOsXGuest && fAudioEnabled)
+            {
+                /** @todo: don't hardcode */
+                uint32_t u32AudioPciAddr = (5 << 16) | 0;
+                InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
             }
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);