Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38600: -Rob Shearman <robertshearman at gmail.com> Sun Nov 30 2008 widl: Output the correct buffer size required for parameters whose sizes are known at type-generation time.
by cwittich＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: cwittich Date: Tue Jan 6 00:41:21 2009 New Revision: 38600 URL: http://svn.reactos.org/svn/reactos?rev=38600&view=rev Log: -Rob Shearman <robertshearman at gmail.com> Sun Nov 30 2008 widl: Output the correct buffer size required for parameters whose sizes are known at type-generation time. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Tue Jan 6 00:41:21 2009 @@ -2510,19 +2510,7 @@ return 0; case RPC_FC_STRUCT: - case RPC_FC_PSTRUCT: - { - size_t size = 0; - const var_t *field; - if (!type->fields_or_args) return 0; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int alignment; - size += get_required_buffer_size_type(field->type, field->name, - &alignment); - } - return size; - } + return fields_memsize(type->fields_or_args, alignment); case RPC_FC_RP: return @@ -2544,75 +2532,26 @@ { int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); - const type_t *t; if (!in_attr && !out_attr) in_attr = 1; *alignment = 0; - for (t = var->type; is_ptr(t); t = t->ref) - if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) + if ((pass == PASS_IN && in_attr) || (pass == PASS_OUT && out_attr) || + pass == PASS_RETURN) + { + if (is_ptrchain_attr(var, ATTR_CONTEXTHANDLE)) { *alignment = 4; return 20; } - if (pass == PASS_OUT) - { - if (out_attr && is_ptr(var->type)) - { - type_t *type = var->type; - - if (type->type == RPC_FC_STRUCT) - { - const var_t *field; - unsigned int size = 36; - - if (!type->fields_or_args) return size; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int align; - size += get_required_buffer_size_type( - field->type, field->name, &align); - } - return size; - } - } - return 0; - } - else - { - if ((!out_attr || in_attr) && !var->type->size_is - && !is_attr(var->attrs, ATTR_STRING) && !var->type->declarray) - { - if (is_ptr(var->type)) - { - type_t *type = var->type; - - if (is_base_type(type->type)) - { - return 25; - } - else if (type->type == RPC_FC_STRUCT) - { - unsigned int size = 36; - const var_t *field; - - if (!type->fields_or_args) return size; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int align; - size += get_required_buffer_size_type( - field->type, field->name, &align); - } - return size; - } - } - } - - return get_required_buffer_size_type(var->type, var->name, alignment); - } + if (!is_string_type(var->attrs, var->type)) + return get_required_buffer_size_type(var->type, var->name, + alignment); + } + return 0; } static unsigned int get_function_buffer_size( const func_t *func, enum pass pass )

1 0

[cwittich] 38599: -Dmitry Timoshkov <dmitry <at> codeweavers.com> Mon Nov 10 2008 widl: Make the generated string pointers const as well. -Alexandre Julliard <julliard <at> winehq.org> Tue Nov 25 2008 widl: Make sure format strings for structure and union types are only output once.
by cwittich＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: cwittich Date: Tue Jan 6 00:16:55 2009 New Revision: 38599 URL: http://svn.reactos.org/svn/reactos?rev=38599&view=rev Log: -Dmitry Timoshkov <dmitry <at> codeweavers.com> Mon Nov 10 2008 widl: Make the generated string pointers const as well. -Alexandre Julliard <julliard <at> winehq.org> Tue Nov 25 2008 widl: Make sure format strings for structure and union types are only output once. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Tue Jan 6 00:16:55 2009 @@ -1866,8 +1866,9 @@ nothing is written to file yet. On the actual writing pass, this will have been updated. */ unsigned int absoff = type->ptrdesc ? type->ptrdesc : *tfsoff; - short reloff = absoff - *tfsoff; - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + int reloff = absoff - *tfsoff; + assert( reloff >= 0 ); + print_file(file, 2, "NdrFcShort(0x%x),\t/* Offset= %d (%u) */\n", reloff, reloff, absoff); *tfsoff += 2; } @@ -2255,6 +2256,8 @@ /* basic types don't need a type format string */ if (is_base_type(type->type)) return 0; + + if (processed(type)) return type->typestring_offset; switch (type->type) { @@ -3351,7 +3354,7 @@ const char *p; /* this should be an array of RPC_PROTSEQ_ENDPOINT but we want const strings */ - print_file( f, 0, "static const unsigned char * %s__RpcProtseqEndpoint[][2] =\n{\n", prefix ); + print_file( f, 0, "static const unsigned char * const %s__RpcProtseqEndpoint[][2] =\n{\n", prefix ); LIST_FOR_EACH_ENTRY( endpoint, list, const struct str_list_entry_t, entry ) { print_file( f, 1, "{ (const unsigned char *)\"" );

