Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:22:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Return status code if releasing the mapping has succeeded

Browse source 
- Fix calculation of number of tags to be allocate per irp
- Fix multiple bugs when acquiring the mapping and releasing the mapping
- Vortex AU8810 WDM is now starting to play

svn path=/trunk/; revision=40805
This commit is contained in:
Johannes Anderwald 2009-05-05 23:41:59 +00:00
parent c26be6ccf9
commit bc49f505ef
5 changed files with 175 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/wdm/audio/backpln/portcls/interfaces.h
View file

@ -227,7 +227,7 @@ DECLARE_INTERFACE_(IIrpQueue, IUnknown)
OUT PULONG ByteCount, OUT PULONG ByteCount,
OUT PULONG Flags); OUT PULONG Flags);
STDMETHOD_(VOID, ReleaseMappingWithTag)(THIS_ STDMETHOD_(NTSTATUS, ReleaseMappingWithTag)(THIS_
IN PVOID Tag); IN PVOID Tag);
STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); STDMETHOD_(BOOL, HasLastMappingFailed)(THIS);
@ -518,7 +518,7 @@ DECLARE_INTERFACE_(IPortPinWaveRT, IIrpTarget)
IN PDEVICE_OBJECT DeviceObject) PURE; IN PDEVICE_OBJECT DeviceObject) PURE;
}; };
typedef IPortPinWavePci *PPORTPINWAVERT; typedef IPortPinWaveRT *PPORTPINWAVERT;
#endif #endif

204
reactos/drivers/wdm/audio/backpln/portcls/irpstream.c
View file

