1 files changed, 20 insertions, 20 deletions

diff --git a/audio/sysvad/EndpointsCommon/minwavertstream.cpp b/audio/sysvad/EndpointsCommon/minwavertstream.cpp
index e5dad74f..9ea47c56 100644
--- a/audio/sysvad/EndpointsCommon/minwavertstream.cpp
+++ b/audio/sysvad/EndpointsCommon/minwavertstream.cpp
@@ -252,10 +252,10 @@ Return Value:
     m_dwLoopbackCaptureToneInitialPhase = 0; 
 
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
     m_SidebandOpen = FALSE;
     m_SidebandStarted = FALSE;
-#endif  // defined(SYSVAD_BTH_BYPASS)
+#endif  // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
     m_pPortStream = PortStream_;
     InitializeListHead(&m_NotificationList);
@@ -843,13 +843,13 @@ NTSTATUS CMiniportWaveRTStream::GetPosition
 {
     NTSTATUS ntStatus;
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
     if (m_SidebandStarted)
     {
         ntStatus = GetSidebandStreamNtStatus();
         IF_FAILED_JUMP(ntStatus, Done);
     }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
     // Return failure if this is the keyword detector pin
     if (m_pMiniport->IsKeywordDetectorPin(m_ulPin))
@@ -876,9 +876,9 @@ NTSTATUS CMiniportWaveRTStream::GetPosition
 
     ntStatus = STATUS_SUCCESS;
     
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 Done:
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
     return ntStatus;
 }
 
@@ -1178,7 +1178,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
             if (m_KsState == KSSTATE_ACQUIRE)
             {
                 // Acquire stream resources
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
                 if (m_SidebandOpen)
                 {
                     PSIDEBANDDEVICECOMMON sidebandDevice;
@@ -1198,7 +1198,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
 
                     m_SidebandOpen = FALSE;
                 }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
             }
             KeAcquireSpinLock(&m_PositionSpinLock, &oldIrql);
             // Reset DMA
@@ -1228,7 +1228,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
             if (m_KsState == KSSTATE_STOP)
             {
                 // Acquire stream resources
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
                 if (m_pMiniport->IsSidebandDevice())
                 {
                     if (m_SidebandOpen == FALSE)
@@ -1250,7 +1250,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
                         m_SidebandOpen = TRUE;
                     }
                 }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
             }
             break;
             
@@ -1288,7 +1288,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
                     }
                 }
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
                 if (m_SidebandStarted)
                 {
                     PSIDEBANDDEVICECOMMON sidebandDevice;
@@ -1308,7 +1308,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
 
                     m_SidebandStarted = FALSE;
                 }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
             }
             // This call updates the linear buffer and presentation positions.
@@ -1317,7 +1317,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
 
         case KSSTATE_RUN:
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
             if (m_pMiniport->IsSidebandDevice())
             {
                 if (m_SidebandStarted == FALSE)
@@ -1339,7 +1339,7 @@ NTSTATUS CMiniportWaveRTStream::SetState
                     m_SidebandStarted = TRUE;
                 }
             }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
             // Start DMA
             LARGE_INTEGER ullPerfCounterTemp;
@@ -1371,9 +1371,9 @@ NTSTATUS CMiniportWaveRTStream::SetState
 
     m_KsState = State_;
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 Done:
-#endif  // defined(SYSVAD_BTH_BYPASS)
+#endif  // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
     return ntStatus;
 }
 
@@ -1649,7 +1649,7 @@ Return Value:
     return ntStatus;
 } // SetContentId
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
 //=============================================================================
 #pragma code_seg()
@@ -1687,7 +1687,7 @@ Return Value:
 
     return ntStatus;        
 }
-#endif // defined(SYSVAD_BTH_BYPASS)
+#endif // defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
 //=============================================================================
 #pragma code_seg("PAGE")
@@ -1788,7 +1788,7 @@ TimerNotifyRT
         _this->m_llPacketCounter++;
     }
 
-#if defined(SYSVAD_BTH_BYPASS)
+#if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
     if (_this->m_SidebandStarted)
     {
         if (!NT_SUCCESS(_this->GetSidebandStreamNtStatus()))
@@ -1796,7 +1796,7 @@ TimerNotifyRT
             goto End;
         }
     }
-#endif  //defined(SYSVAD_BTH_BYPASS)
+#endif  //defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND)
 
     _this->m_pMiniport->DpcRoutine(qpc.QuadPart, qpcFrequency.QuadPart);