1 0

[janderwald] 38598: - Remove dma_master.c as it is unused - Implement PcNewDmaChannel - partly implement IDmaChannel / IDmaChannelSlave
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 23:33:34 2009 New Revision: 38598 URL: http://svn.reactos.org/svn/reactos?rev=38598&view=rev Log: - Remove dma_master.c as it is unused - Implement PcNewDmaChannel - partly implement IDmaChannel / IDmaChannelSlave Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c (removed) @@ -1,198 +1,0 @@ -#include "private.h" - - -typedef struct -{ - IDmaChannelSlaveVtbl *lpVtbl; - - LONG ref; - ULONG BufferSize; - PHYSICAL_ADDRESS Address; - -}IDmaChannelImpl; - - -/* - Basic IUnknown methods -*/ - - NTSTATUS - STDMETHODCALLTYPE - IDmaChannel_fnQueryInterface( - IDmaChannel* iface, - IN REFIID refiid, - OUT PVOID* Output) - { - /* TODO */ - return STATUS_UNSUCCESSFUL; - } - -ULONG -STDMETHODCALLTYPE -IDmaChannel_fnAddRef( - IDmaChannel* iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_AddRef: This %p\n", This); - - return _InterlockedIncrement(&This->ref); -} - -ULONG -STDMETHODCALLTYPE -IDmaChannel_fnRelease( - IDmaChannel* iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - _InterlockedDecrement(&This->ref); - - DPRINT("IDmaChannel_Release: This %p new ref %u\n", This, This->ref); - - if (This->ref == 0) - { - ExFreePoolWithTag(This, TAG_PORTCLASS); - return 0; - } - /* Return new reference count */ - return This->ref; -} - - - -NTSTATUS -NTAPI -IDmaChannel_fnAllocateBuffer( - IN IDmaChannel * iface, - IN ULONG BufferSize, - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_AllocateBuffer: This %p BufferSize %u\n", This, BufferSize); - - /* Did the caller already allocate a buffer ?*/ - if (This->BufferSize) return STATUS_UNSUCCESSFUL; - - /* FIXME */ - //This->BufferSize = BufferSize; - - return STATUS_UNSUCCESSFUL; -} - -ULONG -NTAPI -IDmaChannel_fnAllocatedBufferSize( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_AllocatedBufferSize: This %p BufferSize %u\n", This, This->BufferSize); - return This->BufferSize; -} - -VOID -NTAPI -IDmaChannel_fnCopyFrom( - IN IDmaChannel * iface, - IN PVOID Destination, - IN PVOID Source, - IN ULONG ByteCount - ) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_CopyFrom: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); -} - -VOID -NTAPI -IDmaChannel_fnCopyTo( - IN IDmaChannel * iface, - IN PVOID Destination, - IN PVOID Source, - IN ULONG ByteCount - ) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_CopyTo: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); -} - -VOID -NTAPI -IDmaChannel_fnFreeBuffer( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_FreeBuffer: This %p\n", This); -} - -PADAPTER_OBJECT -NTAPI -IDmaChannel_fnGetAdapterObject( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_GetAdapterObject: This %p\n", This); - return NULL; -} - -ULONG -NTAPI -IDmaChannel_fnMaximumBufferSize( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_MaximumBufferSize: This %p\n", This); - return 0; -} - -PHYSICAL_ADDRESS -NTAPI -IDmaChannel_fnPhysicalAdress( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_PhysicalAdress: This %p\n", This); - return This->Address; -} - -VOID -NTAPI -IDmaChannel_fnSetBufferSize( - IN IDmaChannel * iface, - IN ULONG BufferSize) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_SetBufferSize: This %p\n", This); - -} - -PVOID -NTAPI -IDmaChannel_fnSystemAddress( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_SystemAddress: This %p\n", This); - return NULL; -} - -ULONG -NTAPI -IDmaChannel_fnTransferCount( - IN IDmaChannel * iface) -{ - IDmaChannelImpl * This = (IDmaChannelImpl*)iface; - - DPRINT("IDmaChannel_TransferCount: This %p\n", This); - return 0; -} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Mon Jan 5 23:33:34 2009 @@ -7,15 +7,30 @@ LONG ref; + + PDEVICE_OBJECT pDeviceObject; + PDMA_ADAPTER pAdapter; + + BOOL DmaStarted; + + ULONG MapSize; + PVOID MapRegisterBase; + + ULONG LastTransferCount; + + ULONG MaximumBufferSize; ULONG MaxMapRegisters; ULONG AllocatedBufferSize; ULONG BufferSize; - PDMA_ADAPTER pAdapter; + PHYSICAL_ADDRESS Address; PVOID Buffer; PMDL Mdl; + BOOLEAN WriteToDevice; }IDmaChannelSlaveImpl; + +const GUID IID_IDmaChannel; //--------------------------------------------------------------- @@ -30,7 +45,17 @@ IN REFIID refiid, OUT PVOID* Output) { - /* TODO */ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IUnknown) || + IsEqualGUIDAligned(refiid, &IID_IDmaChannel) || + IsEqualGUIDAligned(refiid, &IID_IDmaChannelSlave)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; } @@ -81,8 +106,6 @@ { IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; - DPRINT("IDmaChannelSlave_AllocateBuffer: This %p BufferSize %u\n", This, BufferSize); - /* Did the caller already allocate a buffer ?*/ if (This->Buffer) { @@ -90,16 +113,15 @@ return STATUS_UNSUCCESSFUL; } + //FIXME + // retry with different size on failure + This->Buffer = This->pAdapter->DmaOperations->AllocateCommonBuffer(This->pAdapter, BufferSize, &This->Address, TRUE); if (!This->Buffer) { DPRINT1("IDmaChannelSlave_AllocateBuffer fAllocateCommonBuffer failed \n"); return STATUS_UNSUCCESSFUL; } - - This->Mdl = IoAllocateMdl(This->Buffer, BufferSize, FALSE, FALSE, NULL); - if (This->Mdl) - MmBuildMdlForNonPagedPool(This->Mdl); This->BufferSize = BufferSize; This->AllocatedBufferSize = BufferSize; @@ -129,6 +151,8 @@ IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_CopyFrom: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); + + iface->lpVtbl->CopyTo(iface, Destination, Source, ByteCount); } VOID @@ -143,8 +167,9 @@ IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_CopyTo: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); -} - + RtlCopyMemory(Destination, Source, ByteCount); +} + VOID NTAPI IDmaChannelSlave_fnFreeBuffer( @@ -163,6 +188,13 @@ This->pAdapter->DmaOperations->FreeCommonBuffer(This->pAdapter, This->AllocatedBufferSize, This->Address, This->Buffer, TRUE); This->Buffer = NULL; This->AllocatedBufferSize = 0; + This->Address.QuadPart = 0LL; + + if (This->Mdl) + { + IoFreeMdl(This->Mdl); + This->Mdl = NULL; + } } PADAPTER_OBJECT @@ -184,7 +216,7 @@ IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_MaximumBufferSize: This %p\n", This); - return 0; + return This->MaximumBufferSize; } PHYSICAL_ADDRESS @@ -241,7 +273,7 @@ IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_TransferCount: This %p\n", This); - return 0; + return This->LastTransferCount; } ULONG @@ -249,11 +281,44 @@ IDmaChannelSlave_fnReadCounter( IN IDmaChannelSlave * iface) { - IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; - - DPRINT("IDmaChannelSlave_ReadCounter: This %p\n", This); - - return 0; + ULONG Counter; + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + Counter = This->pAdapter->DmaOperations->ReadDmaCounter(This->pAdapter); + + if (!This->DmaStarted || Counter >= This->LastTransferCount) //FIXME + Counter = 0; + + return Counter; +} + +IO_ALLOCATION_ACTION +NTAPI +AdapterControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context) +{ + ULONG Length; + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)Context; + + Length = This->MapSize; + This->MapRegisterBase = MapRegisterBase; + + This->pAdapter->DmaOperations->MapTransfer(This->pAdapter, + This->Mdl, + MapRegisterBase, + (PVOID)((ULONG_PTR)This->Mdl->StartVa + This->Mdl->ByteOffset), + &Length, + This->WriteToDevice); + + if (Length == This->BufferSize) + { + This->DmaStarted = TRUE; + } + + return KeepObject; } NTSTATUS @@ -263,10 +328,43 @@ ULONG MapSize, BOOLEAN WriteToDevice) { + NTSTATUS Status; + ULONG MapRegisters; + KIRQL OldIrql; IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_Start: This %p\n", This); - return 0; + + if (This->DmaStarted) + return STATUS_UNSUCCESSFUL; + + if (!This->Mdl) + { + This->Mdl = IoAllocateMdl(&This->Buffer, This->MaximumBufferSize, FALSE, FALSE, NULL); + if (!This->Mdl) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + MmBuildMdlForNonPagedPool(This->Mdl); + } + + This->MapSize = MapSize; + This->WriteToDevice = WriteToDevice; + This->LastTransferCount = MapSize; + + //FIXME + // synchronize access + // + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + MapRegisters = ADDRESS_AND_SIZE_TO_SPAN_PAGES(This->Buffer, MapSize); + Status = This->pAdapter->DmaOperations->AllocateAdapterChannel(This->pAdapter, This->pDeviceObject, MapRegisters, AdapterControl, (PVOID)This); + KeLowerIrql(OldIrql); + + if(!NT_SUCCESS(Status)) + This->LastTransferCount = 0; + + return Status; } NTSTATUS @@ -274,9 +372,29 @@ IDmaChannelSlave_fnStop( IN IDmaChannelSlave * iface) { + KIRQL OldIrql; IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; DPRINT("IDmaChannelSlave_fnStop: This %p\n", This); + + if (!This->DmaStarted) + return STATUS_SUCCESS; + + This->pAdapter->DmaOperations->FlushAdapterBuffers(This->pAdapter, + This->Mdl, + This->MapRegisterBase, + (PVOID)((ULONG_PTR)This->Mdl->StartVa + This->Mdl->ByteOffset), + This->MapSize, + This->WriteToDevice); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + This->pAdapter->DmaOperations->FreeAdapterChannel(This->pAdapter); + + KeLowerIrql(OldIrql); + + This->DmaStarted = FALSE; + return 0; } @@ -286,10 +404,40 @@ IN IDmaChannelSlave * iface, ULONG Timeout) { - IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; - - DPRINT("IDmaChannelSlave_WaitForTC: This %p\n", This); - return 0; + ULONG RetryCount; + ULONG BytesRemaining; + ULONG PrevBytesRemaining; + + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + BytesRemaining = This->pAdapter->DmaOperations->ReadDmaCounter(This->pAdapter); + if (!BytesRemaining) + { + return STATUS_SUCCESS; + } + + RetryCount = Timeout / 10; + PrevBytesRemaining = 0xFFFFFFFF; + do + { + BytesRemaining = This->pAdapter->DmaOperations->ReadDmaCounter(This->pAdapter); + + if (!BytesRemaining) + break; + + if (PrevBytesRemaining == BytesRemaining) + break; + + KeStallExecutionProcessor(10); + PrevBytesRemaining = BytesRemaining; + + }while(RetryCount-- >= 1); + + //FIXME + // return error code on timeout + // + + return STATUS_SUCCESS; } @@ -320,29 +468,56 @@ }; -NTSTATUS NewDmaChannelSlave( - IN PDEVICE_DESCRIPTION DeviceDesc, - IN PDMA_ADAPTER Adapter, - IN ULONG MapRegisters, - OUT PDMACHANNELSLAVE* DmaChannel) -{ +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcNewDmaChannel( + OUT PDMACHANNEL* OutDmaChannel, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PDEVICE_DESCRIPTION DeviceDescription, + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PDMA_ADAPTER Adapter; + ULONG MapRegisters; + INTERFACE_TYPE BusType; + ULONG ResultLength; + IDmaChannelSlaveImpl * This; - This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IDmaChannelSlaveImpl), TAG_PORTCLASS); + This = ExAllocatePoolWithTag(PoolType, sizeof(IDmaChannelSlaveImpl), TAG_PORTCLASS); if (!This) { - Adapter->DmaOperations->PutDmaAdapter(Adapter); return STATUS_INSUFFICIENT_RESOURCES; } + + Status = IoGetDeviceProperty(DeviceObject, DevicePropertyLegacyBusType, sizeof(BusType), (PVOID)&BusType, &ResultLength); + if (NT_SUCCESS(Status)) + { + DeviceDescription->InterfaceType = BusType; + } + + Adapter = IoGetDmaAdapter(DeviceObject, DeviceDescription, &MapRegisters); + if (!Adapter) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return STATUS_DEVICE_CONFIGURATION_ERROR; + } + RtlZeroMemory(This, sizeof(IDmaChannelSlaveImpl)); + This->ref = 1; This->lpVtbl = &vt_IDmaChannelSlaveVtbl; This->pAdapter = Adapter; + This->pDeviceObject = DeviceObject; + This->MaximumBufferSize = DeviceDescription->MaximumLength; This->MaxMapRegisters = MapRegisters; - *DmaChannel = (PVOID)(&This->lpVtbl); + + *OutDmaChannel = (PVOID)(&This->lpVtbl); return STATUS_SUCCESS; } - Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Mon Jan 5 23:33:34 2009 @@ -7,7 +7,6 @@ #if 0 IUnregisterSubdevice *lpVtblUnregisterSubDevice; - IPortClsVersionVtbl *lpVtblPortClsVersion; #endif LONG ref; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Jan 5 23:33:34 2009 @@ -9,9 +9,9 @@ <library>ks</library> <library>drmk</library> <library>rtl</library> + <library>hal</library> <file>api.c</file> <file>dll.c</file> - <file>dma_master.c</file> <file>dma_slave.c</file> <file>drm_port.c</file> <file>adapter.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Jan 5 23:33:34 2009 @@ -71,12 +71,6 @@ NTSTATUS NewPortWavePci( OUT PPORT* OutPort); -NTSTATUS NewDmaChannelSlave( - IN PDEVICE_DESCRIPTION DeviceDesc, - IN PDMA_ADAPTER Adapter, - IN ULONG MapRegisters, - OUT PDMACHANNELSLAVE* DmaChannel); - NTSTATUS NewIDrmPort( OUT PDRMPORT2 *OutPort); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Mon Jan 5 23:33:34 2009 @@ -16,17 +16,7 @@ Factory Stubs */ -NTSTATUS NTAPI -PcNewDmaChannel( - OUT PDMACHANNEL* OutDmaChannel, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN POOL_TYPE PoolType, - IN PDEVICE_DESCRIPTION DeviceDescription, - IN PDEVICE_OBJECT DeviceObject) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + /* =============================================================== Power Management

