Changeset 63210 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

Aug 9, 2016 2:47:20 PM (9 years ago)

Author:

vboxsync

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

109837

Message:

DrvIchHda.cpp: Disabled a surprising number of unused functions.

File:

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

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

@@ -881 +881 @@
 *********************************************************************************************************************************/
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
+#ifdef IN_RING3
 static FNPDMDEVRESET hdaReset;
+#endif
 
 /** @name Register read/write stubs.
@@ -897 +899 @@
 static int hdaRegReadLPIB(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
 static int hdaRegReadWALCLK(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
-static int hdaRegReadSSYNC(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value);
-static int hdaRegWriteSSYNC(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
-static int hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
+//static int hdaRegReadSSYNC(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value); - unused
+//static int hdaRegWriteSSYNC(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);  - unused
+//static int hdaRegWriteINTSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value); - implementation not found.
 static int hdaRegWriteCORBWP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
 static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
@@ -919 +921 @@
 static int       hdaRegWriteSDSTS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
 static int       hdaRegWriteSDLVI(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
-static int       hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
-static int       hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
+//static int       hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value); - unused
+//static int       hdaRegWriteSDFIFOS(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value); - unused
 static int       hdaRegWriteSDFMT(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
 static int       hdaRegWriteSDBDPL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value);
@@ -927 +929 @@
 
 /* Locking + logging. */
+#ifdef IN_RING3
 DECLINLINE(int)  hdaRegWriteSDLock(PHDASTATE pThis, PHDASTREAM pStream, uint32_t iReg, uint32_t u32Value);
 DECLINLINE(void) hdaRegWriteSDUnlock(PHDASTREAM pStream);
+#endif
 
 /** @name Generic register read/write functions.
@@ -946 +950 @@
 static void hdaStreamDestroy(PHDASTREAM pStream);
 static int hdaStreamSetActive(PHDASTATE pThis, PHDASTREAM pStream, bool fActive);
-static int hdaStreamStart(PHDASTREAM pStream);
+//static int hdaStreamStart(PHDASTREAM pStream); - unused
 static int hdaStreamStop(PHDASTREAM pStream);
-static int hdaStreamWaitForStateChange(PHDASTREAM pStream, RTMSINTERVAL msTimeout);
+/*static int hdaStreamWaitForStateChange(PHDASTREAM pStream, RTMSINTERVAL msTimeout); - currently unused */
 static int hdaTransfer(PHDASTATE pThis, PHDASTREAM pStream, uint32_t cbToProcess, uint32_t *pcbProcessed);
 #endif
@@ -970 +974 @@
  * Timer routines.
  */
-#ifndef VBOX_WITH_AUDIO_CALLBACKS
+#if !defined(VBOX_WITH_AUDIO_CALLBACKS) && defined(IN_RING3)
 static void hdaTimerMaybeStart(PHDASTATE pThis);
 static void hdaTimerMaybeStop(PHDASTATE pThis);
@@ -1768 +1772 @@
 }
 
+#if 0 /* unused */
 static bool hdaStreamIsActive(PHDASTATE pThis, PHDASTREAM pStream)
 {
@@ -1778 +1783 @@
     return fActive;
 }
+#endif
 
 static int hdaStreamSetActive(PHDASTATE pThis, PHDASTREAM pStream, bool fActive)
@@ -1850 +1856 @@
 }
 
+#if 0 /** @todo hdaStreamStart is unused */
 static int hdaStreamStart(PHDASTREAM pStream)
 {
@@ -1860 +1867 @@
     return VINF_SUCCESS;
 }
+#endif /* unused */
 
 static int hdaStreamStop(PHDASTREAM pStream)
@@ -1895 +1903 @@
 }
 
+#if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
 static int hdaStreamChannelExtract(PPDMAUDIOSTREAMCHANNEL pChan, const void *pvBuf, size_t cbBuf)
 {
@@ -1942 +1951 @@
     return VINF_SUCCESS;
 }
-
+#endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
+
+#if 0 /** @todo hdaStreamChannelAdvance is unused */
 static int hdaStreamChannelAdvance(PPDMAUDIOSTREAMCHANNEL pChan, size_t cbAdv)
 {
@@ -1952 +1963 @@
     return VINF_SUCCESS;
 }
+#endif
 
 static int hdaStreamChannelDataInit(PPDMAUDIOSTREAMCHANNELDATA pChanData, uint32_t fFlags)
@@ -1983 +1995 @@
 }
 
+#if defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND)
+
 static int hdaStreamChannelAcquireData(PPDMAUDIOSTREAMCHANNELDATA pChanData, void *pvData, size_t *pcbData)
 {
@@ -2003 +2017 @@
 }
 
+#endif /* defined(VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT) || defined(VBOX_WITH_HDA_51_SURROUND) */
+
+# if 0 /* currently unused */
 static int hdaStreamWaitForStateChange(PHDASTREAM pStream, RTMSINTERVAL msTimeout)
 {
@@ -2010 +2027 @@
     return RTSemEventWait(pStream->State.hStateChangedEvent, msTimeout);
 }
+# endif /* currently unused */
+
 #endif /* IN_RING3 */
 
@@ -2203 +2222 @@
 }
 
+#if 0 /** @todo hdaRegReadSSYNC &  hdaRegWriteSSYNC are unused */
+
 static int hdaRegReadSSYNC(PHDASTATE pThis, uint32_t iReg, uint32_t *pu32Value)
 {
@@ -2218 +2239 @@
     return hdaRegWriteU32(pThis, iReg, u32Value);
 }
+
+#endif /* unused */
 
 static int hdaRegWriteCORBRP(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
@@ -2489 +2512 @@
 }
 
+#if 0 /** @todo hdaRegWriteSDFIFOW & hdaRegWriteSDFIFOS are unused */
 static int hdaRegWriteSDFIFOW(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
 {
@@ -2573 +2597 @@
     return VINF_SUCCESS;
 }
+
+#endif /* unused */
 
 #ifdef IN_RING3