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

Timestamp:

Jul 18, 2015 11:01:44 PM (10 years ago)

Author:

vboxsync

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

101707

Message:

Devices: Log & Assertion formatting fixes.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchHdaCodec.cpp (modified) (8 diffs)
• DrvHostOSSAudio.cpp (modified) (7 diffs)

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

@@ -2355 +2355 @@
 #define CODECDBG_UNINDENT if (pInfo->uLevel) pInfo->uLevel--;
 
-#define CODECDBG_PRINT(x, ...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, x);
-#define CODECDBG_PRINTI(x, ...) codecDbgPrintf(pInfo, x);
+#define CODECDBG_PRINT(...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, __VA_ARGS__)
+#define CODECDBG_PRINTI(...) codecDbgPrintf(pInfo, __VA_ARGS__)
 
 static void codecDbgPrintfIndentV(PCODECDBGINFO pInfo, uint16_t uIndent, const char *pszFormat, va_list va)
@@ -2444 +2444 @@
     if (pNode->node.id == STAC9220_NID_ROOT)
     {
-        CODECDBG_PRINT("ROOT\n")
+        CODECDBG_PRINT("ROOT\n");
     }
     else if (pNode->node.id == STAC9220_NID_AFG)
     {
-        CODECDBG_PRINT("AFG\n")
+        CODECDBG_PRINT("AFG\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2456 +2456 @@
     else if (hdaCodecIsPortNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("PORT\n")
+        CODECDBG_PRINT("PORT\n");
     }
     else if (hdaCodecIsDacNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DAC\n")
+        CODECDBG_PRINT("DAC\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2470 +2470 @@
     else if (hdaCodecIsAdcVolNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC VOLUME\n")
+        CODECDBG_PRINT("ADC VOLUME\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2479 +2479 @@
     else if (hdaCodecIsAdcNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC\n")
+        CODECDBG_PRINT("ADC\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2489 +2489 @@
     else if (hdaCodecIsAdcMuxNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC MUX\n")
+        CODECDBG_PRINT("ADC MUX\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2498 +2498 @@
     else if (hdaCodecIsPcbeepNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("PC BEEP\n")
+        CODECDBG_PRINT("PC BEEP\n");
     }
     else if (hdaCodecIsSpdifOutNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("SPDIF OUT\n")
+        CODECDBG_PRINT("SPDIF OUT\n");
     }
     else if (hdaCodecIsSpdifInNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("SPDIF IN\n")
+        CODECDBG_PRINT("SPDIF IN\n");
     }
     else if (hdaCodecIsDigInPinNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DIGITAL IN PIN\n")
+        CODECDBG_PRINT("DIGITAL IN PIN\n");
     }
     else if (hdaCodecIsDigOutPinNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DIGITAL OUT PIN\n")
+        CODECDBG_PRINT("DIGITAL OUT PIN\n");
     }
     else if (hdaCodecIsCdNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("CD\n")
+        CODECDBG_PRINT("CD\n");
     }
     else if (hdaCodecIsVolKnobNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("VOLUME KNOB\n")
+        CODECDBG_PRINT("VOLUME KNOB\n");
     }
     else if (hdaCodecIsReservedNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("RESERVED\n")
+        CODECDBG_PRINT("RESERVED\n");
     }
     else
@@ -2687 +2687 @@
             return rc;
         AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.id,
-                              ("loaded %#x, expected \n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
+                              ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
                               VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
     }

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

@@ -245 +245 @@
         if (hFile == -1)
         {
-            LogRel(("OSS: Failed to open %s: %s\n", pszDev, strerror(errno)));
+            LogRel(("OSS: Failed to open %s: %s(%d)\n", pszDev, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -253 +253 @@
         if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
         {
-            LogRel(("OSS: Failed to set audio format to %ld\n",
-                    iFormat, strerror(errno)));
+            LogRel(("OSS: Failed to set audio format to %ld errno=%s(%d)\n", iFormat, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -262 +261 @@
         if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels))
         {
-            LogRel(("OSS: Failed to set number of audio channels (%d): %s\n",
-                     pReq->cChannels, strerror(errno)));
+            LogRel(("OSS: Failed to set number of audio channels (%d): %s(%d)\n", pReq->cChannels, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -271 +269 @@
         if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq))
         {
-            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n",
-                    pReq->uFreq, strerror(errno)));
+            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s(%d)\n", pReq->uFreq, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -281 +278 @@
         if (ioctl(hFile, SNDCTL_DSP_NONBLOCK))
         {
-            LogRel(("OSS: Failed to set non-blocking mode: %s\n",
-                    strerror(errno)));
+            LogRel(("OSS: Failed to set non-blocking mode: %s(%d)\n", strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -290 +286 @@
         if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss))
         {
-            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
-                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno)));
+            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s(%d)\n",
+                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -297 +293 @@
 
         audio_buf_info abinfo;
-        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE,
-                  &abinfo))
-        {
-            LogRel(("OSS: Failed to retrieve buffer length: %s\n", strerror(errno)));
+        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo))
+        {
+            LogRel(("OSS: Failed to retrieve buffer length: %s(%d)\n", strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
         }
 
-        rc = drvHostOSSAudioOSSToFmt(iFormat,
-                                     &pObt->enmFormat, &pObt->enmENDIANNESS);
+        rc = drvHostOSSAudioOSSToFmt(iFormat, &pObt->enmFormat, &pObt->enmENDIANNESS);
         if (RT_SUCCESS(rc))
         {