Changeset 69723 in vbox for trunk

Timestamp:

Nov 17, 2017 11:23:49 AM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Added return code for hdaStreamPeriodInit() and return if no valid parameters are given.

Location:

trunk/src/VBox/Devices/Audio

Files:

• HDAStreamPeriod.cpp (modified) (3 diffs)
• HDAStreamPeriod.h (modified) (1 diff)

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

@@ -77 +77 @@
  * Initializes a given stream period with needed parameters.
  *
+ * @return  VBox status code.
  * @param   pPeriod             Stream period to (re-)initialize. Must be created with hdaStreamPeriodCreate() first.
  * @param   u8SD                Stream descriptor (serial data #) number to assign this stream period to.
@@ -83 +84 @@
  * @param   pStreamCfg          Audio stream configuration to use for this period.
  */
-void hdaStreamPeriodInit(PHDASTREAMPERIOD pPeriod,
-                         uint8_t u8SD, uint16_t u16LVI, uint32_t u32CBL, PPDMAUDIOSTREAMCFG pStreamCfg)
-{
-
-    /* Sanity. */
-    AssertReturnVoid(u16LVI);
-    AssertReturnVoid(u32CBL);
-    AssertReturnVoid(DrvAudioHlpStreamCfgIsValid(pStreamCfg));
+int hdaStreamPeriodInit(PHDASTREAMPERIOD pPeriod,
+                        uint8_t u8SD, uint16_t u16LVI, uint32_t u32CBL, PPDMAUDIOSTREAMCFG pStreamCfg)
+{
+    if (   !u16LVI
+        || !u32CBL
+        || !DrvAudioHlpStreamCfgIsValid(pStreamCfg))
+    {
+        return VERR_INVALID_PARAMETER;
+    }
 
     /*
@@ -119 +121 @@
               pPeriod->u8SD, pPeriod->u64DurationWalClk, pPeriod->u32Hz, u32CBL, u16LVI,
               cTotalPeriods, pPeriod->framesToTransfer));
+
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/Devices/Audio/HDAStreamPeriod.h

@@ -85 +85 @@
 int      hdaStreamPeriodCreate(PHDASTREAMPERIOD pPeriod);
 void     hdaStreamPeriodDestroy(PHDASTREAMPERIOD pPeriod);
-void     hdaStreamPeriodInit(PHDASTREAMPERIOD pPeriod, uint8_t u8SD, uint16_t u16LVI, uint32_t u32CBL, PPDMAUDIOSTREAMCFG pStreamCfg);
+int      hdaStreamPeriodInit(PHDASTREAMPERIOD pPeriod, uint8_t u8SD, uint16_t u16LVI, uint32_t u32CBL, PPDMAUDIOSTREAMCFG pStreamCfg);
 void     hdaStreamPeriodReset(PHDASTREAMPERIOD pPeriod);
 int      hdaStreamPeriodBegin(PHDASTREAMPERIOD pPeriod, uint64_t u64WalClk);