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

Timestamp:

Dec 18, 2015 3:20:24 PM (9 years ago)

Author:

vboxsync

Message:

Audio: Included "TimerHz" in CFGMR3AreValuesValid checks.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (2 diffs)
• DevIchHda.cpp (modified) (1 diff)
• DevSB16.cpp (modified) (1 diff)

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

@@ -2243 +2243 @@
      * Validations.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Codec\0"))
+    if (!CFGMR3AreValuesValid(pCfg,
+                              "Codec\0"
+                              "TimerHz\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuration for the AC'97 device"));
-    int rc;
+
+    /*
+     * Read config data.
+     */
+    char szCodec[20];
+    int rc = CFGMR3QueryStringDef(pCfg, "Codec", &szCodec[0], sizeof(szCodec), "STAC9700");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
+                                N_("AC'97 configuration error: Querying \"Codec\" as string failed"));
+
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
     uint16_t uTimerHz;
@@ -2254 +2265 @@
                                 N_("AC'97 configuration error: failed to read Hertz (Hz) rate as unsigned integer"));
 #endif
-
-    /*
-     * Determine the codec model.
-     */
-    char szCodec[20];
-    rc = CFGMR3QueryStringDef(pCfg, "Codec", &szCodec[0], sizeof(szCodec), "STAC9700");
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
-                                N_("AC'97 configuration error: Querying \"Codec\" as string failed"));
 
     /*

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

@@ -4297 +4297 @@
      */
     if (!CFGMR3AreValuesValid(pCfgHandle, "R0Enabled\0"
-                                          "RCEnabled\0"))
+                                          "RCEnabled\0"
+                                          "TimerHz\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_ ("Invalid configuration for the Intel HDA device"));

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

@@ -2059 +2059 @@
                               "DMA16\0"
                               "Port\0"
-                              "Version\0"))
+                              "Version\0"
+                              "TimerHz\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuration for SB16 device"));