Changeset 76849 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jan 17, 2019 11:20:56 AM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Only expose VRA / VRM (variable rates) features if we really offer support for it (VBOX_WITH_AC97_VRA and VBOX_WITH_AC97_VRM, both currently disabled).

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -122 +122 @@
 /** @} */
 
-/** @name Extended Audio Status and Control Register (EACS).
+/** @name Extended Audio ID Register (EAID).
  * @{ */
-#define AC97_EACS_VRA 1                 /**< Variable Rate Audio (4.2.1.1). */
-#define AC97_EACS_VRM 8                 /**< Variable Rate Mic Audio (4.2.1.1). */
+#define AC97_EAID_VRA          RT_BIT(0)            /**< Variable Rate Audio. */
+#define AC97_EAID_VRM          RT_BIT(3)            /**< Variable Rate Mic Audio. */
+#define AC97_EAID_REV0         RT_BIT(10)           /**< AC'97 revision compliance. */
+#define AC97_EAID_REV1         RT_BIT(11)           /**< AC'97 revision compliance. */
+/** @} */
+
+/** @name Extended Audio Control and Status Register (EACS).
+ * @{ */
+#define AC97_EACS_VRA          RT_BIT(0)            /**< Variable Rate Audio (4.2.1.1). */
+#define AC97_EACS_VRM          RT_BIT(3)            /**< Variable Rate Mic Audio (4.2.1.1). */
 /** @} */
 
@@ -2503 +2511 @@
     ichac97MixerSet(pThis, AC97_Powerdown_Ctrl_Stat     , 0x000f);
 
-    ichac97MixerSet(pThis, AC97_Extended_Audio_ID       , 0x0809);
-    ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, 0x0009);
+    /* Configure Extended Audio ID (EAID) + Control & Status (EACS) registers. */
+    uint16_t fEAID = AC97_EAID_REV1; /* Our hardware is AC'97 rev2.3 compliant. */
+    uint16_t fEACS = 0;
+#ifdef VBOX_WITH_AC97_VRA
+    fEAID |= AC97_EAID_VRA; /* Variable Rate PCM Audio capable. */
+    fEACS |= AC97_EACS_VRA; /* Ditto. */
+#endif
+#ifdef VBOX_WITH_AC97_VRM
+    fEAID |= AC97_EAID_VRM; /* Variable Rate Mic-In Audio capable. */
+    fEACS |= AC97_EACS_VRM; /* Ditto. */
+#endif
+
+    ichac97MixerSet(pThis, AC97_Extended_Audio_ID,        fEAID);
+    ichac97MixerSet(pThis, AC97_Extended_Audio_Ctrl_Stat, fEACS);
     ichac97MixerSet(pThis, AC97_PCM_Front_DAC_Rate      , 0xbb80);
     ichac97MixerSet(pThis, AC97_PCM_Surround_DAC_Rate   , 0xbb80);
@@ -3497 +3517 @@
                     }
                     else
-                        AssertMsgFailed(("Attempt to set front DAC rate to %RU32, but VRA is not set\n", u32Val));
+                        LogRel2(("AC97: Setting Front DAC rate when VRA is not set is forbidden, ignoring\n"));
                     break;
                 case AC97_MIC_ADC_Rate:
@@ -3511 +3531 @@
                     }
                     else
-                        AssertMsgFailed(("Attempt to set MIC ADC rate to %RU32, but VRM is not set\n", u32Val));
+                        LogRel2(("AC97: Setting MIC ADC rate when VRM is not set is forbidden, ignoring\n"));
                     break;
                 case AC97_PCM_LR_ADC_Rate:
@@ -3525 +3545 @@
                     }
                     else
-                        AssertMsgFailed(("Attempt to set LR ADC rate to %RU32, but VRA is not set\n", u32Val));
+                        LogRel2(("AC97: Setting LR ADC rate when VRA is not set is forbidden, ignoring\n"));
                     break;
                 default:
@@ -4214 +4234 @@
         return PDMDevHlpVMSetError(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, RT_SRC_POS,
                                    N_("AC'97 configuration error: The \"Codec\" value \"%s\" is unsupported"), szCodec);
+
+    LogRel(("AC97: Using codec '%s'\n", szCodec));
 
     /*