1 0

[janderwald] 38597: - Add IID_IDmaChannel guid
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 23:31:16 2009 New Revision: 38597 URL: http://svn.reactos.org/svn/reactos?rev=38597&view=rev Log: - Add IID_IDmaChannel guid Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Jan 5 23:31:16 2009 @@ -743,6 +743,8 @@ #undef INTERFACE #define INTERFACE IDmaChannel + +DEFINE_GUID(IID_IDmaChannel, 0x22C6AC61L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); DECLARE_INTERFACE_(IDmaChannel, IUnknown) {

1 0

[janderwald] 38596: - Fix build sorry
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 21:02:02 2009 New Revision: 38596 URL: http://svn.reactos.org/svn/reactos?rev=38596&view=rev Log: - Fix build sorry Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Jan 5 21:02:02 2009 @@ -741,6 +741,9 @@ IN PVOID Source, \ IN ULONG ByteCount); +#undef INTERFACE +#define INTERFACE IDmaChannel + DECLARE_INTERFACE_(IDmaChannel, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -782,6 +785,9 @@ #if (NTDDI_VERSION < NTDDI_LONGHORN) DEFINE_GUID(IID_IDmaChannelSlave, 0x22C6AC62L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); #endif + +#undef INTERFACE +#define INTERFACE IDmaChannelSlave DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) {

