Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[ros-arm-bringup] 41631: - Blow away the bottom 2GB of virtual address space in the ARM^3 initializer. Previously this was kind of done with MmUnmapPageTable in MmInit1, but this code (And the function, which had only been used for this purpose, are gone) - Also set the Page Directory for the system/idle process in a slightly more correct way, instead of depending on the CR3 value. Do this in ARM^3 now, and remove the older code (and the MmGetPageDirectory function, which was only used by this).
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sat Jun 27 09:32:53 2009 New Revision: 41631 URL: http://svn.reactos.org/svn/reactos?rev=41631&view=rev Log: - Blow away the bottom 2GB of virtual address space in the ARM^3 initializer. Previously this was kind of done with MmUnmapPageTable in MmInit1, but this code (And the function, which had only been used for this purpose, are gone) - Also set the Page Directory for the system/idle process in a slightly more correct way, instead of depending on the CR3 value. Do this in ARM^3 now, and remove the older code (and the MmGetPageDirectory function, which was only used by this). Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Sat Jun 27 09:32:53 2009 @@ -146,6 +146,20 @@ if (Phase == 0) { // + // Set CR3 for the system process + // + PointerPte = MiAddressToPde(PAGETABLE_MAP); + PageFrameIndex = PFN_FROM_PTE(PointerPte) << PAGE_SHIFT; + PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameIndex; + + // + // Blow away user-mode + // + StartPde = MiAddressToPde(0); + EndPde = MiAddressToPde(KSEG0_BASE); + RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); + + // // Check if this is a machine with less than 19MB of RAM // if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Jun 27 09:32:53 2009 @@ -71,12 +71,6 @@ } } -PULONG -MmGetPageDirectory(VOID) -{ - return (PULONG)(ULONG_PTR)__readcr3(); -} - static ULONG ProtectToPTE(ULONG flProtect) { @@ -224,32 +218,6 @@ DirectoryTableBase[1] = 0; DPRINT("Finished MmCopyMmInfo(): 0x%x\n", DirectoryTableBase[0]); return TRUE; -} - -VOID -NTAPI -MmDeletePageTable(PEPROCESS Process, PVOID Address) -{ - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - - if (Process != NULL && Process != CurrentProcess) - { - KeAttachProcess(&Process->Pcb); - } - - MiAddressToPde(Address)->u.Long = 0; - MiFlushTlb((PULONG)MiAddressToPde(Address), - MiAddressToPte(Address)); - - if (Address >= MmSystemRangeStart) - { - KeBugCheck(MEMORY_MANAGEMENT); - // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; - } - if (Process != NULL && Process != CurrentProcess) - { - KeDetachProcess(); - } } static PULONG Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Jun 27 09:32:53 2009 @@ -305,9 +305,6 @@ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - /* Set the page directory */ - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = (ULONG)MmGetPageDirectory(); - /* Get the size of FreeLDR's image allocations */ MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; MmBootImageSize *= PAGE_SIZE; @@ -377,9 +374,6 @@ /* Initialize the page list */ MmInitializePageList(); - - /* Unmap low memory */ - MmDeletePageTable(NULL, 0); // // Initialize ARMÂ³

1 0

[cgutman] 41630: - Don't leave the listen IRP in the queue when cancelling the listen request - Kill all the requests before closing the socket - Notify oskittcp when we are cancelling requests so it can properly close the socket
by cgutman＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cgutman Date: Sat Jun 27 07:23:10 2009 New Revision: 41630 URL: http://svn.reactos.org/svn/reactos?rev=41630&view=rev Log: - Don't leave the listen IRP in the queue when cancelling the listen request - Kill all the requests before closing the socket - Notify oskittcp when we are cancelling requests so it can properly close the socket Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] Sat Jun 27 07:23:10 2009 @@ -7,6 +7,12 @@ #ifndef __DISPATCH_H #define __DISPATCH_H +typedef struct _DISCONNECT_TYPE { + UINT Type; + PVOID Context; + PIRP Irp; + PFILE_OBJECT FileObject; +} DISCONNECT_TYPE, *PDISCONNECT_TYPE; NTSTATUS DispTdiAccept( PIRP Irp); @@ -64,6 +70,9 @@ PIRP Irp, PIO_STACK_LOCATION IrpSp); +VOID DispDoDisconnect( + PVOID Data); + #endif /* __DISPATCH_H */ /* EOF */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Jun 27 07:23:10 2009 @@ -110,13 +110,6 @@ TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); } - -typedef struct _DISCONNECT_TYPE { - UINT Type; - PVOID Context; - PIRP Irp; - PFILE_OBJECT FileObject; -} DISCONNECT_TYPE, *PDISCONNECT_TYPE; VOID DispDoDisconnect( PVOID Data ) { PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; @@ -250,6 +243,9 @@ /* Try canceling the request */ Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + + TCPRemoveIRP(Connection, Irp); + TCPAbortListenForSocket( Connection->AddressFile->Listener, Connection ); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Jun 27 07:23:10 2009 @@ -217,24 +217,66 @@ } if( NewState & SEL_FIN ) { - PLIST_ENTRY ListsToErase[4]; - UINT i; - - TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); - - ListsToErase[0] = &Connection->ReceiveRequest; - ListsToErase[1] = &Connection->ListenRequest; - ListsToErase[2] = &Connection->ConnectRequest; - ListsToErase[3] = &Connection->SendRequest; - - for( i = 0; i < 4; i++ ) { - while( !IsListEmpty( ListsToErase[i] ) ) { - Entry = RemoveHeadList( ListsToErase[i] ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); - exFreePool( Bucket ); - } + TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); + + while (!IsListEmpty(&Connection->ReceiveRequest)) + { + DISCONNECT_TYPE DisType; + PIO_STACK_LOCATION IrpSp; + Entry = RemoveHeadList(&Connection->ReceiveRequest); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); + + /* We have to notify oskittcp of the abortion */ + DisType.Type = TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; + + ChewCreate(NULL, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType); + } + + while (!IsListEmpty(&Connection->SendRequest)) + { + DISCONNECT_TYPE DisType; + PIO_STACK_LOCATION IrpSp; + Entry = RemoveHeadList(&Connection->SendRequest); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); + + /* We have to notify oskittcp of the abortion */ + DisType.Type = TDI_DISCONNECT_RELEASE; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; + + ChewCreate(NULL, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType); + } + + while (!IsListEmpty(&Connection->ListenRequest)) + { + Entry = RemoveHeadList(&Connection->ListenRequest); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + /* We have to notify oskittcp of the abortion */ + TCPAbortListenForSocket(Connection->AddressFile->Listener, + Connection); + + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + } + + while (!IsListEmpty(&Connection->ConnectRequest)) + { + Entry = RemoveHeadList(&Connection->ConnectRequest); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); } } @@ -656,11 +698,11 @@ TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) ); - /* Make our code remove all pending IRPs */ Connection->State |= SEL_FIN; DrainSignals(); + + Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) ); TcpipRecursiveMutexLeave( &TCPLock );