@ -56,6 +56,11 @@ FreeMappingRoutine(
IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT);
} }
if (CurMapping->Tag)
{
FreeItem(CurMapping->Tag, TAG_PORTCLASS);
}
ExFreePool(CurMapping->Header->Data); ExFreePool(CurMapping->Header->Data);
ExFreePool(CurMapping->Header); ExFreePool(CurMapping->Header);
@ -152,14 +157,28 @@ IIrpQueue_fnAddMapping(
if (This->MaxFrameSize) if (This->MaxFrameSize)
{ {
Mapping->NumTags = max((Mapping->Header->DataUsed / This->MaxFrameSize) + 1, 1); if (This->MaxFrameSize > Mapping->Header->DataUsed)
{
/* small mapping */
Mapping->NumTags = 1;
}
else
{
ULONG Rest = Mapping->Header->DataUsed % This->MaxFrameSize;
Mapping->NumTags = Mapping->Header->DataUsed / This->MaxFrameSize;
if (Rest)
{
Mapping->NumTags++;
}
}
Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS);
Mapping->ReferenceCount = Mapping->NumTags; Mapping->ReferenceCount = Mapping->NumTags;
} }
This->NumDataAvailable += Mapping->Header->DataUsed; This->NumDataAvailable += Mapping->Header->DataUsed;
DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p ReferenceCount %u FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->ReferenceCount, This->MaxFrameSize);
ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock);
(void)InterlockedIncrement((volatile long*)&This->NumMappings); (void)InterlockedIncrement((volatile long*)&This->NumMappings);
@ -299,6 +318,59 @@ IIrpQueue_fnUpdateFormat(
} }
VOID
GetMapping(
IIrpQueueImpl * This,
IN ULONG Index,
IN PVOID Tag,
IN PIRP_MAPPING CurMapping,
OUT PPHYSICAL_ADDRESS PhysicalAddress,
OUT PVOID *VirtualAddress,
OUT PULONG ByteCount,
OUT PULONG Flags)
{
ULONG Offset;
/* store the tag */
This->LastTag = Tag;
/* calculate the offset */
if (Index)
Offset = (Index + 1) * This->MaxFrameSize;
else
Offset = 0;
ASSERT(CurMapping->Header->DataUsed > Offset);
*VirtualAddress = (PUCHAR)CurMapping->Header->Data + Offset;
*PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress);
/* FIXME alignment */
*ByteCount = min(CurMapping->Header->DataUsed - Offset, This->MaxFrameSize);
/* reset out of mapping indicator */
This->OutOfMapping = FALSE;
/* decrement available byte counter */
This->NumDataAvailable -= *ByteCount;
/* store the tag */
if (Index)
CurMapping->Tag[Index+1] = Tag;
else
CurMapping->Tag[Index] = Tag;
if (Index + 1 == CurMapping->NumTags - 1)
{
/* indicate end of packet */
*Flags = 1;
}
DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p NumTags %u ReferenceCount %u\n", Tag, CurMapping, CurMapping->NumTags, CurMapping->ReferenceCount);
}
NTSTATUS NTSTATUS
NTAPI NTAPI
IIrpQueue_fnGetMappingWithTag( IIrpQueue_fnGetMappingWithTag(
@ -310,14 +382,12 @@ IIrpQueue_fnGetMappingWithTag(
OUT PULONG Flags) OUT PULONG Flags)
{ {
PIRP_MAPPING CurMapping; PIRP_MAPPING CurMapping;
PIRP_MAPPING Result;
PLIST_ENTRY CurEntry; PLIST_ENTRY CurEntry;
ULONG Index; ULONG Index;
ULONG Offset;
IIrpQueueImpl * This = (IIrpQueueImpl*)iface; IIrpQueueImpl * This = (IIrpQueueImpl*)iface;
*Flags = 0; *Flags = 0;
Result = NULL; ASSERT(This->MaxFrameSize);
KeAcquireSpinLockAtDpcLevel(&This->Lock); KeAcquireSpinLockAtDpcLevel(&This->Lock);
@ -326,60 +396,61 @@ IIrpQueue_fnGetMappingWithTag(
{ {
KeReleaseSpinLockFromDpcLevel(&This->Lock); KeReleaseSpinLockFromDpcLevel(&This->Lock);
This->OutOfMapping = TRUE; This->OutOfMapping = TRUE;
This->StartStream = FALSE;
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
while (CurEntry != &This->ListHead) while (CurEntry != &This->ListHead)
{ {
CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry);
for(Index = 0; Index < CurMapping->NumTags; Index++) for(Index = 0; Index < CurMapping->NumTags; Index++)
{ {
/* first stream mapping */
if (This->LastTag == NULL)
{
ASSERT(Index == 0);
GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags);
KeReleaseSpinLockFromDpcLevel(&This->Lock);
return STATUS_SUCCESS;
}
if (CurMapping->Tag[Index] == This->LastTag) if (CurMapping->Tag[Index] == This->LastTag)
{ {
ASSERT(Index);
if (Index + 1 < CurMapping->NumTags) if (Index + 1 < CurMapping->NumTags)
{ {
CurMapping->Tag[Index+1] = Tag; /* found a free mapping within audio irp */
Result = CurMapping; GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags);
KeReleaseSpinLockFromDpcLevel(&This->Lock);
if (Index + 1 == CurMapping->NumTags - 1) return STATUS_SUCCESS;
{
/* indicate end of packet */
*Flags = 1;
}
Offset = (Index + 1) * This->MaxFrameSize;
ASSERT(Result->Header->DataUsed > Offset);
*VirtualAddress = (PUCHAR)Result->Header->Data + Offset;
*PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress);
*ByteCount = min(Result->Header->DataUsed - Offset, This->MaxFrameSize);
break;
} }
/* last tag was at at last mapping, iterate to next audio irp */
CurEntry = CurEntry->Flink; CurEntry = CurEntry->Flink;
if (&This->ListHead == CurEntry) if (&This->ListHead == CurEntry)
{ {
/* no more items available */
This->OutOfMapping = TRUE; This->OutOfMapping = TRUE;
This->StartStream = FALSE;
KeReleaseSpinLockFromDpcLevel(&This->Lock); KeReleaseSpinLockFromDpcLevel(&This->Lock);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
Result = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry);
Result->Tag[0] = Tag; CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry);
*VirtualAddress = (PUCHAR)Result->Header->Data; GetMapping(This, 0, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags);
*PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); KeReleaseSpinLockFromDpcLevel(&This->Lock);
*ByteCount = min(Result->Header->DataUsed, This->MaxFrameSize); return STATUS_SUCCESS;
break;
} }
} }
CurEntry = CurEntry->Flink; CurEntry = CurEntry->Flink;
} }
KeReleaseSpinLockFromDpcLevel(&This->Lock); KeReleaseSpinLockFromDpcLevel(&This->Lock);
This->LastTag = Tag; This->OutOfMapping = TRUE;
This->OutOfMapping = FALSE; This->StartStream = FALSE;
return STATUS_SUCCESS; return STATUS_UNSUCCESSFUL;
} }
VOID NTSTATUS
NTAPI NTAPI
IIrpQueue_fnReleaseMappingWithTag( IIrpQueue_fnReleaseMappingWithTag(
IN IIrpQueue *iface, IN IIrpQueue *iface,
@ -388,40 +459,55 @@ IIrpQueue_fnReleaseMappingWithTag(
PIRP_MAPPING CurMapping; PIRP_MAPPING CurMapping;
PLIST_ENTRY CurEntry; PLIST_ENTRY CurEntry;
ULONG Index; ULONG Index;
ULONG Found;
IIrpQueueImpl * This = (IIrpQueueImpl*)iface; IIrpQueueImpl * This = (IIrpQueueImpl*)iface;
KeAcquireSpinLockAtDpcLevel(&This->Lock); ASSERT(This->MaxFrameSize);
CurEntry = This->ListHead.Flink;
while (CurEntry != &This->ListHead) DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag);
CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock);
if (!CurEntry)
{ {
CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); DPRINT("Empty List while releasing mapping!\n");
for(Index = 0; Index < CurMapping->NumTags; Index++) return STATUS_UNSUCCESSFUL;
{
if (CurMapping->Tag[Index] == Tag)
{
CurMapping->ReferenceCount--;
if (!CurMapping->ReferenceCount)
{
RemoveEntryList(&CurMapping->Entry);
if (CurMapping->Irp)
{
CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent;
CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS;
IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT);
}
ExFreePool(CurMapping->Header->Data);
ExFreePool(CurMapping->Header);
ExFreePool(CurMapping->Tag);
ExFreePool(CurMapping);
}
break;
}
}
CurEntry = CurEntry->Flink;
} }
KeReleaseSpinLockFromDpcLevel(&This->Lock); CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry);
Found = FALSE;
for(Index = 0; Index < CurMapping->NumTags; Index++)
{
if (CurMapping->Tag[Index] == Tag)
{
CurMapping->Tag[Index] = NULL;
InterlockedDecrement((PLONG)&CurMapping->ReferenceCount);
Found = TRUE;
break;
}
}
if (!Found)
{
DPRINT("Tag %p not in first mapping %p\n", Tag, CurMapping);
ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock);
return STATUS_UNSUCCESSFUL;
}
if (!CurMapping->ReferenceCount)
{
DPRINT("Freeing mapping %p\n", CurMapping);
InterlockedDecrement(&This->NumMappings);
FreeMappingRoutine(CurMapping);
}
else
{
/* insert item back into list as it still has references */
ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock);
}
return STATUS_SUCCESS;
} }
BOOL BOOL