1 0

[janderwald] 38595: - Implement IPortWaveCyclic::NewMasterDmaChannel, IPortWaveCyclic::NewDmaChannelSlave, IPortWavePci_fnNewMasterDmaChannel
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 18:44:16 2009 New Revision: 38595 URL: http://svn.reactos.org/svn/reactos?rev=38595&view=rev Log: - Implement IPortWaveCyclic::NewMasterDmaChannel, IPortWaveCyclic::NewDmaChannelSlave, IPortWavePci_fnNewMasterDmaChannel Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Mon Jan 5 18:44:16 2009 @@ -74,7 +74,9 @@ return STATUS_SUCCESS; } - +/* + * @implemented + */ NTSTATUS NTAPI PcDmaMasterDescription( @@ -104,7 +106,9 @@ return STATUS_SUCCESS; } - +/* + * @implemented + */ NTSTATUS NTAPI PcDmaSlaveDescription( @@ -112,7 +116,7 @@ IN ULONG DmaIndex, IN BOOL DemandMode, IN ULONG AutoInitialize, - IN DMA_SPEED DmaSpeed + IN DMA_SPEED DmaSpeed, IN ULONG MaximumLength, IN ULONG DmaPort, OUT PDEVICE_DESCRIPTION DeviceDescription) @@ -127,4 +131,4 @@ DeviceDescription->DmaPort = DmaPort; return STATUS_SUCCESS; -} +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Mon Jan 5 18:44:16 2009 @@ -26,6 +26,7 @@ const GUID IID_IIrpTarget; const GUID IID_IPinCount; const GUID IID_IPowerNotify; +const GUID IID_IDmaChannelSlave; const GUID GUID_DEVCLASS_SOUND; //FIXME //--------------------------------------------------------------- @@ -250,14 +251,30 @@ IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed) { - return STATUS_UNSUCCESSFUL; + NTSTATUS Status; + DEVICE_DESCRIPTION DeviceDescription; + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortWaveCyclic_fnNewSlaveDmaChannel called w/o initialized\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = PcDmaMasterDescription(ResourceList, (Dma32BitAddresses | Dma64BitAddresses), Dma32BitAddresses, 0, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, 0, &DeviceDescription); + if (NT_SUCCESS(Status)) + { + return PcNewDmaChannel(DmaChannel, OuterUnknown, NonPagedPool, &DeviceDescription, This->pDeviceObject); + } + + return Status; } NTSTATUS NTAPI IPortWaveCyclic_fnNewSlaveDmaChannel( IN IPortWaveCyclic * iface, - OUT PDMACHANNELSLAVE* DmaChannel, + OUT PDMACHANNELSLAVE* OutDmaChannel, IN PUNKNOWN OuterUnknown, IN PRESOURCELIST ResourceList OPTIONAL, IN ULONG DmaIndex, @@ -265,12 +282,9 @@ IN BOOL DemandMode, IN DMA_SPEED DmaSpeed) { - DEVICE_DESCRIPTION DeviceDesc; - INTERFACE_TYPE BusType; - ULONG ResultLength; + DEVICE_DESCRIPTION DeviceDescription; + PDMACHANNEL DmaChannel; NTSTATUS Status; - ULONG MapRegisters; - PDMA_ADAPTER Adapter; IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; @@ -280,34 +294,22 @@ return STATUS_UNSUCCESSFUL; } - Status = IoGetDeviceProperty(This->pDeviceObject, DevicePropertyLegacyBusType, sizeof(BusType), (PVOID)&BusType, &ResultLength); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoGetDeviceProperty failed with %x\n", Status); - return Status; - } - - RtlZeroMemory(&DeviceDesc, sizeof(DeviceDesc)); - DeviceDesc.Version = DEVICE_DESCRIPTION_VERSION; - DeviceDesc.Master = FALSE; - DeviceDesc.InterfaceType = BusType; - DeviceDesc.MaximumLength = MaximumLength; - DeviceDesc.DemandMode = DemandMode; - DeviceDesc.DmaSpeed = DmaSpeed; - DeviceDesc.DmaChannel = DmaIndex; - - Adapter = IoGetDmaAdapter(This->pDeviceObject, &DeviceDesc, &MapRegisters); - if (!Adapter) - { - DPRINT("IoGetDmaAdapter failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - return NewDmaChannelSlave(&DeviceDesc, Adapter, MapRegisters, DmaChannel); - - - - return STATUS_UNSUCCESSFUL; + // FIXME + // Check for F-Type DMA Support + // + + Status = PcDmaSlaveDescription(ResourceList, DmaIndex, DemandMode, TRUE, DmaSpeed, MaximumLength, 0, &DeviceDescription); + if (NT_SUCCESS(Status)) + { + Status = PcNewDmaChannel(&DmaChannel, OuterUnknown, NonPagedPool, &DeviceDescription, This->pDeviceObject); + if (NT_SUCCESS(Status)) + { + Status = DmaChannel->lpVtbl->QueryInterface(DmaChannel, &IID_IDmaChannelSlave, (PVOID*)OutDmaChannel); + DmaChannel->lpVtbl->Release(DmaChannel); + } + } + + return Status; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Mon Jan 5 18:44:16 2009 @@ -275,19 +275,30 @@ NTAPI IPortWavePci_fnNewMasterDmaChannel( IN IPortWavePci * iface, - OUT PDMACHANNEL* DmaChannel, - IN PUNKNOWN OuterUnknown, - IN POOL_TYPE PoolType, - IN PRESOURCELIST ResourceList OPTIONAL, - IN BOOL ScatterGather, - IN BOOL Dma32BitAddresses, - IN BOOL Dma64BitAddresses, - IN DMA_WIDTH DmaWidth, - IN DMA_SPEED DmaSpeed, - IN ULONG MaximumLength, - IN ULONG DmaPort) -{ - return STATUS_UNSUCCESSFUL; + OUT PDMACHANNEL *DmaChannel, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOLEAN ScatterGather, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN Dma64BitAddresses, + IN BOOLEAN IgnoreCount, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort) +{ + NTSTATUS Status; + DEVICE_DESCRIPTION DeviceDescription; + IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + + Status = PcDmaMasterDescription(ResourceList, ScatterGather, Dma32BitAddresses, IgnoreCount, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, DmaPort, &DeviceDescription); + if (NT_SUCCESS(Status)) + { + return PcNewDmaChannel(DmaChannel, OuterUnknown, PoolType, &DeviceDescription, This->pDeviceObject); + } + + return Status; } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Jan 5 18:44:16 2009 @@ -106,7 +106,31 @@ } PCExtension; +NTSTATUS +NTAPI +PcDmaMasterDescription( + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOLEAN ScatterGather, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN IgnoreCount, + IN BOOLEAN Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort, + OUT PDEVICE_DESCRIPTION DeviceDescription); +NTSTATUS +NTAPI +PcDmaSlaveDescription( + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN BOOL DemandMode, + IN ULONG AutoInitialize, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort, + OUT PDEVICE_DESCRIPTION DeviceDescription);