1 0

[cgutman] 41629: - Acquire the cancel spin lock before calling IoSetCancelRoutine - Remove some extra junk
by cgutman＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: cgutman Date: Sat Jun 27 07:14:06 2009 New Revision: 41629 URL: http://svn.reactos.org/svn/reactos?rev=41629&view=rev Log: - Acquire the cancel spin lock before calling IoSetCancelRoutine - Remove some extra junk Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] Sat Jun 27 07:14:06 2009 @@ -16,10 +16,7 @@ } NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) { - KIRQL Irql; - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - - //DbgPrint("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent); + KIRQL OldIrql; UntrackFL( __FILE__, __LINE__, Irp, IRP_TAG ); @@ -28,15 +25,11 @@ if( Status == STATUS_PENDING ) IoMarkIrpPending( Irp ); else { - Irql = KeGetCurrentIrql(); + IoAcquireCancelSpinLock(&OldIrql); + (void)IoSetCancelRoutine( Irp, NULL ); + IoReleaseCancelSpinLock(OldIrql); - (void)IoSetCancelRoutine( Irp, NULL ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - if (KeGetCurrentIrql() != Irql) { - DbgPrint("WARNING: IO COMPLETION RETURNED AT WRONG IRQL:\n"); - DbgPrint("WARNING: IRP TYPE WAS %d\n", IrpSp->MajorFunction); - } - ASSERT(KeGetCurrentIrql() == Irql); } return Status;

1 0

