Author: janderwald
Date: Fri Aug 7 12:16:25 2009
New Revision: 42460
URL: http://svn.reactos.org/svn/reactos?rev=42460&view=rev
Log:
- Remove hack of starting stream automatically when first IRP has arrived
Modified:
trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c
trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c
trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c
trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c?rev=42460&r1=42459&r2=42460&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Fri
Aug 7 12:16:25 2009
@@ -946,12 +946,7 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue));
- SetStreamState(This, KSSTATE_RUN);
- }
+ StatusBlock->Status = STATUS_PENDING;
return TRUE;
}
@@ -1004,13 +999,7 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- SetStreamState(This, KSSTATE_RUN);
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings Status %x\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status);
- }
-
+ StatusBlock->Status = STATUS_PENDING;
return TRUE;
}
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c?rev=42460&r1=42459&r2=42460&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c
[iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c
[iso-8859-1] Fri Aug 7 12:16:25 2009
@@ -949,14 +949,8 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue));
-
- This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN);
- This->State = KSSTATE_RUN;
- }
+ StatusBlock->Status = STATUS_PENDING;
+
return TRUE;
}
@@ -994,13 +988,6 @@
if (!NT_SUCCESS(Status))
return FALSE;
-
- if (This->State != KSSTATE_RUN)
- {
- SetStreamState(This, KSSTATE_RUN);
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings Status %x\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status);
- }
StatusBlock->Status = STATUS_PENDING;
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c?rev=42460&r1=42459&r2=42460&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1]
Fri Aug 7 12:16:25 2009
@@ -888,14 +888,8 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue));
-
- This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN);
- This->State = KSSTATE_RUN;
- }
+ /* set pending status as result */
+ StatusBlock->Status = STATUS_PENDING;
return TRUE;
}
@@ -948,12 +942,7 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- SetStreamState(This, KSSTATE_RUN);
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings Status %x\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status);
- }
+ StatusBlock->Status = STATUS_PENDING;
if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue))
{
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c?rev=42460&r1=42459&r2=42460&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1]
Fri Aug 7 12:16:25 2009
@@ -878,14 +878,7 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue));
-
- This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN);
- This->State = KSSTATE_RUN;
- }
+ StatusBlock->Status = STATUS_PENDING;
return TRUE;
}
@@ -938,13 +931,7 @@
if (!NT_SUCCESS(Status))
return FALSE;
- if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE
&& This->State != KSSTATE_RUN)
- {
- SetStreamState(This, KSSTATE_RUN);
- /* some should initiate a state request but didnt do it */
- DPRINT1("Starting stream with %lu mappings Status %x\n",
This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status);
- }
-
+ StatusBlock->Status = STATUS_PENDING;
return TRUE;
}