1 0

[janderwald] 38594: - Add GUID IID_IDmaChannelSlave
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 18:41:40 2009 New Revision: 38594 URL: http://svn.reactos.org/svn/reactos?rev=38594&view=rev Log: - Add GUID IID_IDmaChannelSlave Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Jan 5 18:41:40 2009 @@ -778,6 +778,10 @@ #undef INTERFACE #define INTERFACE IDmaChannelSlave + +#if (NTDDI_VERSION < NTDDI_LONGHORN) +DEFINE_GUID(IID_IDmaChannelSlave, 0x22C6AC62L, 0x851B, 0x11D0, 0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE); +#endif DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) { @@ -1186,9 +1190,9 @@ IN PUNKNOWN OuterUnknown, IN POOL_TYPE PoolType, IN PRESOURCELIST ResourceList OPTIONAL, - IN BOOL ScatterGather, - IN BOOL Dma32BitAddresses, - IN BOOL Dma64BitAddresses, + IN BOOLEAN ScatterGather, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN Dma64BitAddresses, IN BOOLEAN IgnoreCount, IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed,

1 0

[sserapion] 38593: - Don't go SIZE_T crazy.
by sserapion＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: sserapion Date: Mon Jan 5 18:35:05 2009 New Revision: 38593 URL: http://svn.reactos.org/svn/reactos?rev=38593&view=rev Log: - Don't go SIZE_T crazy. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] Mon Jan 5 18:35:05 2009 @@ -69,15 +69,15 @@ typedef struct tagARENA_INUSE { SIZE_T size; /* Block size; must be the first field */ - SIZE_T magic : 23; /* Magic number */ - SIZE_T has_user_data : 1; /* There is user data associated with this block */ - SIZE_T unused_bytes : 8; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ + DWORD magic : 23; /* Magic number */ + DWORD has_user_data : 1; /* There is user data associated with this block */ + DWORD unused_bytes : 8; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ } ARENA_INUSE; typedef struct tagARENA_FREE { - SIZE_T size; /* Block size; must be the first field */ - SIZE_T magic; /* Magic number */ + SIZE_T size; /* Block size; must be the first field */ + DWORD magic; /* Magic number */ struct list entry; /* Entry in free list */ } ARENA_FREE; @@ -130,12 +130,12 @@ typedef struct tagSUBHEAP { - SIZE_T size; /* Size of the whole sub-heap */ - SIZE_T commitSize; /* Committed size of the sub-heap */ - SIZE_T headerSize; /* Size of the heap header */ + SIZE_T size; /* Size of the whole sub-heap */ + SIZE_T commitSize; /* Committed size of the sub-heap */ + SIZE_T headerSize; /* Size of the heap header */ struct tagSUBHEAP *next; /* Next sub-heap */ struct tagHEAP *heap; /* Main heap structure */ - SIZE_T magic; /* Magic number */ + DWORD magic; /* Magic number */ } SUBHEAP; #define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24)))