[ros-arm-bringup] 41628: - Rewrite MmMapIoSpace and MmUnmapIoSpace to use System PTEs instead. - Much faster and cleaner (will be even faster when System PTE allocation is optimized). - Better handling of esoteric caching options, especially relevant for ARM. - Handled through the MiPlatformCacheAttributes, which should be defined differently for each platform (TODO). - Handles both I/O (device) and RAM physical memory. - Correct flushing of CPU caches (not a big deal on x86, but matters on ARM)
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sat Jun 27 07:03:24 2009 New Revision: 41628 URL: http://svn.reactos.org/svn/reactos?rev=41628&view=rev Log: - Rewrite MmMapIoSpace and MmUnmapIoSpace to use System PTEs instead. - Much faster and cleaner (will be even faster when System PTE allocation is optimized). - Better handling of esoteric caching options, especially relevant for ARM. - Handled through the MiPlatformCacheAttributes, which should be defined differently for each platform (TODO). - Handles both I/O (device) and RAM physical memory. - Correct flushing of CPU caches (not a big deal on x86, but matters on ARM). Added: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c - copied, changed from r41569, trunk/reactos/ntoskrnl/mm/iospace.c Removed: trunk/reactos/ntoskrnl/mm/iospace.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Copied: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c (from r41569, trunk/reactos/ntoskrnl/mm/iospace.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?p… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Sat Jun 27 07:03:24 2009 @@ -1,184 +1,257 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/iospace.c - * PURPOSE: Mapping I/O space - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/iosup.c + * PURPOSE: ARM Memory Manager I/O Mapping Functionality + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ - -/********************************************************************** - * NAME EXPORTED - * MmMapIoSpace@16 - * - * DESCRIPTION - * Maps a physical memory range into system space. - * - * ARGUMENTS - * PhysicalAddress - * First physical address to map; - * - * NumberOfBytes - * Number of bytes to map; - * - * CacheEnable - * Type of memory caching. - * - * RETURN VALUE - * The base virtual address which maps the region. - * - * NOTE - * Description moved here from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -PVOID NTAPI -MmMapIoSpace (IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN MEMORY_CACHING_TYPE CacheEnable) -{ - PVOID Result; - ULONG Offset; - MEMORY_AREA* marea; - NTSTATUS Status; - ULONG i; - ULONG Protect; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Pfn; - - DPRINT("MmMapIoSpace(%lx, %d, %d)\n", PhysicalAddress, NumberOfBytes, CacheEnable); - - if (CacheEnable != MmNonCached && - CacheEnable != MmCached && - CacheEnable != MmWriteCombined) - { - return NULL; - } - - BoundaryAddressMultiple.QuadPart = 0; - Result = NULL; - Offset = PhysicalAddress.u.LowPart % PAGE_SIZE; - NumberOfBytes += Offset; - PhysicalAddress.QuadPart -= Offset; - Protect = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; - if (CacheEnable != MmCached) - { - Protect |= (PAGE_NOCACHE | PAGE_WRITETHROUGH); - } - - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), - MEMORY_AREA_IO_MAPPING, - &Result, - NumberOfBytes, - Protect, - &marea, - 0, - FALSE, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - if (!NT_SUCCESS(Status)) - { - DPRINT("MmMapIoSpace failed (%lx)\n", Status); - return (NULL); - } - Pfn = PhysicalAddress.LowPart >> PAGE_SHIFT; - for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) - { - Status = MmCreateVirtualMappingForKernel((char*)Result + i, - Protect, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - } - return (PVOID)((ULONG_PTR)Result + Offset); -} - - -/********************************************************************** - * NAME EXPORTED - * MmUnmapIoSpace@8 - * - * DESCRIPTION - * Unmaps a physical memory range from system space. - * - * ARGUMENTS - * BaseAddress - * The base virtual address which maps the region; - * - * NumberOfBytes - * Number of bytes to unmap. - * - * RETURN VALUE - * None. - * - * NOTE - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -VOID NTAPI -MmUnmapIoSpace (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) -{ - LONG Offset; - PVOID Address = BaseAddress; - - Offset = (ULONG_PTR)Address % PAGE_SIZE; - Address = RVA(Address, - Offset); - NumberOfBytes += Offset; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - Address, - NULL, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - - -/********************************************************************** - * NAME EXPORTED - * MmMapVideoDisplay@16 - * - * @implemented - */ -PVOID NTAPI -MmMapVideoDisplay (IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN MEMORY_CACHING_TYPE CacheType) -{ - return MmMapIoSpace (PhysicalAddress, NumberOfBytes, (BOOLEAN)CacheType); -} - - -/* - * @implemented - */ -VOID NTAPI -MmUnmapVideoDisplay (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) -{ - MmUnmapIoSpace (BaseAddress, NumberOfBytes); -} - +#line 15 "ARMÂ³::IOSUP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +// +// Each architecture has its own caching attributes for both I/O and Physical +// memory mappings. +// +// This describes the attributes for the x86 architecture. It eventually needs +// to go in the appropriate i386 directory. +// +MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType] = +{ + // + // RAM + // + {MiNonCached,MiCached,MiWriteCombined,MiCached,MiNonCached,MiWriteCombined}, + + // + // Device Memory + // + {MiNonCached,MiCached,MiWriteCombined,MiCached,MiNonCached,MiWriteCombined}, +}; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +PVOID +NTAPI +MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberOfBytes, + IN MEMORY_CACHING_TYPE CacheType) +{ + + PFN_TYPE Pfn, PageCount; + PMMPTE PointerPte; + PVOID BaseAddress; + MMPTE TempPte; + PMMPFN Pfn1 = NULL; + MI_PFN_CACHE_ATTRIBUTE CacheAttribute; + BOOLEAN IsIoMapping; + + // + // Normalize and validate the caching attributes + // + CacheType &= 0xFF; + if (CacheType >= MmMaximumCacheType) return NULL; + + // + // Calculate page count + // + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(PhysicalAddress.LowPart, + NumberOfBytes); + + // + // Compute the PFN and check if it's a known I/O mapping + // Also translate the cache attribute + // + Pfn = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT); + IsIoMapping = (Pfn > MmHighestPhysicalPage) ? TRUE : FALSE; + if (!IsIoMapping) Pfn1 = MiGetPfnEntry(Pfn); + CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; + + // + // Now allocate system PTEs for the mapping, and get the VA + // + PointerPte = MiReserveSystemPtes(PageCount, SystemPteSpace); + if (!PointerPte) return NULL; + BaseAddress = MiPteToAddress(PointerPte); + + // + // Check if this is uncached + // + if (CacheAttribute != MiCached) + { + // + // Flush all caches + // + KeFlushEntireTb(TRUE, TRUE); + KeInvalidateAllCaches(); + } + + // + // Now compute the VA offset + // + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress + + BYTE_OFFSET(PhysicalAddress.LowPart)); + + // + // Get the template and configure caching + // + TempPte = HyperTemplatePte; + switch (CacheAttribute) + { + case MiNonCached: + + // + // Disable the cache + // + TempPte.u.Hard.CacheDisable = 1; + TempPte.u.Hard.WriteThrough = 1; + break; + + case MiCached: + + // + // Leave defaults + // + break; + + case MiWriteCombined: + + // + // We don't support write combining yet + // + ASSERT(FALSE); + break; + + default: + + // + // Should never happen + // + ASSERT(FALSE); + break; + } + + // + // Sanity check and re-flush + // + Pfn = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT); + ASSERT((Pfn1 == MiGetPfnEntry(Pfn)) || (Pfn1 == NULL)); + KeFlushEntireTb(TRUE, TRUE); + KeInvalidateAllCaches(); + + // + // Do the mapping + // + do + { + // + // Start out with nothing + // + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Write the PFN + // + TempPte.u.Hard.PageFrameNumber = Pfn++; + *PointerPte++ = TempPte; + } while (--PageCount); + + // + // We're done! + // + return BaseAddress; +} + +/* + * @implemented + */ +VOID +NTAPI +MmUnmapIoSpace(IN PVOID BaseAddress, + IN ULONG NumberOfBytes) +{ + PFN_NUMBER PageCount, Pfn; + PMMPTE PointerPte; + + // + // Sanity check + // + ASSERT(NumberOfBytes != 0); + + // + // Get the page count + // + PageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(BaseAddress, NumberOfBytes); + + // + // Get the PTE and PFN + // + PointerPte = MiAddressToPte(BaseAddress); + Pfn = PFN_FROM_PTE(PointerPte); + + // + // Is this an I/O mapping? + // + if (Pfn > MmHighestPhysicalPage) + { + // + // Destroy the PTE + // + RtlZeroMemory(PointerPte, PageCount * sizeof(MMPTE)); + + // + // Blow the TLB + // + KeFlushEntireTb(TRUE, TRUE); + } + + // + // Release the PTEs + // + MiReleaseSystemPtes(PointerPte, PageCount, 0); +} + +/* + * @implemented + */ +PVOID +NTAPI +MmMapVideoDisplay(IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberOfBytes, + IN MEMORY_CACHING_TYPE CacheType) +{ + PAGED_CODE(); + + // + // Call the real function + // + return MmMapIoSpace(PhysicalAddress, NumberOfBytes, CacheType); +} + +/* + * @implemented + */ +VOID +NTAPI +MmUnmapVideoDisplay(IN PVOID BaseAddress, + IN ULONG NumberOfBytes) +{ + // + // Call the real function + // + MmUnmapIoSpace(BaseAddress, NumberOfBytes); +} /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Jun 27 07:03:24 2009 @@ -19,6 +19,14 @@ NonPagedPoolExpansion, MaximumPtePoolTypes } MMSYSTEM_PTE_POOL_TYPE; + +typedef enum _MI_PFN_CACHE_ATTRIBUTE +{ + MiNonCached, + MiCached, + MiWriteCombined, + MiNotMapped +} MI_PFN_CACHE_ATTRIBUTE, *PMI_PFN_CACHE_ATTRIBUTE; extern MMPTE HyperTemplatePte; @@ -50,4 +58,12 @@ IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType ); +VOID +NTAPI +MiReleaseSystemPtes( + IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType +); + /* EOF */ Removed: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c (removed) @@ -1,184 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/iospace.c - * PURPOSE: Mapping I/O space - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -/********************************************************************** - * NAME EXPORTED - * MmMapIoSpace@16 - * - * DESCRIPTION - * Maps a physical memory range into system space. - * - * ARGUMENTS - * PhysicalAddress - * First physical address to map; - * - * NumberOfBytes - * Number of bytes to map; - * - * CacheEnable - * Type of memory caching. - * - * RETURN VALUE - * The base virtual address which maps the region. - * - * NOTE - * Description moved here from include/ddk/mmfuncs.h. - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -PVOID NTAPI -MmMapIoSpace (IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN MEMORY_CACHING_TYPE CacheEnable) -{ - PVOID Result; - ULONG Offset; - MEMORY_AREA* marea; - NTSTATUS Status; - ULONG i; - ULONG Protect; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Pfn; - - DPRINT("MmMapIoSpace(%lx, %d, %d)\n", PhysicalAddress, NumberOfBytes, CacheEnable); - - if (CacheEnable != MmNonCached && - CacheEnable != MmCached && - CacheEnable != MmWriteCombined) - { - return NULL; - } - - BoundaryAddressMultiple.QuadPart = 0; - Result = NULL; - Offset = PhysicalAddress.u.LowPart % PAGE_SIZE; - NumberOfBytes += Offset; - PhysicalAddress.QuadPart -= Offset; - Protect = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; - if (CacheEnable != MmCached) - { - Protect |= (PAGE_NOCACHE | PAGE_WRITETHROUGH); - } - - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), - MEMORY_AREA_IO_MAPPING, - &Result, - NumberOfBytes, - Protect, - &marea, - 0, - FALSE, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - if (!NT_SUCCESS(Status)) - { - DPRINT("MmMapIoSpace failed (%lx)\n", Status); - return (NULL); - } - Pfn = PhysicalAddress.LowPart >> PAGE_SHIFT; - for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) - { - Status = MmCreateVirtualMappingForKernel((char*)Result + i, - Protect, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - } - return (PVOID)((ULONG_PTR)Result + Offset); -} - - -/********************************************************************** - * NAME EXPORTED - * MmUnmapIoSpace@8 - * - * DESCRIPTION - * Unmaps a physical memory range from system space. - * - * ARGUMENTS - * BaseAddress - * The base virtual address which maps the region; - * - * NumberOfBytes - * Number of bytes to unmap. - * - * RETURN VALUE - * None. - * - * NOTE - * Code taken from ntoskrnl/mm/special.c. - * - * REVISIONS - * - * @implemented - */ -VOID NTAPI -MmUnmapIoSpace (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) -{ - LONG Offset; - PVOID Address = BaseAddress; - - Offset = (ULONG_PTR)Address % PAGE_SIZE; - Address = RVA(Address, - Offset); - NumberOfBytes += Offset; - - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - Address, - NULL, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - - -/********************************************************************** - * NAME EXPORTED - * MmMapVideoDisplay@16 - * - * @implemented - */ -PVOID NTAPI -MmMapVideoDisplay (IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN MEMORY_CACHING_TYPE CacheType) -{ - return MmMapIoSpace (PhysicalAddress, NumberOfBytes, (BOOLEAN)CacheType); -} - - -/* - * @implemented - */ -VOID NTAPI -MmUnmapVideoDisplay (IN PVOID BaseAddress, - IN ULONG NumberOfBytes) -{ - MmUnmapIoSpace (BaseAddress, NumberOfBytes); -} - - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Jun 27 07:03:24 2009 @@ -362,6 +362,7 @@ <directory name="ARM3"> <file>hypermap.c</file> <file>init.c</file> + <file>iosup.c</file> <file>pool.c</file> <file>syspte.c</file> </directory> @@ -371,7 +372,6 @@ <file>dbgpool.c</file> <file>drvlck.c</file> <file>freelist.c</file> - <file>iospace.c</file> <file>kmap.c</file> <file>marea.c</file> <file>mdlsup.c</file>