4
reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c
View file

@ -202,9 +202,7 @@ IServiceSink_fnRequestService(
ASSERT_IRQL(DISPATCH_LEVEL); ASSERT_IRQL(DISPATCH_LEVEL);
Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position);
DPRINT("Position %ull Status %x\n", Position, Status); DPRINT("Position %llu Status %x\n", Position, Status);
This->Stream->lpVtbl->Service(This->Stream);
} }
static IServiceSinkVtbl vt_IServiceSink = static IServiceSinkVtbl vt_IServiceSink =

12
reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c
View file

@ -86,12 +86,9 @@ IPortWavePciStream_fnGetMapping(
OUT PULONG Flags) OUT PULONG Flags)
{ {
IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface;
NTSTATUS Status;
ASSERT_IRQL(DISPATCH_LEVEL);
Status = This->Queue->lpVtbl->GetMappingWithTag(This->Queue, Tag, PhysicalAddress, VirtualAddress, ByteCount, Flags);
DPRINT("IPortWavePciStream_fnGetMapping Tag %p Status %x\n", Tag, Status); ASSERT_IRQL(DISPATCH_LEVEL);
return Status; return This->Queue->lpVtbl->GetMappingWithTag(This->Queue, Tag, PhysicalAddress, VirtualAddress, ByteCount, Flags);
} }
static static
@ -104,9 +101,7 @@ IPortWavePciStream_fnReleaseMapping(
IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface;
ASSERT_IRQL(DISPATCH_LEVEL); ASSERT_IRQL(DISPATCH_LEVEL);
DPRINT("IPortWavePciStream_fnReleaseMapping Tag %p\n", Tag); return This->Queue->lpVtbl->ReleaseMappingWithTag(This->Queue, Tag);
This->Queue->lpVtbl->ReleaseMappingWithTag(This->Queue, Tag);
return STATUS_SUCCESS;
} }
static static
@ -117,7 +112,6 @@ IPortWavePciStream_fnTerminatePacket(
{ {
UNIMPLEMENTED UNIMPLEMENTED
ASSERT_IRQL(DISPATCH_LEVEL); ASSERT_IRQL(DISPATCH_LEVEL);
DPRINT("IPortWavePciStream_fnTerminatePacket\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

43
reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
View file

@ -3,6 +3,7 @@
<module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" entrypoint="0"> <module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" entrypoint="0">
<importlibrary definition="portcls.spec" /> <importlibrary definition="portcls.spec" />
<define name="PC_NO_IMPORTS" /> <define name="PC_NO_IMPORTS" />
<redefine name="_WIN32_WINNT">0x600</redefine>
<include base="portcls">../include</include> <include base="portcls">../include</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>ks</library> <library>ks</library>
@ -10,39 +11,43 @@
<library>rtl</library> <library>rtl</library>
<library>hal</library> <library>hal</library>
<library>libcntpr</library> <library>libcntpr</library>
<file>adapter.c</file>
<file>api.c</file> <file>api.c</file>
<file>connection.c</file> <file>connection.c</file>
<file>dispatcher.c</file> <file>dispatcher.c</file>
<file>dll.c</file> <file>dll.c</file>
<file>dma_slave.c</file> <file>dma_slave.c</file>
<file>drm.c</file>
<file>drm_port.c</file> <file>drm_port.c</file>
<file>adapter.c</file>
<file>filter_wavecyclic.c</file> <file>filter_wavecyclic.c</file>
<file>filter_wavepci.c</file> <file>filter_wavepci.c</file>
<file>filter_wavert.c</file>
<file>guids.c</file> <file>guids.c</file>
<file>interrupt.c</file>
<file>irp.c</file> <file>irp.c</file>
<file>irpstream.c</file> <file>irpstream.c</file>
<file>interrupt.c</file>
<file>drm.c</file>
<file>undoc.c</file>
<file>resource.c</file>
<file>registry.c</file>
<file>service_group.c</file>
<file>pin_wavecyclic.c</file>
<file>pin_wavepci.c</file>
<file>pool.c</file>
<file>port.c</file>
<file>power.c</file>
<file>port_dmus.c</file>
<file>port_midi.c</file>
<file>port_topology.c</file>
<file>port_wavepci.c</file>
<file>port_wavecyclic.c</file>
<file>port_wavepcistream.c</file>
<file>propertyhandler.c</file>
<file>miniport.c</file> <file>miniport.c</file>
<file>miniport_dmus.c</file> <file>miniport_dmus.c</file>
<file>miniport_fmsynth.c</file> <file>miniport_fmsynth.c</file>
<file>pin_wavecyclic.c</file>
<file>pin_wavepci.c</file>
<file>pin_wavert.c</file>
<file>pool.c</file>
<file>port.c</file>
<file>port_dmus.c</file>
<file>port_midi.c</file>
<file>port_topology.c</file>
<file>port_wavecyclic.c</file>
<file>port_wavepci.c</file>
<file>port_wavepcistream.c</file>
<file>port_wavert.c</file>
<file>port_wavertstream.c</file>
<file>power.c</file>
<file>propertyhandler.c</file>
<file>registry.c</file>
<file>resource.c</file>
<file>service_group.c</file>
<file>undoc.c</file>
<file>version.c</file> <file>version.c</file>
<file>portcls.rc</file> <file>portcls.rc</file>
</module> </module>