Merge pull request #231 from microsoft/ManagingContinuousReader

Moving Start and Stop of Continuous Reader to Run / Pause of Stream
microsoft · Feb 12, 2024 · 04b12d7 · 04b12d7
2 parents 358391f + 1196711
commit 04b12d7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/src/api/Drivers/USBMIDI2/Driver/Device.cpp b/src/api/Drivers/USBMIDI2/Driver/Device.cpp
@@ -413,23 +413,6 @@ EvtDeviceD0Entry(
 
     TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Entry");
 
-    devCtx = GetDeviceContext(Device);
-    ASSERT(devCtx != nullptr);
-
-    if (devCtx->MidiInPipe)
-    {
-        status = WdfIoTargetStart(WdfUsbTargetPipeGetIoTarget(devCtx->MidiInPipe));
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR, TRACE_DEVICE,
-                "%!FUNC! Could not start interrupt pipe failed %!STATUS!", status);
-        }
-    }
-    else
-    {
-        TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DEVICE,
-            "%!FUNC! Could not start interrupt pipe as no MidiInPipe");
-    }
 
     TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Exit");
 
@@ -490,14 +473,6 @@ EvtDeviceD0Exit(
         }
     }
 
-    if (devCtx->MidiInPipe)
-    {
-        WdfIoTargetStop(
-            WdfUsbTargetPipeGetIoTarget(devCtx->MidiInPipe),
-            WdfIoTargetCancelSentIo
-        );
-    }
-
     TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Exit");
 
     return status;

diff --git a/src/api/Drivers/USBMIDI2/Driver/StreamEngine.cpp b/src/api/Drivers/USBMIDI2/Driver/StreamEngine.cpp
@@ -508,6 +508,20 @@ StreamEngine::Pause()
     }
     else
     {
+        // Stop the continuous reader
+        WDFDEVICE devCtx = AcxCircuitGetWdfDevice(AcxPinGetCircuit(m_Pin));
+        PDEVICE_CONTEXT pDevCtx = GetDeviceContext(devCtx);
+
+        if (pDevCtx)
+        {
+            WdfIoTargetStop(WdfUsbTargetPipeGetIoTarget(pDevCtx->MidiInPipe), WdfIoTargetCancelSentIo);
+        }
+        else
+        {
+            TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DEVICE,
+                "%!FUNC! Could not start interrupt pipe as no MidiInPipe");
+        }
+
         // If g_MidiInStreamEngine is available, the midi out worker thread will loopback.
         // If it isn't available, the midi out worker will throw the data away.
         // So when we transition midi in from run to paused, acquire the lock that
@@ -587,6 +601,25 @@ StreamEngine::Run()
         auto lock = g_MidiInLock->acquire();
 //        pDevCtx->pMidiStreamEngine = this;
         g_MidiInStreamEngine = this;
+
+        // Start the Continuous reader
+        WDFDEVICE devCtx = AcxCircuitGetWdfDevice(AcxPinGetCircuit(m_Pin));
+        PDEVICE_CONTEXT pDevCtx = GetDeviceContext(devCtx);
+
+        if (pDevCtx)
+        {
+            status = WdfIoTargetStart(WdfUsbTargetPipeGetIoTarget(pDevCtx->MidiInPipe));
+            if (!NT_SUCCESS(status))
+            {
+                TraceEvents(TRACE_LEVEL_ERROR, TRACE_DEVICE,
+                    "%!FUNC! Could not start interrupt pipe failed %!STATUS!", status);
+            }
+        }
+        else
+        {
+            TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DEVICE,
+                "%!FUNC! Could not start interrupt pipe as no MidiInPipe");
+        }
     }
 
     //