1 0

[ros-arm-bringup] 41627: - ARM3-ify hypermap.c
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sat Jun 27 07:00:35 2009 New Revision: 41627 URL: http://svn.reactos.org/svn/reactos?rev=41627&view=rev Log: - ARM3-ify hypermap.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Sat Jun 27 07:00:35 2009 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/mm/ARM3/hypermap.c - * PURPOSE: Hyperspace Mapping Functionality + * PURPOSE: ARM Memory Manager Hyperspace Mapping Functionality * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -11,6 +11,10 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#line 15 "ARMÂ³::HYPERMAP" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" /* GLOBALS ********************************************************************/

1 0

[ros-arm-bringup] 41626: - Implement MiReleaseSystemPtes which is the function to deallocate System PTE allocations. - We do some minor optimizations to combine chunks if possible after a free, similar to MD Block algorithms in freeldr.c.
by ros-arm-bringup＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: ros-arm-bringup Date: Sat Jun 27 06:56:58 2009 New Revision: 41626 URL: http://svn.reactos.org/svn/reactos?rev=41626&view=rev Log: - Implement MiReleaseSystemPtes which is the function to deallocate System PTE allocations. - We do some minor optimizations to combine chunks if possible after a free, similar to MD Block algorithms in freeldr.c. Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Sat Jun 27 06:56:58 2009 @@ -160,6 +160,170 @@ VOID NTAPI +MiReleaseSystemPtes(IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType) +{ + ULONG_PTR ClusterSize, CurrentSize; + PMMPTE CurrentPte, NextPte, PointerPte; + + // + // Check to make sure the PTE address is within bounds. + // + ASSERT(NumberOfPtes != 0); + ASSERT(StartingPte >= MmSystemPtesStart[SystemPtePoolType]); + ASSERT(StartingPte <= MmSystemPtesEnd[SystemPtePoolType]); + + // + // Zero PTEs. + // + RtlZeroMemory(StartingPte, NumberOfPtes * sizeof (MMPTE)); + + // + // Increase availability + // + MmTotalFreeSystemPtes[SystemPtePoolType] += NumberOfPtes; + + // + // Get the free cluster and start going through them + // + CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPteBase); + CurrentPte = &MmFirstFreeSystemPte[SystemPtePoolType]; + while (TRUE) + { + // + // Get the first real cluster of PTEs and check if it's ours + // + PointerPte = MmSystemPteBase + CurrentPte->u.List.NextEntry; + if (CurrentSize < CurrentPte->u.List.NextEntry) + { + // + // Sanity check + // + ASSERT(((StartingPte + NumberOfPtes) <= PointerPte) || + (CurrentPte->u.List.NextEntry == -1)); + + // + // Get the next cluster in case it's the one + // + NextPte = CurrentPte + 1; + + // + // Check if this was actually a single-PTE entry + // + if (CurrentPte->u.List.OneEntry) + { + // + // We only have one page + // + ClusterSize = 1; + } + else + { + // + // The next cluster will have the page count + // + ClusterSize = (ULONG_PTR)NextPte->u.List.NextEntry; + } + + // + // So check if this cluster actually describes the entire mapping + // + if ((CurrentPte + ClusterSize) == StartingPte) + { + // + // It does -- collapse the free PTEs into the next cluster + // + NumberOfPtes += ClusterSize; + NextPte->u.List.NextEntry = NumberOfPtes; + CurrentPte->u.List.OneEntry = 0; + + // + // Make another pass + // + StartingPte = CurrentPte; + } + else + { + // + // There's still PTEs left -- make us into a cluster + // + StartingPte->u.List.NextEntry = CurrentPte->u.List.NextEntry; + CurrentPte->u.List.NextEntry = CurrentSize; + + // + // Is there just one page left? + // + if (NumberOfPtes == 1) + { + // + // Then this actually becomes a single PTE entry + // + StartingPte->u.List.OneEntry = 1; + } + else + { + // + // Otherwise, create a new cluster for the remaining pages + // + StartingPte->u.List.OneEntry = 0; + NextPte = StartingPte + 1; + NextPte->u.List.NextEntry = NumberOfPtes; + } + } + + // + // Now check if we've arrived at yet another cluster + // + if ((StartingPte + NumberOfPtes) == PointerPte) + { + // + // We'll collapse the next cluster into us + // + StartingPte->u.List.NextEntry = PointerPte->u.List.NextEntry; + StartingPte->u.List.OneEntry = 0; + NextPte = StartingPte + 1; + + // + // Check if the cluster only had one page + // + if (PointerPte->u.List.OneEntry) + { + // + // So will we... + // + ClusterSize = 1; + } + else + { + // + // Otherwise, grab the page count from the next-next cluster + // + PointerPte++; + ClusterSize = (ULONG_PTR)PointerPte->u.List.NextEntry; + } + + // + // And create the final combined cluster + // + NextPte->u.List.NextEntry = NumberOfPtes + ClusterSize; + } + + // + // We released the PTEs into their cluster (and optimized the list) + // + break; + } + + // + // Try the next cluster of PTEs... + // + CurrentPte = PointerPte; + } +} + +VOID +NTAPI MiInitializeSystemPtes(IN PMMPTE StartingPte, IN ULONG NumberOfPtes, IN MMSYSTEM_PTE_POOL_TYPE PoolType)