1 0

[janderwald] 38592: - Fix IPortWavePci interface definition
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 18:17:55 2009 New Revision: 38592 URL: http://svn.reactos.org/svn/reactos?rev=38592&view=rev Log: - Fix IPortWavePci interface definition Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Jan 5 18:17:55 2009 @@ -1189,6 +1189,7 @@ IN BOOL ScatterGather, IN BOOL Dma32BitAddresses, IN BOOL Dma64BitAddresses, + IN BOOLEAN IgnoreCount, IN DMA_WIDTH DmaWidth, IN DMA_SPEED DmaSpeed, IN ULONG MaximumLength,

1 0

[janderwald] 38591: - Implement PcDmaMasterDescription, PcDmaSlaveDescription
by janderwald＠svn.reactos.org 06 Jan '09

06 Jan '09

Author: janderwald Date: Mon Jan 5 18:04:32 2009 New Revision: 38591 URL: http://svn.reactos.org/svn/reactos?rev=38591&view=rev Log: - Implement PcDmaMasterDescription, PcDmaSlaveDescription Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Mon Jan 5 18:04:32 2009 @@ -73,3 +73,58 @@ IoStopTimer(pDeviceObject); return STATUS_SUCCESS; } + + +NTSTATUS +NTAPI +PcDmaMasterDescription( + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOLEAN ScatterGather, + IN BOOLEAN Dma32BitAddresses, + IN BOOLEAN IgnoreCount, + IN BOOLEAN Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort, + OUT PDEVICE_DESCRIPTION DeviceDescription) +{ + + RtlZeroMemory(DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + DeviceDescription->Master = TRUE; + DeviceDescription->ScatterGather= ScatterGather; + DeviceDescription->Dma32BitAddresses = Dma32BitAddresses; + DeviceDescription->IgnoreCount = IgnoreCount; + DeviceDescription->Dma64BitAddresses = Dma64BitAddresses; + DeviceDescription->DmaWidth = DmaWidth; + DeviceDescription->DmaSpeed = DmaSpeed; + DeviceDescription->MaximumLength = MaximumLength; + DeviceDescription->DmaPort = DmaPort; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PcDmaSlaveDescription( + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN BOOL DemandMode, + IN ULONG AutoInitialize, + IN DMA_SPEED DmaSpeed + IN ULONG MaximumLength, + IN ULONG DmaPort, + OUT PDEVICE_DESCRIPTION DeviceDescription) +{ + + RtlZeroMemory(DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + DeviceDescription->DemandMode = DemandMode; + DeviceDescription->AutoInitialize = AutoInitialize; + DeviceDescription->DmaSpeed = DmaSpeed; + DeviceDescription->MaximumLength = MaximumLength; + DeviceDescription->DmaPort = DmaPort; + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] Mon Jan 5 18:04:32 2009 @@ -89,10 +89,6 @@ /* PcDeleteSubdeviceDescriptor */ -/* PcDmaMasterDescription */ - -/* PcDmaSlaveDescription */ - /* PcFreeEventTable */ /* PcFreePropertyTable */

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009