Changeset 62972 in vbox

Timestamp:

Aug 4, 2016 10:44:09 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (16 diffs)

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

@@ -2632 +2632 @@
             AssertMsgFailed(("Unsupported bits per sample %x\n",
                              EXTRACT_VALUE(u32SDFMT, HDA_SDFMT_BITS_MASK, HDA_SDFMT_BITS_SHIFT)));
+            enmFmt = PDMAUDIOFMT_INVALID;
             rc = VERR_NOT_SUPPORTED;
             break;
@@ -2983 +2984 @@
 DECLINLINE(int) hdaRegWriteSDLock(PHDASTATE pThis, PHDASTREAM pStream, uint32_t iReg, uint32_t u32Value)
 {
+    RT_NOREF(pThis, iReg, u32Value);
     AssertPtr(pThis);   /* don't bother returning errors */
     AssertPtr(pStream);
 
-#ifdef VBOX_STRICT
+# ifdef VBOX_STRICT
     /* Check if the SD's RUN bit is set. */
     uint32_t u32SDCTL = HDA_STREAM_REG(pThis, CTL, pStream->u8SD);
@@ -2994 +2996 @@
         LogFunc(("[SD%RU8]: Warning: Cannot write to register 0x%x (0x%x) when RUN bit is set (%R[sdctl])\n",
                  pStream->u8SD, iReg, u32Value, u32SDCTL));
-# ifdef DEBUG_andy
+#  ifdef DEBUG_andy
         AssertFailed();
+#  endif
+        return VERR_ACCESS_DENIED;
+    }
 # endif
-        return VERR_ACCESS_DENIED;
-    }
-#endif
 
     /** @todo r=bird: Why on EARTH are we using mutexes?  USE CRITICAL SECTIONS!! */
@@ -3491 +3493 @@
 
     PHDABDLE       pBDLE   = &pStream->State.BDLE;
+#ifdef LOG_ENABLED
     const uint32_t u32LPIB = HDA_STREAM_REG(pThis, LPIB, pStream->u8SD);
+#endif
 
     /* Check if the current BDLE entry is complete (full). */
@@ -3656 +3660 @@
         if (cbBuf >= hdaStreamGetFIFOW(pThis, pStream))
         {
+#if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
             PHDASTREAMMAPPING pMapping            = &pStream->State.Mapping;
+#endif
 
             /** @todo Which channel is which? */
@@ -3701 +3707 @@
              * Write data to according mixer sinks.
              */
-            rc2 = AudioMixerSinkWrite(pThis->SinkFront.pMixSink, AUDMIXOP_COPY, pvDataFront,     cbDataFront,
+            rc2 = AudioMixerSinkWrite(pThis->SinkFront.pMixSink, AUDMIXOP_COPY, pvDataFront,     (uint32_t)cbDataFront,
                                       NULL /* pcbWritten */);
             AssertRC(rc2);
@@ -4161 +4167 @@
 static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns);
     PHDASTATE pThis = (PHDASTATE)pvUser;
     Assert(pThis == PDMINS_2_DATA(pDevIns, PHDASTATE));
@@ -4167 +4174 @@
     STAM_PROFILE_START(&pThis->StatTimer, a);
 
-    uint64_t cTicksNow     = TMTimerGet(pTimer);
-    uint64_t cTicksElapsed = cTicksNow - pThis->uTimerTS;
+    uint64_t cTicksNow = TMTimerGet(pTimer);
 
     LogFlowFuncEnter();
@@ -4373 +4379 @@
     /* State sanity checks. */
     Assert(pStream->State.fInReset == false);
-
-    uint32_t u32LPIB = HDA_STREAM_REG(pThis, LPIB, pStream->u8SD);
-    Assert(u32LPIB <= pStream->u32CBL);
+    Assert(HDA_STREAM_REG(pThis, LPIB, pStream->u8SD) <= pStream->u32CBL);
 
     bool fInterrupt = false;
@@ -4757 +4761 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) hdaPciIoRegionMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb,
-                                           PCIADDRESSSPACE enmType)
-{
+static DECLCALLBACK(int)
+hdaPciIoRegionMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
+{
+    RT_NOREF(iRegion, enmType);
     PPDMDEVINS  pDevIns = pPciDev->pDevIns;
     PHDASTATE   pThis = RT_FROM_MEMBER(pPciDev, HDASTATE, PciDev);
-    RTIOPORT    Port = (RTIOPORT)GCPhysAddress;
-    int         rc;
 
     /*
@@ -4772 +4775 @@
      */
     Assert(enmType == PCI_ADDRESS_SPACE_MEM);
-    rc = PDMDevHlpMMIORegister(pDevIns, GCPhysAddress, cb, NULL /*pvUser*/,
-                                 IOMMMIO_FLAGS_READ_DWORD
-                               | IOMMMIO_FLAGS_WRITE_PASSTHRU,
-                               hdaMMIOWrite, hdaMMIORead, "HDA");
-
+    int rc = PDMDevHlpMMIORegister(pDevIns, GCPhysAddress, cb, NULL /*pvUser*/,
+                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_PASSTHRU,
+                                   hdaMMIOWrite, hdaMMIORead, "HDA");
     if (RT_FAILURE(rc))
         return rc;
@@ -4805 +4806 @@
 static int hdaSaveStream(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, PHDASTREAM pStrm)
 {
+    RT_NOREF(pDevIns);
+#ifdef DEBUG
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
-
+#endif
     LogFlowFunc(("[SD%RU8]\n", pStrm->u8SD));
 
@@ -4879 +4882 @@
 
     /* Save stream states. */
-    int rc;
     for (uint8_t i = 0; i < HDA_MAX_STREAMS; i++)
     {
-        rc = hdaSaveStream(pDevIns, pSSM, &pThis->aStreams[i]);
+        int rc = hdaSaveStream(pDevIns, pSSM, &pThis->aStreams[i]);
         AssertRCReturn(rc, rc);
     }
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -5620 +5622 @@
 static int hdaAttachInternal(PPDMDEVINS pDevIns, PHDADRIVER pDrv, unsigned uLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
 
@@ -5698 +5701 @@
 static DECLCALLBACK(void) hdaDetach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags)
 {
+    RT_NOREF(pDevIns, uLUN, fFlags);
     LogFunc(("iLUN=%u, fFlags=0x%x\n", uLUN, fFlags));
 }
@@ -5792 +5796 @@
 static DECLCALLBACK(int) hdaConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF(iInstance);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
     Assert(iInstance == 0);
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*