1 0

[janderwald] 41625: - Add STREAM_DEBUG_LEVEL
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 20:30:44 2009 New Revision: 41625 URL: http://svn.reactos.org/svn/reactos?rev=41625&view=rev Log: - Add STREAM_DEBUG_LEVEL Modified: trunk/reactos/include/ddk/strmini.h Modified: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/strmini.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Fri Jun 26 20:30:44 2009 @@ -1,13 +1,23 @@ #ifndef _STREAM_H #define _STREAM_H -#include <wdm.h> -#include <windef.h> -#include <stdio.h> +#include <ntddk.h> #include <ks.h> #define STREAMAPI __stdcall #define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) + +typedef enum +{ + DebugLevelFatal = 0, + DebugLevelError, + DebugLevelWarning, + DebugLevelInfo, + DebugLevelTrace, + DebugLevelVerbose, + DebugLevelMaximum +}STREAM_DEBUG_LEVEL; + #if DBG @@ -24,7 +34,7 @@ #define DEBUG_ASSERT(exp) #endif - + typedef PHYSICAL_ADDRESS STREAM_PHYSICAL_ADDRESS, *PSTREAM_PHYSICAL_ADDRESS; typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; @@ -51,7 +61,7 @@ PKSEVENT_ENTRY EventEntry; PKSEVENTDATA EventData; union - { + { struct _HW_STREAM_OBJECT * StreamObject; struct _HW_DEVICE_EXTENSION *DeviceExtension; }; @@ -60,6 +70,7 @@ ULONG Reserved; } HW_EVENT_DESCRIPTOR, *PHW_EVENT_DESCRIPTOR; +struct _HW_STREAM_REQUEST_BLOCK; typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_DATA_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_CONTROL_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); @@ -531,12 +542,12 @@ #define StreamClassRegisterMinidriver StreamClassRegisterAdapter -NTSTATUS +NTSTATUS StreamClassRegisterFilterWithNoKSPins( IN PDEVICE_OBJECT DeviceObject, IN const GUID * InterfaceClassGUID, IN ULONG PinCount, - IN BOOL * PinDirection, + IN BOOLEAN * PinDirection, IN KSPIN_MEDIUM * MediumList, IN GUID * CategoryList ); @@ -559,4 +570,4 @@ IN ... ); -#endif +#endif

1 0

[janderwald] 41624: - Write strmini.h for stream class driver
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 19:51:14 2009 New Revision: 41624 URL: http://svn.reactos.org/svn/reactos?rev=41624&view=rev Log: - Write strmini.h for stream class driver Added: trunk/reactos/include/ddk/strmini.h (with props) Added: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/strmini.h (added) +++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Fri Jun 26 19:51:14 2009 @@ -1,0 +1,562 @@ +#ifndef _STREAM_H +#define _STREAM_H + +#include <wdm.h> +#include <windef.h> +#include <stdio.h> +#include <ks.h> + +#define STREAMAPI __stdcall +#define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) + +#if DBG + +#define DebugPrint(x) StreamClassDebugPrint x +#define DEBUG_BREAKPOINT() DbgBreakPoint() +#define DEBUG_ASSERT(exp) \ + if ( !(exp) ) { \ + StreamClassDebugAssert( __FILE__, __LINE__, #exp, exp); \ + } +#else + +#define DebugPrint(x) +#define DEBUG_BREAKPOINT() +#define DEBUG_ASSERT(exp) + +#endif + +typedef PHYSICAL_ADDRESS STREAM_PHYSICAL_ADDRESS, *PSTREAM_PHYSICAL_ADDRESS; +typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; +typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; + +typedef enum +{ + TIME_GET_STREAM_TIME, + TIME_READ_ONBOARD_CLOCK, + TIME_SET_ONBOARD_CLOCK +}TIME_FUNCTION; + +typedef struct _HW_TIME_CONTEXT +{ + struct _HW_DEVICE_EXTENSION *HwDeviceExtension; + struct _HW_STREAM_OBJECT *HwStreamObject; + TIME_FUNCTION Function; + ULONGLONG Time; + ULONGLONG SystemTime; +}HW_TIME_CONTEXT, *PHW_TIME_CONTEXT; + +typedef struct _HW_EVENT_DESCRIPTOR +{ + BOOLEAN Enable; + PKSEVENT_ENTRY EventEntry; + PKSEVENTDATA EventData; + union + { + struct _HW_STREAM_OBJECT * StreamObject; + struct _HW_DEVICE_EXTENSION *DeviceExtension; + }; + ULONG EnableEventSetIndex; + PVOID HwInstanceExtension; + ULONG Reserved; +} HW_EVENT_DESCRIPTOR, *PHW_EVENT_DESCRIPTOR; + + +typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_DATA_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); +typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_CONTROL_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); +typedef NTSTATUS (STREAMAPI * PHW_EVENT_ROUTINE) (IN PHW_EVENT_DESCRIPTOR EventDescriptor); +typedef VOID (STREAMAPI * PHW_CLOCK_FUNCTION) (IN PHW_TIME_CONTEXT HwTimeContext); + +typedef struct _HW_CLOCK_OBJECT +{ + PHW_CLOCK_FUNCTION HwClockFunction; + ULONG ClockSupportFlags; + ULONG Reserved[2]; +} HW_CLOCK_OBJECT, *PHW_CLOCK_OBJECT; + +#define CLOCK_SUPPORT_CAN_SET_ONBOARD_CLOCK 0x1 +#define CLOCK_SUPPORT_CAN_READ_ONBOARD_CLOCK 0x2 +#define CLOCK_SUPPORT_CAN_RETURN_STREAM_TIME 0x4 + +typedef struct _HW_STREAM_OBJECT +{ + ULONG SizeOfThisPacket; + ULONG StreamNumber; + PVOID HwStreamExtension; + PHW_RECEIVE_STREAM_DATA_SRB ReceiveDataPacket; + PHW_RECEIVE_STREAM_CONTROL_SRB ReceiveControlPacket; + HW_CLOCK_OBJECT HwClockObject; + BOOLEAN Dma; + BOOLEAN Pio; + PVOID HwDeviceExtension; + ULONG StreamHeaderMediaSpecific; + ULONG StreamHeaderWorkspace; + BOOLEAN Allocator; + PHW_EVENT_ROUTINE HwEventRoutine; + ULONG Reserved[2]; +} HW_STREAM_OBJECT, *PHW_STREAM_OBJECT; + +typedef struct _HW_STREAM_HEADER +{ + ULONG NumberOfStreams; + ULONG SizeOfHwStreamInformation; + ULONG NumDevPropArrayEntries; + PKSPROPERTY_SET DevicePropertiesArray; + ULONG NumDevEventArrayEntries; + PKSEVENT_SET DeviceEventsArray; + PKSTOPOLOGY Topology; + PHW_EVENT_ROUTINE DeviceEventRoutine; + LONG NumDevMethodArrayEntries; + PKSMETHOD_SET DeviceMethodsArray; +}HW_STREAM_HEADER, *PHW_STREAM_HEADER; + +typedef struct _HW_STREAM_INFORMATION +{ + ULONG NumberOfPossibleInstances; + KSPIN_DATAFLOW DataFlow; + BOOLEAN DataAccessible; + ULONG NumberOfFormatArrayEntries; + PKSDATAFORMAT* StreamFormatsArray; + PVOID ClassReserved[4]; + ULONG NumStreamPropArrayEntries; + PKSPROPERTY_SET StreamPropertiesArray; + ULONG NumStreamEventArrayEntries; + PKSEVENT_SET StreamEventsArray; + GUID* Category; + GUID* Name; + ULONG MediumsCount; + const KSPIN_MEDIUM* Mediums; + BOOLEAN BridgeStream; + ULONG Reserved[2]; +}HW_STREAM_INFORMATION, *PHW_STREAM_INFORMATION; + + +typedef struct _HW_STREAM_DESCRIPTOR +{ + HW_STREAM_HEADER StreamHeader; + HW_STREAM_INFORMATION StreamInfo; +} HW_STREAM_DESCRIPTOR, *PHW_STREAM_DESCRIPTOR; + +typedef struct _STREAM_TIME_REFERENCE +{ + STREAM_TIMESTAMP CurrentOnboardClockValue; + LARGE_INTEGER OnboardClockFrequency; + LARGE_INTEGER CurrentSystemTime; + ULONG Reserved[2]; +}STREAM_TIME_REFERENCE, *PSTREAM_TIME_REFERENCE; + +typedef struct _STREAM_DATA_INTERSECT_INFO +{ + ULONG StreamNumber; + PKSDATARANGE DataRange; + PVOID DataFormatBuffer; + ULONG SizeOfDataFormatBuffer; + +}STREAM_DATA_INTERSECT_INFO, *PSTREAM_DATA_INTERSECT_INFO; + +typedef struct _STREAM_PROPERTY_DESCRIPTOR +{ + PKSPROPERTY Property; + ULONG PropertySetID; + PVOID PropertyInfo; + ULONG PropertyInputSize; + ULONG PropertyOutputSize; +}STREAM_PROPERTY_DESCRIPTOR, *PSTREAM_PROPERTY_DESCRIPTOR; + +typedef struct _STREAM_METHOD_DESCRIPTOR +{ + ULONG MethodSetID; + PKSMETHOD Method; + PVOID MethodInfo; + LONG MethodInputSize; + LONG MethodOutputSize; +} STREAM_METHOD_DESCRIPTOR, *PSTREAM_METHOD_DESCRIPTOR; + +#define STREAM_REQUEST_BLOCK_SIZE sizeof(STREAM_REQUEST_BLOCK) + +typedef enum _SRB_COMMAND +{ + SRB_READ_DATA, + SRB_WRITE_DATA, + SRB_GET_STREAM_STATE, + SRB_SET_STREAM_STATE, + SRB_SET_STREAM_PROPERTY, + SRB_GET_STREAM_PROPERTY, + SRB_OPEN_MASTER_CLOCK, + + SRB_INDICATE_MASTER_CLOCK, + SRB_UNKNOWN_STREAM_COMMAND, + SRB_SET_STREAM_RATE, + SRB_PROPOSE_DATA_FORMAT, + SRB_CLOSE_MASTER_CLOCK, + SRB_PROPOSE_STREAM_RATE, + SRB_SET_DATA_FORMAT, + SRB_GET_DATA_FORMAT, + SRB_BEGIN_FLUSH, + SRB_END_FLUSH, + + SRB_GET_STREAM_INFO = 0x100, + SRB_OPEN_STREAM, + SRB_CLOSE_STREAM, + SRB_OPEN_DEVICE_INSTANCE, + SRB_CLOSE_DEVICE_INSTANCE, + SRB_GET_DEVICE_PROPERTY, + SRB_SET_DEVICE_PROPERTY, + SRB_INITIALIZE_DEVICE, + SRB_CHANGE_POWER_STATE, + SRB_UNINITIALIZE_DEVICE, + SRB_UNKNOWN_DEVICE_COMMAND, + SRB_PAGING_OUT_DRIVER, + SRB_GET_DATA_INTERSECTION, + SRB_INITIALIZATION_COMPLETE, + SRB_SURPRISE_REMOVAL + +#if (NTDDI_VERSION >= NTDDI_WINXP) + + ,SRB_DEVICE_METHOD + ,SRB_STREAM_METHOD + +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + + ,SRB_NOTIFY_IDLE_STATE + +#endif + +#endif + +}SRB_COMMAND; + +typedef struct +{ + PHYSICAL_ADDRESS PhysicalAddress; + ULONG Length; +} KSSCATTER_GATHER, *PKSSCATTER_GATHER; + + +typedef struct _HW_STREAM_REQUEST_BLOCK +{ + ULONG SizeOfThisPacket; + SRB_COMMAND Command; + NTSTATUS Status; + PHW_STREAM_OBJECT StreamObject; + PVOID HwDeviceExtension; + PVOID SRBExtension; + + union _CommandData + { + PKSSTREAM_HEADER DataBufferArray; + PHW_STREAM_DESCRIPTOR StreamBuffer; + KSSTATE StreamState; + PSTREAM_TIME_REFERENCE TimeReference; + PSTREAM_PROPERTY_DESCRIPTOR PropertyInfo; + PKSDATAFORMAT OpenFormat; + struct _PORT_CONFIGURATION_INFORMATION *ConfigInfo; + HANDLE MasterClockHandle; + DEVICE_POWER_STATE DeviceState; + PSTREAM_DATA_INTERSECT_INFO IntersectInfo; + +#if (NTDDI_VERSION >= NTDDI_WINXP) + PVOID MethodInfo; + LONG FilterTypeIndex; +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + BOOLEAN Idle; +#endif +#endif + + }CommandData; + + ULONG NumberOfBuffers; + ULONG TimeoutCounter; + ULONG TimeoutOriginal; + struct _HW_STREAM_REQUEST_BLOCK *NextSRB; + + PIRP Irp; + ULONG Flags; + PVOID HwInstanceExtension; + + union + { + ULONG NumberOfBytesToTransfer; + ULONG ActualBytesTransferred; + }; + + PKSSCATTER_GATHER ScatterGatherBuffer; + ULONG NumberOfPhysicalPages; + ULONG NumberOfScatterGatherElements; + ULONG Reserved[1]; + +}HW_STREAM_REQUEST_BLOCK, *PHW_STREAM_REQUEST_BLOCK; + +#define SRB_HW_FLAGS_DATA_TRANSFER 0x01 +#define SRB_HW_FLAGS_STREAM_REQUEST 0x2 + +typedef enum +{ + PerRequestExtension, + DmaBuffer, + SRBDataBuffer +}STREAM_BUFFER_TYPE; + +typedef struct _ACCESS_RANGE +{ + STREAM_PHYSICAL_ADDRESS RangeStart; + ULONG RangeLength; + BOOLEAN RangeInMemory; + ULONG Reserved; +}ACCESS_RANGE, *PACCESS_RANGE; + +typedef struct _PORT_CONFIGURATION_INFORMATION +{ + ULONG SizeOfThisPacket; + PVOID HwDeviceExtension; + PDEVICE_OBJECT ClassDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + ULONG SystemIoBusNumber; + INTERFACE_TYPE AdapterInterfaceType; + ULONG BusInterruptLevel; + ULONG BusInterruptVector; + KINTERRUPT_MODE InterruptMode; + ULONG DmaChannel; + ULONG NumberOfAccessRanges; + PACCESS_RANGE AccessRanges; + ULONG StreamDescriptorSize; + PIRP Irp; + PKINTERRUPT InterruptObject; + PADAPTER_OBJECT DmaAdapterObject; + PDEVICE_OBJECT RealPhysicalDeviceObject; + ULONG Reserved[1]; +}PORT_CONFIGURATION_INFORMATION, *PPORT_CONFIGURATION_INFORMATION; + +typedef VOID (STREAMAPI * PHW_RECEIVE_DEVICE_SRB) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef VOID (STREAMAPI * PHW_CANCEL_SRB) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef VOID (STREAMAPI * PHW_REQUEST_TIMEOUT_HANDLER) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef BOOLEAN (STREAMAPI * PHW_INTERRUPT) (IN PVOID DeviceExtension); +typedef VOID (STREAMAPI * PHW_TIMER_ROUTINE) (IN PVOID Context); +typedef VOID (STREAMAPI * PHW_PRIORITY_ROUTINE) (IN PVOID Context); +typedef VOID (STREAMAPI * PHW_QUERY_CLOCK_ROUTINE) (IN PHW_TIME_CONTEXT TimeContext); +typedef BOOLEAN (STREAMAPI * PHW_RESET_ADAPTER) (IN PVOID DeviceExtension); + +typedef enum _STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE +{ + ReadyForNextStreamDataRequest, + ReadyForNextStreamControlRequest, + HardwareStarved, + StreamRequestComplete, + SignalMultipleStreamEvents, + SignalStreamEvent, + DeleteStreamEvent, + StreamNotificationMaximum +}STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE, *PSTREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE; + +typedef enum _STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE +{ + ReadyForNextDeviceRequest, + DeviceRequestComplete, + SignalMultipleDeviceEvents, + SignalDeviceEvent, + DeleteDeviceEvent, +#if (NTDDI_VERSION >= NTDDI_WINXP) + SignalMultipleDeviceInstanceEvents, +#endif + DeviceNotificationMaximum +} STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE, *PSTREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE; + +#define STREAM_CLASS_VERSION_20 0x0200 + +typedef struct _HW_INITIALIZATION_DATA { +#if (NTDDI_VERSION >= NTDDI_WINXP) + union + { + ULONG HwInitializationDataSize; + struct + { + USHORT SizeOfThisPacket; + USHORT StreamClassVersion; + }; + }; +#else + ULONG HwInitializationDataSize; +#endif + + PHW_INTERRUPT HwInterrupt; + PHW_RECEIVE_DEVICE_SRB HwReceivePacket; + PHW_CANCEL_SRB HwCancelPacket; + PHW_REQUEST_TIMEOUT_HANDLER HwRequestTimeoutHandler; + ULONG DeviceExtensionSize; + ULONG PerRequestExtensionSize; + ULONG PerStreamExtensionSize; + ULONG FilterInstanceExtensionSize; + BOOLEAN BusMasterDMA; + BOOLEAN Dma24BitAddresses; + ULONG BufferAlignment; + BOOLEAN TurnOffSynchronization; + ULONG DmaBufferSize; + +#if (NTDDI_VERSION >= NTDDI_WINXP) + ULONG NumNameExtensions; + PWCHAR *NameExtensionArray; +#else + ULONG Reserved[2]; +#endif +} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; + +typedef enum _STREAM_PRIORITY +{ + High, + Dispatch, + Low, + LowToHigh +}STREAM_PRIORITY, *PSTREAM_PRIORITY; + + +VOID +StreamClassAbortOutstandingRequests( + IN PVOID HwDeviceExtension, + IN PHW_STREAM_OBJECT HwStreamObject, + IN NTSTATUS Status +); + +VOID +STREAMAPI +StreamClassCallAtNewPriority( + IN PHW_STREAM_OBJECT StreamObject, + IN PVOID HwDeviceExtension, + IN STREAM_PRIORITY Priority, + IN PHW_PRIORITY_ROUTINE PriorityRoutine, + IN PVOID Context + ); + +VOID +STREAMAPI +StreamClassCompleteRequestAndMarkQueueReady( + IN PHW_STREAM_REQUEST_BLOCK Srb +); + +VOID +STREAMAPI +StreamClassDebugAssert( + IN PCHAR File, + IN ULONG Line, + IN PCHAR AssertText, + IN ULONG AssertValue +); + +VOID +__cdecl +StreamClassDebugPrint( + IN STREAM_DEBUG_LEVEL DebugPrintLevel, + IN PCCHAR DebugMessage, + ... +); + +VOID +__cdecl +StreamClassDeviceNotification( + IN STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE NotificationType, + IN PVOID HwDeviceExtension, + ... +); + +VOID +STREAMAPI +StreamClassFilterReenumerateStreams( + IN PVOID HwInstanceExtension, + IN ULONG StreamDescriptorSize +); + +PVOID +STREAMAPI +StreamClassGetDmaBuffer( + IN PVOID HwDeviceExtension +); + + +PKSEVENT_ENTRY +StreamClassGetNextEvent( + IN PVOID HwInstanceExtension_OR_HwDeviceExtension, + IN PHW_STREAM_OBJECT HwStreamObject, + IN GUID * EventGuid, + IN ULONG EventItem, + IN PKSEVENT_ENTRY CurrentEvent +); + +STREAM_PHYSICAL_ADDRESS +STREAMAPI +StreamClassGetPhysicalAddress( + IN PVOID HwDeviceExtension, + IN PHW_STREAM_REQUEST_BLOCK HwSRB, + IN PVOID VirtualAddress, + IN STREAM_BUFFER_TYPE Type, + IN ULONG * Length +); + +VOID +StreamClassQueryMasterClock( + IN PHW_STREAM_OBJECT HwStreamObject, + IN HANDLE MasterClockHandle, + IN TIME_FUNCTION TimeFunction, + IN PHW_QUERY_CLOCK_ROUTINE ClockCallbackRoutine +); + +VOID +STREAMAPI +StreamClassQueryMasterClockSync( + IN HANDLE MasterClockHandle, + IN PHW_TIME_CONTEXT TimeContext +); + +BOOLEAN +STREAMAPI +StreamClassReadWriteConfig( + IN PVOID HwDeviceExtension, + IN BOOLEAN Read, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + +VOID +STREAMAPI +StreamClassReenumerateStreams( + IN PVOID HwDeviceExtension, + IN ULONG StreamDescriptorSize +); + +NTSTATUS +STREAMAPI +StreamClassRegisterAdapter( + IN PVOID Argument1, + IN PVOID Argument2, + IN PHW_INITIALIZATION_DATA HwInitializationData +); + +#define StreamClassRegisterMinidriver StreamClassRegisterAdapter + +NTSTATUS +StreamClassRegisterFilterWithNoKSPins( + IN PDEVICE_OBJECT DeviceObject, + IN const GUID * InterfaceClassGUID, + IN ULONG PinCount, + IN BOOL * PinDirection, + IN KSPIN_MEDIUM * MediumList, + IN GUID * CategoryList +); + +VOID +STREAMAPI +StreamClassScheduleTimer( + IN PHW_STREAM_OBJECT StreamObject, + IN PVOID HwDeviceExtension, + IN ULONG NumberOfMicroseconds, + IN PHW_TIMER_ROUTINE TimerRoutine, + IN PVOID Context +); + +VOID +__cdecl +StreamClassStreamNotification( + IN STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE NotificationType, + IN PHW_STREAM_OBJECT StreamObject, + IN ... +); + +#endif Propchange: trunk/reactos/include/ddk/strmini.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 41623: - Callback routine expects fdo - Fix boot
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 18:17:12 2009 New Revision: 41623 URL: http://svn.reactos.org/svn/reactos?rev=41623&view=rev Log: - Callback routine expects fdo - Fix boot Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri Jun 26 18:17:12 2009 @@ -158,9 +158,9 @@ /* initialize timer list */ InitializeListHead(&portcls_ext->TimerList); /* initialize io timer */ - IoInitializeTimer(PhysicalDeviceObject, PcIoTimerRoutine, NULL); + IoInitializeTimer(fdo, PcIoTimerRoutine, NULL); /* start the io timer */ - IoStartTimer(PhysicalDeviceObject); + IoStartTimer(fdo); /* set io flags */ fdo->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE;

1 0

[janderwald] 41622: - fix build broken in rev 41621
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 17:08:09 2009 New Revision: 41622 URL: http://svn.reactos.org/svn/reactos?rev=41622&view=rev Log: - fix build broken in rev 41621 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h 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] Fri Jun 26 17:08:09 2009 @@ -288,6 +288,12 @@ NTAPI NewIPortWavePciStream( OUT PPORTWAVEPCISTREAM *Stream); + +VOID +NTAPI +PcIoTimerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context); #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ @@ -338,6 +344,9 @@ LIST_ENTRY SubDeviceList; LIST_ENTRY PhysicalConnectionList; + LIST_ENTRY TimerList; + KSPIN_LOCK TimerListLock; + } PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; @@ -354,4 +363,11 @@ PIRP Irp; }CLOSESTREAM_CONTEXT, *PCLOSESTREAM_CONTEXT; +typedef struct +{ + LIST_ENTRY Entry; + PIO_TIMER_ROUTINE pTimerRoutine; + PVOID Context; +}TIMER_CONTEXT, *PTIMER_CONTEXT; + #endif

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
50
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 June 2009