Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 43864: - Make sure the socket is still open before entering oskittcp - Remove an unused parameter from OskitTCPBind - Return a status value from OskitTCPGetAddress - Add debug print for unhandled error codes
by cgutman＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: cgutman Date: Sat Oct 31 02:05:31 2009 New Revision: 43864 URL: http://svn.reactos.org/svn/reactos?rev=43864&view=rev Log: - Make sure the socket is still open before entering oskittcp - Remove an unused parameter from OskitTCPBind - Return a status value from OskitTCPGetAddress - Add debug print for unhandled error codes Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -90,7 +90,6 @@ TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, - Connection, &AddressToBind, sizeof(AddressToBind) ) ); 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 Oct 31 02:05:31 2009 @@ -555,7 +555,7 @@ } NTSTATUS TCPTranslateError( int OskitError ) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; switch( OskitError ) { case 0: Status = STATUS_SUCCESS; break; @@ -565,7 +565,10 @@ case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break; case OSK_EINPROGRESS: case OSK_EAGAIN: Status = STATUS_PENDING; break; - default: Status = STATUS_INVALID_CONNECTION; break; + default: + DbgPrint("OskitTCP returned unhandled error code: %d\n", OskitError); + Status = STATUS_INVALID_CONNECTION; + break; } TI_DbgPrint(DEBUG_TCP,("Error %d -> %x\n", OskitError, Status)); @@ -621,7 +624,6 @@ Status = TCPTranslateError ( OskitTCPBind( Connection->SocketContext, - Connection, &AddressToBind, sizeof(AddressToBind) ) ); @@ -703,6 +705,8 @@ DrainSignals(); Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) ); + if (Status == STATUS_SUCCESS) + Connection->SocketContext = NULL; TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status)); @@ -867,13 +871,15 @@ OSK_UINT LocalAddress, RemoteAddress; OSK_UI16 LocalPort, RemotePort; PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; + NTSTATUS Status; ASSERT_LOCKED(&TCPLock); - OskitTCPGetAddress - ( Connection->SocketContext, - &LocalAddress, &LocalPort, - &RemoteAddress, &RemotePort ); + Status = TCPTranslateError(OskitTCPGetAddress(Connection->SocketContext, + &LocalAddress, &LocalPort, + &RemoteAddress, &RemotePort)); + if (!NT_SUCCESS(Status)) + return Status; AddressIP->TAAddressCount = 1; AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; @@ -881,7 +887,7 @@ AddressIP->Address[0].Address[0].sin_port = GetRemote ? RemotePort : LocalPort; AddressIP->Address[0].Address[0].in_addr = GetRemote ? RemoteAddress : LocalAddress; - return STATUS_SUCCESS; + return Status; } VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) { Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -127,7 +127,7 @@ void *nam, OSK_UINT namelen ); extern int OskitTCPClose( void *socket ); -extern int OskitTCPBind( void *socket, void *connection, +extern int OskitTCPBind( void *socket, void *nam, OSK_UINT namelen ); extern int OskitTCPAccept( void *socket, void **new_socket, @@ -144,7 +144,7 @@ OSK_UINT *OutLen, OSK_UINT Flags ); -void OskitTCPGetAddress( void *socket, +int OskitTCPGetAddress( void *socket, OSK_UINT *LocalAddress, OSK_UI16 *LocalPort, OSK_UINT *RemoteAddress, Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 02:05:31 2009 @@ -76,9 +76,6 @@ void RegisterOskitTCPEventHandlers( POSKITTCP_EVENT_HANDLERS EventHandlers ) { memcpy( &OtcpEvent, EventHandlers, sizeof(OtcpEvent) ); - if( OtcpEvent.PacketSend ) - OS_DbgPrint(OSK_MID_TRACE,("SendPacket handler registered: %x\n", - OtcpEvent.PacketSend)); } void OskitDumpBuffer( OSK_PCHAR Data, OSK_UINT Len ) @@ -169,7 +166,7 @@ return error; } -int OskitTCPBind( void *socket, void *connection, +int OskitTCPBind( void *socket, void *nam, OSK_UINT namelen ) { int error = EFAULT; struct socket *so = socket; @@ -177,6 +174,9 @@ struct sockaddr addr; OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); + + if (!socket) + return OSK_ESHUTDOWN; if( nam ) addr = *((struct sockaddr *)nam); @@ -243,11 +243,18 @@ } int OskitTCPShutdown( void *socket, int disconn_type ) { + if (!socket) + return OSK_ESHUTDOWN; + return soshutdown( socket, disconn_type ); } int OskitTCPClose( void *socket ) { struct socket *so = socket; + + if (!socket) + return OSK_ESHUTDOWN; + so->so_connection = 0; soclose( so ); return 0; @@ -258,6 +265,9 @@ int error; struct uio uio; struct iovec iov; + + if (!socket) + return OSK_ESHUTDOWN; iov.iov_len = Len; iov.iov_base = (char *)Data; @@ -293,6 +303,12 @@ struct inpcb *inp; int namelen = 0, error = 0, s; + if (!socket) + return OSK_ESHUTDOWN; + + if (!new_socket || !AddrOut) + return OSK_EINVAL; + OS_DbgPrint(OSK_MID_TRACE,("OSKITTCP: Doing accept (Finish %d)\n", FinishAccepting)); @@ -436,6 +452,9 @@ { struct mbuf *m; + if (!socket) + return OSK_ESHUTDOWN; + if (size >= MLEN) return OSK_EINVAL; @@ -460,6 +479,9 @@ int error, oldsize = *size; struct mbuf *m; + if (!socket) + return OSK_ESHUTDOWN; + error = sogetopt(socket, level, optname, &m); if (!error) { @@ -482,6 +504,9 @@ int OskitTCPListen( void *socket, int backlog ) { int error; + if (!socket) + return OSK_ESHUTDOWN; + OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); error = solisten( socket, backlog ); OS_DbgPrint(OSK_MID_TRACE,("Ending: %08x\n", error)); @@ -489,32 +514,44 @@ return error; } -void OskitTCPSetAddress( void *socket, +int OskitTCPSetAddress( void *socket, OSK_UINT LocalAddress, OSK_UI16 LocalPort, OSK_UINT RemoteAddress, OSK_UI16 RemotePort ) { struct socket *so = socket; - struct inpcb *inp = (struct inpcb *)so->so_pcb; + struct inpcb *inp; + + if (!socket) + return OSK_ESHUTDOWN; + + inp = (struct inpcb *)so->so_pcb; inp->inp_laddr.s_addr = LocalAddress; inp->inp_lport = LocalPort; inp->inp_faddr.s_addr = RemoteAddress; inp->inp_fport = RemotePort; -} - -void OskitTCPGetAddress( void *socket, + + return 0; +} + +int OskitTCPGetAddress( void *socket, OSK_UINT *LocalAddress, OSK_UI16 *LocalPort, OSK_UINT *RemoteAddress, OSK_UI16 *RemotePort ) { struct socket *so = socket; - struct inpcb *inp = so ? (struct inpcb *)so->so_pcb : NULL; - if( inp ) { - *LocalAddress = inp->inp_laddr.s_addr; - *LocalPort = inp->inp_lport; - *RemoteAddress = inp->inp_faddr.s_addr; - *RemotePort = inp->inp_fport; - } + struct inpcb *inp; + + if (!socket) + return OSK_ESHUTDOWN; + + inp = (struct inpcb *)so->so_pcb; + *LocalAddress = inp->inp_laddr.s_addr; + *LocalPort = inp->inp_lport; + *RemoteAddress = inp->inp_faddr.s_addr; + *RemotePort = inp->inp_fport; + + return 0; } struct ifaddr *ifa_iffind(struct sockaddr *addr, int type)

1 0

[sginsberg] 43863: - Add 'simple' implementation of MmDbgCopyMemory to read/write virtual memory in a somewhat safe way (still no support for physical memory). Properly implement KdpCopyMemoryChunks as a wrapper around MmDbgCopyMemory and make most of the remaining unsafe copies use it instead of RtlCopyMemory. This fixes most of the remaining crashes during KD debugging as WinDbg/KD relies on the kernel support to handle bad addresses. - Stub out the remaining missing global variables for the d
by sginsberg＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: sginsberg Date: Sat Oct 31 02:02:35 2009 New Revision: 43863 URL: http://svn.reactos.org/svn/reactos?rev=43863&view=rev Log: - Add 'simple' implementation of MmDbgCopyMemory to read/write virtual memory in a somewhat safe way (still no support for physical memory). Properly implement KdpCopyMemoryChunks as a wrapper around MmDbgCopyMemory and make most of the remaining unsafe copies use it instead of RtlCopyMemory. This fixes most of the remaining crashes during KD debugging as WinDbg/KD relies on the kernel support to handle bad addresses. - Stub out the remaining missing global variables for the debugger data block -- fixes some cases of WinDbg failures and gives it a chance to handle errors instead of failing on a NULL read. Several of these variables are for functionality we don't yet implement, so I tried to put them where they are "least wrong". Everything besides the MmLoadedUserImageList variable is left unitialized -- KD should mostly be able to handle this properly. - Define correctly sized KDDEBUGGER_DATA64 for our kernel (needs to be done in a better way). Added: trunk/reactos/ntoskrnl/mm/mmdbg.c (with props) Modified: trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/kd64/i386/kdsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -285,7 +285,11 @@ USHORT Gdt64R3CmTeb; GCC_ULONG64 IopNumTriageDumpDataBlocks; GCC_ULONG64 IopTriageDumpDataBlocks; +#if 0 // Longhorn/Vista and later GCC_ULONG64 VfCrashDataBlock; + GCC_ULONG64 MmBadPagesDetected; + GCC_ULONG64 MmZeroedPageSingleBitErrorsDetected; +#endif } KDDEBUGGER_DATA64, *PKDDEBUGGER_DATA64; #endif Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -1057,6 +1057,8 @@ extern POBJECT_TYPE _IoFileObjectType; extern HAL_DISPATCH _HalDispatchTable; extern LIST_ENTRY IopErrorLogListHead; +extern ULONG IopNumTriageDumpDataBlocks; +extern PVOID IopTriageDumpDataBlocks[64]; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -294,6 +294,20 @@ NTAPI KdpSuspendAllBreakPoints( VOID +); + +// +// Safe memory read & write Support +// +NTSTATUS +NTAPI +KdpCopyMemoryChunks( + IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG TotalSize, + IN ULONG ChunkSize, + IN ULONG Flags, + OUT PULONG ActualSize OPTIONAL ); // Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -18,12 +18,32 @@ extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; +extern ULONG MmResidentAvailablePages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; + +extern LIST_ENTRY MmLoadedUserImageList; + +extern ULONG MmNumberOfPagingFiles; + +extern PVOID MmUnloadedDrivers; +extern PVOID MmLastUnloadedDrivers; +extern PVOID MmTriageActionTaken; +extern PVOID KernelVerifier; +extern MM_DRIVER_VERIFIER_DATA MmVerifierData; + +extern SIZE_T MmTotalCommitLimit; +extern SIZE_T MmTotalCommittedPages; +extern SIZE_T MmSharedCommit; +extern SIZE_T MmDriverCommit; +extern SIZE_T MmProcessCommit; +extern SIZE_T MmPagedPoolCommit; +extern SIZE_T MmPeakCommitment; +extern SIZE_T MmtotalCommitLimitMaximum; struct _KTRAP_FRAME; struct _EPROCESS; @@ -33,7 +53,7 @@ typedef ULONG PFN_TYPE, *PPFN_TYPE; // -//MmDbgCopyMemory Flags +// MmDbgCopyMemory Flags // #define MMDBG_COPY_WRITE 0x00000001 #define MMDBG_COPY_PHYSICAL 0x00000002 @@ -369,6 +389,20 @@ extern PMMPFN MmPfnDatabase; +typedef struct _MMPFNLIST +{ + PFN_NUMBER Total; + MMLISTS ListName; + PFN_NUMBER Flink; + PFN_NUMBER Blink; +} MMPFNLIST, *PMMPFNLIST; + +extern MMPFNLIST MmZeroedPageListHead; +extern MMPFNLIST MmFreePageListHead; +extern MMPFNLIST MmStandbyPageListHead; +extern MMPFNLIST MmModifiedPageListHead; +extern MMPFNLIST MmModifiedNoWritePageListHead; + typedef struct _MM_PAGEOP { /* Type of operation. */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -39,6 +39,8 @@ ULONG IoOtherOperationCount = 0; LARGE_INTEGER IoOtherTransferCount = {{0, 0}}; KSPIN_LOCK IoStatisticsLock = 0; +ULONG IopNumTriageDumpDataBlocks; +PVOID IopTriageDumpDataBlocks[64]; GENERIC_MAPPING IopFileMapping = { FILE_GENERIC_READ, Modified: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -160,7 +160,7 @@ Length); /* Return status */ - return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + return *ActualLength != 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -182,7 +182,7 @@ Length); /* Return status */ - return (*ActualLength != 0) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + return *ActualLength != 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } NTSTATUS @@ -209,12 +209,13 @@ (ULONG_PTR)&KiProcessorBlock[Processor]-> ProcessorState); - /* Copy the memory */ - RtlCopyMemory(Buffer, ControlStart, Length); - - /* Finish up */ - *ActualLength = Length; - return STATUS_SUCCESS; + /* Read the control state safely */ + return KdpCopyMemoryChunks((ULONG_PTR)Buffer, + ControlStart, + Length, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + ActualLength); } else { @@ -243,12 +244,13 @@ (ULONG_PTR)&KiProcessorBlock[Processor]-> ProcessorState); - /* Copy the memory */ - RtlCopyMemory(ControlStart, Buffer, Length); - - /* Finish up */ - *ActualLength = Length; - return STATUS_SUCCESS; + /* Write the control state safely */ + return KdpCopyMemoryChunks((ULONG_PTR)Buffer, + ControlStart, + Length, + 0, + MMDBG_COPY_UNSAFE, + ActualLength); } else { Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -24,65 +24,72 @@ IN ULONG Flags, OUT PULONG ActualSize OPTIONAL) { - ULONG Length; NTSTATUS Status; - - /* Check if this is physical or virtual copy */ - if (Flags & MMDBG_COPY_PHYSICAL) - { - /* Fail physical memory read/write for now */ - if (Flags & MMDBG_COPY_WRITE) - { - KdpDprintf("KdpCopyMemoryChunks: Failing write for Physical Address 0x%I64x Length: %x\n", - Address, - TotalSize); + ULONG RemainingLength, CopyChunk; + + /* Check if we didn't get a chunk size or if it is too big */ + if (ChunkSize == 0) + { + /* Default to 4 byte chunks */ + ChunkSize = 4; + } + else if (ChunkSize > MMDBG_COPY_MAX_SIZE) + { + /* Normalize to maximum size */ + ChunkSize = MMDBG_COPY_MAX_SIZE; + } + + /* Copy the whole range in page aligned chunks */ + RemainingLength = TotalSize; + CopyChunk = 1; + while (RemainingLength > 0) + { + /* + * Determine the best chunk size for this round. + * The ideal size is page aligned, isn't larger than the + * the remaining length and respects the chunk limit. + */ + while (((CopyChunk * 2) <= RemainingLength) && + (CopyChunk < ChunkSize) && + ((Address & ((CopyChunk * 2) - 1)) == 0)) + { + /* Increase it */ + CopyChunk = CopyChunk * 2; } - else - { - KdpDprintf("KdpCopyMemoryChunks: Failing read for Physical Address 0x%I64x Length: %x\n", - Address, - TotalSize); + + /* + * The chunk size can be larger than the remaining size if this isn't + * the first round, so check if we need to shrink it back + */ + while (CopyChunk > RemainingLength) + { + /* Shrink it */ + CopyChunk /= 2; } - /* Return an error */ - Length = 0; - Status = STATUS_UNSUCCESSFUL; - } - else - { - /* Protect against NULL */ - if (!Address) - { - if (ActualSize) *ActualSize = 0; - return STATUS_UNSUCCESSFUL; + /* Do the copy */ + Status = MmDbgCopyMemory(Address, + Buffer, + CopyChunk, + Flags); + if (!NT_SUCCESS(Status)) + { + /* Copy failed, break out */ + break; } - /* Check if this is read or write */ - if (Flags & MMDBG_COPY_WRITE) - { - /* Do the write */ - RtlCopyMemory((PVOID)(ULONG_PTR)Address, - Buffer, - TotalSize); - } - else - { - /* Do the read */ - RtlCopyMemory(Buffer, - (PVOID)(ULONG_PTR)Address, - TotalSize); - } - - /* Set size and status */ - Length = TotalSize; - Status = STATUS_SUCCESS; - } - - /* Return the actual length if requested */ - if (ActualSize) *ActualSize = Length; - - /* Return status */ - return Status; + /* Update pointers and length for the next run */ + Address = Address + CopyChunk; + Buffer = (PVOID)((ULONG_PTR)Buffer + CopyChunk); + RemainingLength = RemainingLength - CopyChunk; + } + + /* + * Return the size we managed to copy + * and return success if we could copy the whole range + */ + if (ActualSize) *ActualSize = TotalSize - RemainingLength; + return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } VOID @@ -269,7 +276,7 @@ IN PCONTEXT Context, IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange) { - USHORT InstructionCount; + ULONG InstructionCount; BOOLEAN HadBreakpoints; /* Setup common stuff available for all CPU architectures */ @@ -285,10 +292,12 @@ sizeof(DBGKD_ANY_CONTROL_REPORT)); /* Now copy the instruction stream and set the count */ - RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], - (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, - DBGKD_MAXSTREAM); - InstructionCount = DBGKD_MAXSTREAM; + KdpCopyMemoryChunks((ULONG_PTR)WaitStateChange->ProgramCounter, + &WaitStateChange->ControlReport.InstructionStream[0], + DBGKD_MAXSTREAM, + 0, + MMDBG_COPY_UNSAFE, + &InstructionCount); WaitStateChange->ControlReport.InstructionCount = InstructionCount; /* Clear all the breakpoints in this region */ @@ -299,9 +308,12 @@ if (HadBreakpoints) { /* Copy the instruction stream again, this time without breakpoints */ - RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], - (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, - WaitStateChange->ControlReport.InstructionCount); + KdpCopyMemoryChunks((ULONG_PTR)WaitStateChange->ProgramCounter, + &WaitStateChange->ControlReport.InstructionStream[0], + InstructionCount, + 0, + MMDBG_COPY_UNSAFE, + NULL); } } @@ -1297,6 +1309,7 @@ PSTRING ExtraData; STRING Data, Header; DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange; + ULONG PathNameLength; KCONTINUE_STATUS Status; /* Start wait loop */ @@ -1317,14 +1330,27 @@ WaitStateChange.u.LoadSymbols.CheckSum = SymbolInfo->CheckSum; WaitStateChange.u.LoadSymbols.SizeOfImage = SymbolInfo->SizeOfImage; - /* Check if we have a symbol name */ + /* Check if we have a path name */ if (PathName) { - /* Setup the information */ - WaitStateChange.u.LoadSymbols.PathNameLength = PathName->Length; - RtlCopyMemory(KdpPathBuffer, PathName->Buffer, PathName->Length); + /* Copy it to the path buffer */ + KdpCopyMemoryChunks((ULONG_PTR)PathName->Buffer, + KdpPathBuffer, + PathName->Length, + 0, + MMDBG_COPY_UNSAFE, + &PathNameLength); + + /* Null terminate */ + KdpPathBuffer[PathNameLength] = ANSI_NULL; + PathNameLength++; + + /* Set the path length */ + WaitStateChange.u.LoadSymbols.PathNameLength = PathNameLength; + + /* Set up the data */ Data.Buffer = KdpPathBuffer; - Data.Length = WaitStateChange.u.LoadSymbols.PathNameLength; + Data.Length = PathNameLength; ExtraData = &Data; } else Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -21,6 +21,7 @@ { KD_BREAKPOINT_TYPE Content; ULONG i; + NTSTATUS Status; /* Loop current breakpoints */ for (i = 0; i < KD_BREAKPOINT_MAX; i++) @@ -51,15 +52,39 @@ if (i == KD_BREAKPOINT_MAX) return 0; /* Save the old instruction */ - RtlCopyMemory(&Content, Address, KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE, + NULL); + + if (!NT_SUCCESS(Status)) + { + /* TODO: Set it as a owed breakpoint */ + KdpDprintf("Failed to set breakpoint at address 0x%p\n", Address); + return 0; + } /* Write the entry */ KdpBreakpointTable[i].Address = Address; KdpBreakpointTable[i].Content = Content; KdpBreakpointTable[i].Flags = KdpBreakpointActive; - /* Write the breakpoint and return the handle */ - RtlCopyMemory(Address, &KdpBreakpointInstruction, KD_BREAKPOINT_SIZE); + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); + } + + /* Return the breakpoint handle */ return i + 1; } @@ -67,6 +92,8 @@ NTAPI KdpLowWriteContent(IN ULONG BpIndex) { + NTSTATUS Status; + /* Make sure that the breakpoint is actually active */ if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointPending) { @@ -83,9 +110,20 @@ } /* We have an active breakpoint with an instruction to bring back. Do it. */ - RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, - &KdpBreakpointTable[BpIndex].Content, - KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. + Address, + &KdpBreakpointTable[BpIndex].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* TODO: Set it as a owed breakpoint */ + KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + return FALSE; + } /* Everything went fine, return */ return TRUE; @@ -95,6 +133,8 @@ NTAPI KdpLowRestoreBreakpoint(IN ULONG BpIndex) { + NTSTATUS Status; + /* Were we not able to remove it earlier? */ if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired) { @@ -111,9 +151,20 @@ } /* Ok, we actually have to overwrite the instruction now */ - RtlCopyMemory(KdpBreakpointTable[BpIndex].Address, - &KdpBreakpointInstruction, - KD_BREAKPOINT_SIZE); + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. + Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Set it as a owed breakpoint */ + KdpDprintf("Failed to restore breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + return FALSE; + } /* Clear any possible previous pending flag and return success */ KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -391,22 +391,22 @@ {(ULONG_PTR)&PsActiveProcessHead}, {(ULONG_PTR)&PspCidTable}, {(ULONG_PTR)&ExpSystemResourcesList}, - {0}, // ExpPagedPoolDescriptor - {0}, // ExpNumberOfPagedPools + {(ULONG_PTR)ExpPagedPoolDescriptor}, + {(ULONG_PTR)&ExpNumberOfPagedPools}, {(ULONG_PTR)&KeTimeIncrement}, {(ULONG_PTR)&KeBugcheckCallbackListHead}, {(ULONG_PTR)KiBugCheckData}, {(ULONG_PTR)&IopErrorLogListHead}, {(ULONG_PTR)&ObpRootDirectoryObject}, {(ULONG_PTR)&ObpTypeObjectType}, - {0}, // MmSystemCacheStart - {0}, // MmSystemCacheEnd - {0}, // MmSystemCacheWs + {(ULONG_PTR)&MmSystemCacheStart}, + {(ULONG_PTR)&MmSystemCacheEnd}, + {(ULONG_PTR)&MmSystemCacheWs}, {(ULONG_PTR)&MmPfnDatabase}, {(ULONG_PTR)MmSystemPtesStart}, {(ULONG_PTR)MmSystemPtesEnd}, - {0}, // MmSubsectionBase - {0}, // MmNumberOfPagingFiles + {(ULONG_PTR)&MmSubsectionBase}, + {(ULONG_PTR)&MmNumberOfPagingFiles}, {(ULONG_PTR)&MmLowestPhysicalPage}, {(ULONG_PTR)&MmHighestPhysicalPage}, {(ULONG_PTR)&MmNumberOfPhysicalPages}, @@ -419,21 +419,21 @@ {(ULONG_PTR)&MmPagedPoolInfo}, PAGE_SIZE, {(ULONG_PTR)&MmSizeOfPagedPoolInBytes}, - {0}, // MmTotalCommitLimit - {0}, // MmTotalCommittedPages - {0}, // MmSharedCommit - {0}, // MmDriverCommit - {0}, // MmProcessCommit - {0}, // MmPagedPoolCommit + {(ULONG_PTR)&MmTotalCommitLimit}, + {(ULONG_PTR)&MmTotalCommittedPages}, + {(ULONG_PTR)&MmSharedCommit}, + {(ULONG_PTR)&MmDriverCommit}, + {(ULONG_PTR)&MmProcessCommit}, + {(ULONG_PTR)&MmPagedPoolCommit}, {0}, - {0}, // MmZeroedPageListHead - {0}, // MmFreePageListHead - {0}, // MmStandbyPageListHead - {0}, // MmModifiedPageListHead - {0}, // MmModifiedNoWritePageListHead - {0}, // MmAvailablePages - {0}, // MmResidentAvailablePages - {0}, // PoolTrackTable + {(ULONG_PTR)&MmZeroedPageListHead}, + {(ULONG_PTR)&MmFreePageListHead}, + {(ULONG_PTR)&MmStandbyPageListHead}, + {(ULONG_PTR)&MmModifiedPageListHead}, + {(ULONG_PTR)&MmModifiedNoWritePageListHead}, + {(ULONG_PTR)&MmAvailablePages}, + {(ULONG_PTR)&MmResidentAvailablePages}, + {(ULONG_PTR)&PoolTrackTable}, {(ULONG_PTR)&NonPagedPoolDescriptor}, {(ULONG_PTR)&MmHighestUserAddress}, {(ULONG_PTR)&MmSystemRangeStart}, @@ -442,19 +442,19 @@ {(ULONG_PTR)KdPrintDefaultCircularBuffer + 1}, {(ULONG_PTR)&KdPrintWritePointer}, {(ULONG_PTR)&KdPrintRolloverCount}, - {0}, // MmLoadedUserImageList + {(ULONG_PTR)&MmLoadedUserImageList}, {(ULONG_PTR)&NtBuildLab}, {0}, {(ULONG_PTR)KiProcessorBlock}, - {0}, // MmUnloadedDrivers - {0}, // MmLastUnloadedDrivers - {0}, // MmTriageActionTaken - {0}, // MmSpecialPoolTag - {0}, // KernelVerifier - {0}, // MmVerifierData - {0}, // MmAllocatedNonPagedPool - {0}, // MmPeakCommitment - {0}, // MmtotalCommitLimitMaximum + {(ULONG_PTR)&MmUnloadedDrivers}, + {(ULONG_PTR)&MmLastUnloadedDrivers}, + {(ULONG_PTR)&MmTriageActionTaken}, + {(ULONG_PTR)&MmSpecialPoolTag}, + {(ULONG_PTR)&KernelVerifier}, + {(ULONG_PTR)&MmVerifierData}, + {(ULONG_PTR)&MmAllocatedNonPagedPool}, + {(ULONG_PTR)&MmPeakCommitment}, + {(ULONG_PTR)&MmtotalCommitLimitMaximum}, {(ULONG_PTR)&CmNtCSDVersion}, {(ULONG_PTR)&MmPhysicalMemoryBlock}, {(ULONG_PTR)&MmSessionBase}, @@ -539,6 +539,6 @@ 0, 0, #endif - {0}, // IopNumTriageDumpDataBlocks - {0}, // IopTriageDumpDataBlocks + {(ULONG_PTR)&IopNumTriageDumpDataBlocks}, + {(ULONG_PTR)IopTriageDumpDataBlocks}, }; Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -54,6 +54,9 @@ ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; +PVOID MmSystemCacheStart; +PVOID MmSystemCacheEnd; +MMSUPPORT MmSystemCacheWs; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -21,8 +21,11 @@ /* GLOBALS ********************************************************************/ +ULONG ExpNumberOfPagedPools; POOL_DESCRIPTOR NonPagedPoolDescriptor; +PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; PPOOL_DESCRIPTOR PoolVector[2]; +PVOID PoolTrackTable; PKGUARDED_MUTEX ExpPagedPoolMutex; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -216,6 +216,12 @@ ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; + + + +PVOID MmSystemCacheStart; +PVOID MmSystemCacheEnd; +MMSUPPORT MmSystemCacheWs; /* PRIVATE FUNCTIONS **********************************************************/ 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 Oct 31 02:02:35 2009 @@ -87,7 +87,10 @@ C_ASSERT(sizeof(POOL_HEADER) == 8); C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +extern ULONG ExpNumberOfPagedPools; extern POOL_DESCRIPTOR NonPagedPoolDescriptor; +extern PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1]; +extern PVOID PoolTrackTable; // // END FIXFIX @@ -156,6 +159,12 @@ extern PVOID MiSessionSpaceEnd; extern ULONG MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; +extern PVOID MmSystemCacheStart; +extern PVOID MmSystemCacheEnd; +extern MMSUPPORT MmSystemCacheWs; +extern SIZE_T MmAllocatedNonPagedPool; +extern ULONG_PTR MmSubsectionBase; +extern ULONG MmSpecialPoolTag; NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -24,6 +24,8 @@ PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; KGUARDED_MUTEX MmPagedPoolMutex; MM_PAGED_POOL_INFO MmPagedPoolInfo; +SIZE_T MmAllocatedNonPagedPool; +ULONG MmSpecialPoolTag; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -51,6 +51,22 @@ PPHYSICAL_PAGE MmPfnDatabase; ULONG MmAvailablePages; +ULONG MmResidentAvailablePages; + +SIZE_T MmTotalCommitLimit; +SIZE_T MmTotalCommittedPages; +SIZE_T MmSharedCommit; +SIZE_T MmDriverCommit; +SIZE_T MmProcessCommit; +SIZE_T MmPagedPoolCommit; +SIZE_T MmPeakCommitment; +SIZE_T MmtotalCommitLimitMaximum; + +MMPFNLIST MmZeroedPageListHead; +MMPFNLIST MmFreePageListHead; +MMPFNLIST MmStandbyPageListHead; +MMPFNLIST MmModifiedPageListHead; +MMPFNLIST MmModifiedNoWritePageListHead; /* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; Added: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c (added) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -1,0 +1,108 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/mmdbg.c + * PURPOSE: Memory Manager support routines for the Kernel Debugger + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MmDbgCopyMemory(IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG Size, + IN ULONG Flags) +{ + NTSTATUS Status; + + /* For now, this must be a "unsafe" copy */ + ASSERT(Flags & MMDBG_COPY_UNSAFE); + + /* We only handle 1, 2, 4 and 8 byte requests */ + if ((Size != 1) && + (Size != 2) && + (Size != 4) && + (Size != MMDBG_COPY_MAX_SIZE)) + { + /* Invalid size, fail */ + return STATUS_INVALID_PARAMETER_3; + } + + /* The copy must be aligned too */ + if ((Address & (Size - 1)) != 0) + { + /* Fail */ + return STATUS_INVALID_PARAMETER_3; + } + + /* No physical memory support yet */ + if (Flags & MMDBG_COPY_PHYSICAL) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing %s for Physical Address 0x%I64x\n", + Flags & MMDBG_COPY_WRITE ? "write" : "read", + Address); + return STATUS_UNSUCCESSFUL; + } + + /* Simple check for invalid address */ + if ((MiAddressToPde((ULONG_PTR)Address)->u.Hard.Valid == 0) || + (MiAddressToPte((ULONG_PTR)Address)->u.Hard.Valid == 0)) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing %s for invalid Address 0x%p\n", + Flags & MMDBG_COPY_WRITE ? "write" : "read", + (PVOID)(ULONG_PTR)Address); + return STATUS_UNSUCCESSFUL; + } + + /* If we are going to write to it then make sure it is writeable too */ + if ((Flags & MMDBG_COPY_WRITE) && + (!MI_IS_PAGE_WRITEABLE(MiAddressToPte((ULONG_PTR)Address)))) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing write for Address 0x%p\n", + (PVOID)(ULONG_PTR)Address); + return STATUS_UNSUCCESSFUL; + } + + /* Use SEH to try to catch anything else somewhat cleanly */ + _SEH2_TRY + { + /* Check if this is read or write */ + if (Flags & MMDBG_COPY_WRITE) + { + /* Do the write */ + RtlCopyMemory((PVOID)(ULONG_PTR)Address, + Buffer, + Size); + } + else + { + /* Do the read */ + RtlCopyMemory(Buffer, + (PVOID)(ULONG_PTR)Address, + Size); + } + + /* Copy succeeded */ + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Return status */ + return Status; +} Propchange: trunk/reactos/ntoskrnl/mm/mmdbg.c ------------------------------------------------------------------------------ svn:eol-style = native 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 Oct 31 02:02:35 2009 @@ -424,6 +424,9 @@ /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); + /* Initialize the user mode image list */ + InitializeListHead(&MmLoadedUserImageList); + /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -78,6 +78,7 @@ /* Number of paging files */ static ULONG MiPagingFileCount; +ULONG MmNumberOfPagingFiles; /* Number of pages that are available for swapping */ ULONG MiFreeSwapPages; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -70,6 +70,8 @@ /* GLOBALS *******************************************************************/ POBJECT_TYPE MmSectionObjectType = NULL; + +ULONG_PTR MmSubsectionBase; static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sat Oct 31 02:02:35 2009 @@ -28,10 +28,17 @@ /* GLOBALS *******************************************************************/ LIST_ENTRY PsLoadedModuleList; +LIST_ENTRY MmLoadedUserImageList; KSPIN_LOCK PsLoadedModuleSpinLock; ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; extern ULONG NtGlobalFlag; + +PVOID MmUnloadedDrivers; +PVOID MmLastUnloadedDrivers; +PVOID MmTriageActionTaken; +PVOID KernelVerifier; +MM_DRIVER_VERIFIER_DATA MmVerifierData; /* FUNCTIONS *****************************************************************/ 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 Oct 31 02:02:35 2009 @@ -405,6 +405,7 @@ <file>dbgpool.c</file> <file>freelist.c</file> <file>marea.c</file> + <file>mmdbg.c</file> <file>mmfault.c</file> <file>mminit.c</file> <file>mpw.c</file>

1 0

[sginsberg] 43862: - Clarify a check and don't cast KPCR->GDT to PKIPCR (spotted by Timo).
by sginsberg＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: sginsberg Date: Sat Oct 31 01:39:16 2009 New Revision: 43862 URL: http://svn.reactos.org/svn/reactos?rev=43862&view=rev Log: - Clarify a check and don't cast KPCR->GDT to PKIPCR (spotted by Timo). Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c [iso-8859-1] Sat Oct 31 01:39:16 2009 @@ -27,10 +27,10 @@ IN ULONG Offset, IN PKGDTENTRY Descriptor) { - /* Make sure the offset is inside the allowed range */ - if (!((Offset) < (KGDT_NUMBER * sizeof(KGDTENTRY)))) - { - /* It isn't, fail */ + /* Make sure the offset isn't outside the allowed range */ + if (Offset >= (KGDT_NUMBER * sizeof(KGDTENTRY))) + { + /* It is, fail */ return STATUS_ACCESS_VIOLATION; } @@ -46,7 +46,7 @@ { /* Get the descriptor entry from the GDT */ RtlCopyMemory(Descriptor, - (PCHAR)((PKIPCR)KeGetPcr()->GDT) + Offset, + (PVOID)(((ULONG_PTR)KeGetPcr()->GDT) + Offset), sizeof(KGDTENTRY)); /* Check if this is the TEB selector */

1 0

[cgutman] 43861: - Implement OskitTCPSetSockOpt and OskitTCPGetSockOpt (currently unused)
by cgutman＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: cgutman Date: Sat Oct 31 01:24:38 2009 New Revision: 43861 URL: http://svn.reactos.org/svn/reactos?rev=43861&view=rev Log: - Implement OskitTCPSetSockOpt and OskitTCPGetSockOpt (currently unused) Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskittcp.h [iso-8859-1] Sat Oct 31 01:24:38 2009 @@ -150,6 +150,18 @@ OSK_UINT *RemoteAddress, OSK_UI16 *RemotePort ); +int OskitTCPGetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int *size); + +int OskitTCPSetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int size); + #undef errno void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ); Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Oct 31 01:24:38 2009 @@ -428,6 +428,57 @@ /* The buffer Ip is freed by tcp_input */ } +int OskitTCPSetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int size) +{ + struct mbuf *m; + + if (size >= MLEN) + return OSK_EINVAL; + + m = m_get(M_WAIT, MT_SOOPTS); + if (!m) + return OSK_ENOMEM; + + m->m_len = size; + + memcpy(m->m_data, buffer, size); + + /* m is freed by sosetopt */ + return sosetopt(socket, level, optname, m); +} + +int OskitTCPGetSockOpt(void *socket, + int level, + int optname, + char *buffer, + int *size) +{ + int error, oldsize = *size; + struct mbuf *m; + + error = sogetopt(socket, level, optname, &m); + if (!error) + { + *size = m->m_len; + + if (!buffer || oldsize < m->m_len) + { + m_freem(m); + return OSK_EINVAL; + } + + memcpy(buffer, m->m_data, m->m_len); + + m_freem(m); + } + + return error; +} + int OskitTCPListen( void *socket, int backlog ) { int error;

1 0

[sserapion] 43860: Please don't cast NULL to an integer type. Fixes building this module.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Sat Oct 31 00:51:29 2009 New Revision: 43860 URL: http://svn.reactos.org/svn/reactos?rev=43860&view=rev Log: Please don't cast NULL to an integer type. Fixes building this module. Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sat Oct 31 00:51:29 2009 @@ -688,13 +688,13 @@ if (ReadPwrScheme(uiID,&tmp)) { - if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,(DWORD)NULL,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,0,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS) { return FALSE; } swprintf(Buf,L"%i",uiID); - if (RegSetValueExW(hKey,szCurrentPowerPolicies,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) + if (RegSetValueExW(hKey,szCurrentPowerPolicies,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS) { RegCloseKey(hKey); if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL)) @@ -799,7 +799,7 @@ if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY)); RegCloseKey(hKey); return TRUE; } @@ -821,7 +821,7 @@ &hKey) != ERROR_SUCCESS) return; swprintf(Buf,L"%i",g_LastID); - RegSetValueExW(hKey,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); + RegSetValueExW(hKey,szLastID,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)); RegCloseKey(hKey); } @@ -845,8 +845,8 @@ if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szName,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); - RegSetValueExW(hKey,szDescription,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); + RegSetValueExW(hKey,szName,0,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR)); + RegSetValueExW(hKey,szDescription,0,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR)); RegCloseKey(hKey); return WritePwrPolicy(puiID,pPowerPolicy); } @@ -1143,13 +1143,13 @@ if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY)); RegCloseKey(hKey); swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID); if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS) { - RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); + RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY)); RegCloseKey(hKey); return TRUE; }

1 0

[cgutman] 43859: - Remove some junk code which does nothing but crash
by cgutman＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: cgutman Date: Sat Oct 31 00:39:13 2009 New Revision: 43859 URL: http://svn.reactos.org/svn/reactos?rev=43859&view=rev Log: - Remove some junk code which does nothing but crash Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Sat Oct 31 00:39:13 2009 @@ -824,19 +824,6 @@ register struct socket *so; register int how; { - if (so == NULL) - { - register struct protosw *pr = NULL; - - how++; - if (how & FREAD) - sorflush(so); - if (how & FWRITE) - return ((*pr->pr_usrreq)(so, PRU_SHUTDOWN, - (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)); - return (0); - } - register struct protosw *pr = so->so_proto; how++;

1 0

[sserapion] 43858: Fix warnings.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Sat Oct 31 00:02:03 2009 New Revision: 43858 URL: http://svn.reactos.org/svn/reactos?rev=43858&view=rev Log: Fix warnings. Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c [iso-8859-1] Sat Oct 31 00:02:03 2009 @@ -251,7 +251,7 @@ { int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; SendMessage(hStatusBar, WM_SIZE, wParam, lParam); - SendMessage(hStatusBar, SB_SETPARTS, 3, (int)&test); + SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); MoveWindow(hScrollbox, 56, 49, LOWORD(lParam) - 56, HIWORD(lParam) - 72, TRUE); //InvalidateRect(hwnd, NULL, TRUE); }

1 0

[sserapion] 43857: Remove unneeded casts. Fix build.
by sserapion＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sserapion Date: Fri Oct 30 23:47:30 2009 New Revision: 43857 URL: http://svn.reactos.org/svn/reactos?rev=43857&view=rev Log: Remove unneeded casts. Fix build. Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/font.c [iso-8859-1] Fri Oct 30 23:47:30 2009 @@ -647,7 +647,7 @@ v[2] = 0.0; z_value = 0.0f; - gluTessBeginPolygon(tess, (VOID *)*(INT *)&z_value); + gluTessBeginPolygon(tess, &z_value); for (loop = (DWORD) *p++; loop; --loop) { @@ -718,7 +718,7 @@ glNormal3f(0.0f, 0.0f, -1.0f); gluTessNormal(tess, 0.0F, 0.0F, -1.0F); - gluTessBeginPolygon(tess, (VOID *)*(INT *)&thickness); + gluTessBeginPolygon(tess, &thickness); for (loop = (DWORD) *p++; loop; --loop) {

1 0

[sginsberg] 43856: - Fix leftover
by sginsberg＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sginsberg Date: Fri Oct 30 23:15:50 2009 New Revision: 43856 URL: http://svn.reactos.org/svn/reactos?rev=43856&view=rev Log: - Fix leftover Modified: trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Fri Oct 30 23:15:50 2009 @@ -249,7 +249,7 @@ IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, IN PCI_SLOT_NUMBER SlotNumber, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length ); @@ -260,7 +260,7 @@ IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, IN PCI_SLOT_NUMBER SlotNumber, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length );

1 0

[sginsberg] 43855: - Restructure HAL bus routines a bit. - Fix some incorrect HAL types and add some that were missing.
by sginsberg＠svn.reactos.org 30 Oct '09

30 Oct '09

Author: sginsberg Date: Fri Oct 30 23:07:26 2009 New Revision: 43855 URL: http://svn.reactos.org/svn/reactos?rev=43855&view=rev Log: - Restructure HAL bus routines a bit. - Fix some incorrect HAL types and add some that were missing. Added: trunk/reactos/hal/halx86/generic/bus/ (with props) trunk/reactos/hal/halx86/generic/bus/bushndlr.c (with props) trunk/reactos/hal/halx86/generic/bus/halbus.c - copied, changed from r43810, trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/bus/isabus.c (with props) trunk/reactos/hal/halx86/generic/bus/pcibus.c - copied, changed from r43810, trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/generic/bus/sysbus.c (with props) Removed: trunk/reactos/hal/halx86/generic/bus.c trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/hal/halx86/hal_generic_pc.rbuild trunk/reactos/hal/halx86/halxbox.rbuild trunk/reactos/include/ndk/haltypes.h Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Oct 30 23:07:26 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/generic/bus/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus.c (removed) @@ -1,356 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus.c - * PURPOSE: Bus Support Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -ULONG HalpBusType; - -/* PRIVATE FUNCTIONS *********************************************************/ - -VOID -NTAPI -HalpRegisterKdSupportFunctions(VOID) -{ - /* Register PCI Device Functions */ - KdSetupPciDeviceForDebugging = HalpSetupPciDeviceForDebugging; - KdReleasePciDeviceforDebugging = HalpReleasePciDeviceForDebugging; - - /* Register memory functions */ - KdMapPhysicalMemory64 = HalpMapPhysicalMemory64; - KdUnmapVirtualAddress = HalpUnmapVirtualAddress; - - /* Register ACPI stub */ - KdCheckPowerButton = HalpCheckPowerButton; -} - -NTSTATUS -NTAPI -HalpAssignSlotResources(IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - BUS_HANDLER BusHandler; - PAGED_CODE(); - - /* Only PCI is supported */ - if (BusType != PCIBus) return STATUS_NOT_IMPLEMENTED; - - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call the PCI function */ - return HalpAssignPCISlotResources(&BusHandler, - &BusHandler, - RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - SlotNumber, - AllocatedResources); -} - -BOOLEAN -NTAPI -HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress) -{ - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; -} - -ULONG -NTAPI -HalpGetSystemInterruptVector(IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptLevel); - *Irql = (KIRQL)VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - -BOOLEAN -NTAPI -HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress, - IN OUT PULONG_PTR Context, - IN BOOLEAN NextBus) -{ - /* Make sure we have a context */ - if (!Context) return FALSE; - - /* If we have data in the context, then this shouldn't be a new lookup */ - if ((*Context) && (NextBus == TRUE)) return FALSE; - - /* Return bus data */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - - /* Set context value and return success */ - *Context = 1; - return TRUE; -} - -VOID -NTAPI -HalpInitNonBusHandler(VOID) -{ - /* These should be written by the PCI driver later, but we give defaults */ - HalPciTranslateBusAddress = HalpTranslateBusAddress; - HalPciAssignSlotResources = HalpAssignSlotResources; - HalFindBusAddressTranslation = HalpFindBusAddressTranslation; -} - -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @implemented - */ -NTSTATUS -NTAPI -HalAdjustResourceList(IN PCM_RESOURCE_LIST Resources) -{ - /* Deprecated, return success */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -HalAssignSlotResources(IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject, - IN INTERFACE_TYPE BusType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - /* Check the bus type */ - if (BusType != PCIBus) - { - /* Call our internal handler */ - return HalpAssignSlotResources(RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - BusType, - BusNumber, - SlotNumber, - AllocatedResources); - } - else - { - /* Call the PCI registered function */ - return HalPciAssignSlotResources(RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - PCIBus, - BusNumber, - SlotNumber, - AllocatedResources); - } -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetBusData(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) -{ - /* Call the extended function */ - return HalGetBusDataByOffset(BusDataType, - BusNumber, - SlotNumber, - Buffer, - 0, - Length); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpGetCmosData(0, SlotNumber, Buffer, Length); - } - else if (BusDataType == EisaConfiguration) - { - /* FIXME: TODO */ - ASSERT(FALSE); - } - else if ((BusDataType == PCIConfiguration) && - (HalpPCIConfigInitialized) && - ((BusNumber >= HalpMinPciBus) && (BusNumber <= HalpMaxPciBus))) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpGetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; -} - -/* - * @implemented - */ -ULONG -NTAPI -HalGetInterruptVector(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - /* Call the system bus translator */ - return HalpGetSystemInterruptVector(BusNumber, - BusInterruptLevel, - BusInterruptVector, - Irql, - Affinity); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalSetBusData(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) -{ - /* Call the extended function */ - return HalSetBusDataByOffset(BusDataType, - BusNumber, - SlotNumber, - Buffer, - 0, - Length); -} - -/* - * @implemented - */ -ULONG -NTAPI -HalSetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - - /* Look as the bus type */ - if (BusDataType == Cmos) - { - /* Call CMOS Function */ - return HalpSetCmosData(0, SlotNumber, Buffer, Length); - } - else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized)) - { - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call PCI function */ - return HalpSetPCIData(&BusHandler, - &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, - Buffer, - Offset, - Length); - } - - /* Invalid bus */ - return 0; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -HalTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress) -{ - /* Look as the bus type */ - if (InterfaceType == PCIBus) - { - /* Call the PCI registered function */ - return HalPciTranslateBusAddress(PCIBus, - BusNumber, - BusAddress, - AddressSpace, - TranslatedAddress); - } - else - { - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; - } -} - -/* EOF */ Added: trunk/reactos/hal/halx86/generic/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/bus… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/bushndlr.c (added) +++ trunk/reactos/hal/halx86/generic/bus/bushndlr.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/bushndlr.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/bushndlr.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/generic/bus/halbus.c (from r43810, trunk/reactos/hal/halx86/generic/bus.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/hal… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/halbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bus.c + * FILE: hal/halx86/generic/bus/halbus.c * PURPOSE: Bus Support Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Added: trunk/reactos/hal/halx86/generic/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/isa… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/isabus.c (added) +++ trunk/reactos/hal/halx86/generic/bus/isabus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/isabus.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/isabus.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/generic/bus/pcibus.c (from r43810, trunk/reactos/hal/halx86/generic/pci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/pci.c + * FILE: hal/halx86/generic/bus/pcibus.c * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -98,9 +98,10 @@ NULL, &HalpFakePciBusData, 0, + NULL, {0, 0, 0, 0}, - HalpGetPCIData, - HalpSetPCIData, + (PGETSETBUSDATA)HalpGetPCIData, + (PGETSETBUSDATA)HalpSetPCIData, NULL, HalpAssignPCISlotResources, NULL, @@ -338,7 +339,7 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { @@ -404,7 +405,7 @@ /* Update buffer and offset, decrement total length */ Offset += Len; - Buffer += Len; + Buffer = (PVOID)((ULONG_PTR)Buffer + Len); Length -= Len; } @@ -429,7 +430,7 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, + IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { @@ -483,7 +484,7 @@ /* Update buffer and offset, decrement total length */ Offset += Len; - Buffer += Len; + Buffer = (PVOID)((ULONG_PTR)Buffer + Len); Length -= Len; } Added: trunk/reactos/hal/halx86/generic/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/sys… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/sysbus.c (added) +++ trunk/reactos/hal/halx86/generic/bus/sysbus.c [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -1,0 +1,7 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/bus/sysbus.c + * PURPOSE: + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ Propchange: trunk/reactos/hal/halx86/generic/bus/sysbus.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c (removed) @@ -1,937 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/pci.c - * PURPOSE: PCI Bus Support (Configuration Space, Resource Allocation) - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -BOOLEAN HalpPCIConfigInitialized; -ULONG HalpMinPciBus, HalpMaxPciBus; -KSPIN_LOCK HalpPCIConfigLock; -PCI_CONFIG_HANDLER PCIConfigHandler; - -/* PCI Operation Matrix */ -UCHAR PCIDeref[4][4] = -{ - {0, 1, 2, 2}, // ULONG-aligned offset - {1, 1, 1, 1}, // UCHAR-aligned offset - {2, 1, 2, 2}, // USHORT-aligned offset - {1, 1, 1, 1} // UCHAR-aligned offset -}; - -/* Type 1 PCI Bus */ -PCI_CONFIG_HANDLER PCIConfigHandlerType1 = -{ - /* Synchronization */ - (FncSync)HalpPCISynchronizeType1, - (FncReleaseSync)HalpPCIReleaseSynchronzationType1, - - /* Read */ - { - (FncConfigIO)HalpPCIReadUlongType1, - (FncConfigIO)HalpPCIReadUcharType1, - (FncConfigIO)HalpPCIReadUshortType1 - }, - - /* Write */ - { - (FncConfigIO)HalpPCIWriteUlongType1, - (FncConfigIO)HalpPCIWriteUcharType1, - (FncConfigIO)HalpPCIWriteUshortType1 - } -}; - -/* Type 2 PCI Bus */ -PCI_CONFIG_HANDLER PCIConfigHandlerType2 = -{ - /* Synchronization */ - (FncSync)HalpPCISynchronizeType2, - (FncReleaseSync)HalpPCIReleaseSynchronizationType2, - - /* Read */ - { - (FncConfigIO)HalpPCIReadUlongType2, - (FncConfigIO)HalpPCIReadUcharType2, - (FncConfigIO)HalpPCIReadUshortType2 - }, - - /* Write */ - { - (FncConfigIO)HalpPCIWriteUlongType2, - (FncConfigIO)HalpPCIWriteUcharType2, - (FncConfigIO)HalpPCIWriteUshortType2 - } -}; - -PCIPBUSDATA HalpFakePciBusData = -{ - { - PCI_DATA_TAG, - PCI_DATA_VERSION, - HalpReadPCIConfig, - HalpWritePCIConfig, - NULL, - NULL, - {{{0, 0, 0}}}, - {0, 0, 0, 0} - }, - {{0, 0}}, - 32, -}; - -BUS_HANDLER HalpFakePciBusHandler = -{ - 1, - PCIBus, - PCIConfiguration, - 0, - NULL, - NULL, - &HalpFakePciBusData, - 0, - {0, 0, 0, 0}, - HalpGetPCIData, - HalpSetPCIData, - NULL, - HalpAssignPCISlotResources, - NULL, - NULL -}; - -/* TYPE 1 FUNCTIONS **********************************************************/ - -VOID -NTAPI -HalpPCISynchronizeType1(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE1_CFG_BITS PciCfg1) -{ - /* Setup the PCI Configuration Register */ - PciCfg1->u.AsULONG = 0; - PciCfg1->u.bits.BusNumber = BusHandler->BusNumber; - PciCfg1->u.bits.DeviceNumber = Slot.u.bits.DeviceNumber; - PciCfg1->u.bits.FunctionNumber = Slot.u.bits.FunctionNumber; - PciCfg1->u.bits.Enable = TRUE; - - /* Acquire the lock */ - *Irql = KfRaiseIrql(HIGH_LEVEL); - KiAcquireSpinLock(&HalpPCIConfigLock); -} - -VOID -NTAPI -HalpPCIReleaseSynchronzationType1(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) -{ - PCI_TYPE1_CFG_BITS PciCfg1; - - /* Clear the PCI Configuration Register */ - PciCfg1.u.AsULONG = 0; - WRITE_PORT_ULONG(((PPCIPBUSDATA)BusHandler->BusData)->Config.Type1.Address, - PciCfg1.u.AsULONG); - - /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KfLowerIrql(Irql); -} - -TYPE1_READ(HalpPCIReadUcharType1, UCHAR) -TYPE1_READ(HalpPCIReadUshortType1, USHORT) -TYPE1_READ(HalpPCIReadUlongType1, ULONG) -TYPE1_WRITE(HalpPCIWriteUcharType1, UCHAR) -TYPE1_WRITE(HalpPCIWriteUshortType1, USHORT) -TYPE1_WRITE(HalpPCIWriteUlongType1, ULONG) - -/* TYPE 2 FUNCTIONS **********************************************************/ - -VOID -NTAPI -HalpPCISynchronizeType2(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PKIRQL Irql, - IN PPCI_TYPE2_ADDRESS_BITS PciCfg) -{ - PCI_TYPE2_CSE_BITS PciCfg2Cse; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - - /* Setup the configuration register */ - PciCfg->u.AsUSHORT = 0; - PciCfg->u.bits.Agent = (USHORT)Slot.u.bits.DeviceNumber; - PciCfg->u.bits.AddressBase = (USHORT)BusData->Config.Type2.Base; - - /* Acquire the lock */ - *Irql = KfRaiseIrql(HIGH_LEVEL); - KiAcquireSpinLock(&HalpPCIConfigLock); - - /* Setup the CSE Register */ - PciCfg2Cse.u.AsUCHAR = 0; - PciCfg2Cse.u.bits.Enable = TRUE; - PciCfg2Cse.u.bits.FunctionNumber = (UCHAR)Slot.u.bits.FunctionNumber; - PciCfg2Cse.u.bits.Key = -1; - - /* Write the bus number and CSE */ - WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, - (UCHAR)BusHandler->BusNumber); - WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR); -} - -VOID -NTAPI -HalpPCIReleaseSynchronizationType2(IN PBUS_HANDLER BusHandler, - IN KIRQL Irql) -{ - PCI_TYPE2_CSE_BITS PciCfg2Cse; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - - /* Clear CSE and bus number */ - PciCfg2Cse.u.AsUCHAR = 0; - WRITE_PORT_UCHAR(BusData->Config.Type2.CSE, PciCfg2Cse.u.AsUCHAR); - WRITE_PORT_UCHAR(BusData->Config.Type2.Forward, 0); - - /* Release the lock */ - KiReleaseSpinLock(&HalpPCIConfigLock); - KfLowerIrql(Irql); -} - -TYPE2_READ(HalpPCIReadUcharType2, UCHAR) -TYPE2_READ(HalpPCIReadUshortType2, USHORT) -TYPE2_READ(HalpPCIReadUlongType2, ULONG) -TYPE2_WRITE(HalpPCIWriteUcharType2, UCHAR) -TYPE2_WRITE(HalpPCIWriteUshortType2, USHORT) -TYPE2_WRITE(HalpPCIWriteUlongType2, ULONG) - -/* PCI CONFIGURATION SPACE ***************************************************/ - -VOID -NTAPI -HalpPCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length, - IN FncConfigIO *ConfigIO) -{ - KIRQL OldIrql; - ULONG i; - UCHAR State[20]; - - /* Synchronize the operation */ - PCIConfigHandler.Synchronize(BusHandler, Slot, &OldIrql, State); - - /* Loop every increment */ - while (Length) - { - /* Find out the type of read/write we need to do */ - i = PCIDeref[Offset % sizeof(ULONG)][Length % sizeof(ULONG)]; - - /* Do the read/write and return the number of bytes */ - i = ConfigIO[i]((PPCIPBUSDATA)BusHandler->BusData, - State, - Buffer, - Offset); - - /* Increment the buffer position and offset, and decrease the length */ - Offset += i; - Buffer += i; - Length -= i; - } - - /* Release the lock and PCI bus */ - PCIConfigHandler.ReleaseSynchronzation(BusHandler, OldIrql); -} - -VOID -NTAPI -HalpReadPCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - /* Validate the PCI Slot */ - if (!HalpValidPCISlot(BusHandler, Slot)) - { - /* Fill the buffer with invalid data */ - RtlFillMemory(Buffer, Length, -1); - } - else - { - /* Send the request */ - HalpPCIConfig(BusHandler, - Slot, - Buffer, - Offset, - Length, - PCIConfigHandler.ConfigRead); - } -} - -VOID -NTAPI -HalpWritePCIConfig(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - /* Validate the PCI Slot */ - if (HalpValidPCISlot(BusHandler, Slot)) - { - /* Send the request */ - HalpPCIConfig(BusHandler, - Slot, - Buffer, - Offset, - Length, - PCIConfigHandler.ConfigWrite); - } -} - -BOOLEAN -NTAPI -HalpValidPCISlot(IN PBUS_HANDLER BusHandler, - IN PCI_SLOT_NUMBER Slot) -{ - PCI_SLOT_NUMBER MultiSlot; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)BusHandler->BusData; - UCHAR HeaderType; - ULONG Device; - - /* Simple validation */ - if (Slot.u.bits.Reserved) return FALSE; - if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; - - /* Function 0 doesn't need checking */ - if (!Slot.u.bits.FunctionNumber) return TRUE; - - /* Functions 0+ need Multi-Function support, so check the slot */ - Device = Slot.u.bits.DeviceNumber; - MultiSlot = Slot; - MultiSlot.u.bits.FunctionNumber = 0; - - /* Send function 0 request to get the header back */ - HalpReadPCIConfig(BusHandler, - MultiSlot, - &HeaderType, - FIELD_OFFSET(PCI_COMMON_CONFIG, HeaderType), - sizeof(UCHAR)); - - /* Now make sure the header is multi-function */ - if (!(HeaderType & PCI_MULTIFUNCTION) || (HeaderType == 0xFF)) return FALSE; - return TRUE; -} - -/* HAL PCI CALLBACKS *********************************************************/ - -ULONG -NTAPI -HalpGetPCIData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; - PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; - ULONG Len = 0; - -#ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) - { - DPRINT("Blacklisted PCI slot\n"); - if (0 == Offset && 2 <= Length) - { - *(PUSHORT)Buffer = PCI_INVALID_VENDORID; - return 2; - } - return 0; - } -#endif - - /* Normalize the length */ - if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); - - /* Check if this is a vendor-specific read */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read the header */ - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG)); - - /* Make sure the vendor is valid */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - } - else - { - /* Read the entire header */ - Len = PCI_COMMON_HDR_LENGTH; - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len); - - /* Validate the vendor ID */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) - { - /* It's invalid, but we want to return this much */ - PciConfig->VendorID = PCI_INVALID_VENDORID; - Len = sizeof(USHORT); - } - - /* Now check if there's space left */ - if (Len < Offset) return 0; - - /* There is, so return what's after the offset and normalize */ - Len -= Offset; - if (Len > Length) Len = Length; - - /* Copy the data into the caller's buffer */ - RtlMoveMemory(Buffer, PciBuffer + Offset, Len); - - /* Update buffer and offset, decrement total length */ - Offset += Len; - Buffer += Len; - Length -= Len; - } - - /* Now we still have something to copy */ - if (Length) - { - /* Check if it's vendor-specific data */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read it now */ - HalpReadPCIConfig(BusHandler, Slot, Buffer, Offset, Length); - Len += Length; - } - } - - /* Update the total length read */ - return Len; -} - -ULONG -NTAPI -HalpSetPCIData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, - IN PUCHAR Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; - PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; - ULONG Len = 0; - -#ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) - { - DPRINT1("Trying to set data on blacklisted PCI slot\n"); - return 0; - } -#endif - - /* Normalize the length */ - if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); - - /* Check if this is a vendor-specific read */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read the header */ - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, sizeof(ULONG)); - - /* Make sure the vendor is valid */ - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - } - else - { - /* Read the entire header and validate the vendor ID */ - Len = PCI_COMMON_HDR_LENGTH; - HalpReadPCIConfig(BusHandler, Slot, PciConfig, 0, Len); - if (PciConfig->VendorID == PCI_INVALID_VENDORID) return 0; - - /* Return what's after the offset and normalize */ - Len -= Offset; - if (Len > Length) Len = Length; - - /* Copy the specific caller data */ - RtlMoveMemory(PciBuffer + Offset, Buffer, Len); - - /* Write the actual configuration data */ - HalpWritePCIConfig(BusHandler, Slot, PciBuffer + Offset, Offset, Len); - - /* Update buffer and offset, decrement total length */ - Offset += Len; - Buffer += Len; - Length -= Len; - } - - /* Now we still have something to copy */ - if (Length) - { - /* Check if it's vendor-specific data */ - if (Offset >= PCI_COMMON_HDR_LENGTH) - { - /* Read it now */ - HalpWritePCIConfig(BusHandler, Slot, Buffer, Offset, Length); - Len += Length; - } - } - - /* Update the total length read */ - return Len; -} - -NTSTATUS -NTAPI -HalpSetupPciDeviceForDebugging(IN PVOID LoaderBlock, - IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HalpReleasePciDeviceForDebugging(IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice) -{ - DPRINT1("Unimplemented!\n"); - return STATUS_NOT_IMPLEMENTED; -} - -static ULONG NTAPI -PciSize(ULONG Base, ULONG Mask) -{ - ULONG Size = Mask & Base; /* Find the significant bits */ - Size = Size & ~(Size - 1); /* Get the lowest of them to find the decode size */ - return Size; -} - -NTSTATUS -NTAPI -HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PUNICODE_STRING RegistryPath, - IN PUNICODE_STRING DriverClassName OPTIONAL, - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT DeviceObject OPTIONAL, - IN ULONG Slot, - IN OUT PCM_RESOURCE_LIST *AllocatedResources) -{ - PCI_COMMON_CONFIG PciConfig; - SIZE_T Address; - SIZE_T ResourceCount; - ULONG Size[PCI_TYPE0_ADDRESSES]; - NTSTATUS Status = STATUS_SUCCESS; - UCHAR Offset; - PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - PCI_SLOT_NUMBER SlotNumber; - ULONG WriteBuffer; - - /* FIXME: Should handle 64-bit addresses */ - - /* Read configuration data */ - SlotNumber.u.AsULONG = Slot; - HalpReadPCIConfig(BusHandler, SlotNumber, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); - - /* Check if we read it correctly */ - if (PciConfig.VendorID == PCI_INVALID_VENDORID) - return STATUS_NO_SUCH_DEVICE; - - /* Read the PCI configuration space for the device and store base address and - size information in temporary storage. Count the number of valid base addresses */ - ResourceCount = 0; - for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) - { - if (0xffffffff == PciConfig.u.type0.BaseAddresses[Address]) - PciConfig.u.type0.BaseAddresses[Address] = 0; - - /* Memory resource */ - if (0 != PciConfig.u.type0.BaseAddresses[Address]) - { - ResourceCount++; - - Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); - - /* Write 0xFFFFFFFF there */ - WriteBuffer = 0xffffffff; - HalpWritePCIConfig(BusHandler, SlotNumber, &WriteBuffer, Offset, sizeof(ULONG)); - - /* Read that figure back from the config space */ - HalpReadPCIConfig(BusHandler, SlotNumber, &Size[Address], Offset, sizeof(ULONG)); - - /* Write back initial value */ - HalpWritePCIConfig(BusHandler, SlotNumber, &PciConfig.u.type0.BaseAddresses[Address], Offset, sizeof(ULONG)); - } - } - - /* Interrupt resource */ - if (0 != PciConfig.u.type0.InterruptLine) - ResourceCount++; - - /* Allocate output buffer and initialize */ - *AllocatedResources = ExAllocatePoolWithTag( - PagedPool, - sizeof(CM_RESOURCE_LIST) + - (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - ' laH'); - - if (NULL == *AllocatedResources) - return STATUS_NO_MEMORY; - - (*AllocatedResources)->Count = 1; - (*AllocatedResources)->List[0].InterfaceType = PCIBus; - (*AllocatedResources)->List[0].BusNumber = BusHandler->BusNumber; - (*AllocatedResources)->List[0].PartialResourceList.Version = 1; - (*AllocatedResources)->List[0].PartialResourceList.Revision = 1; - (*AllocatedResources)->List[0].PartialResourceList.Count = ResourceCount; - Descriptor = (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors; - - /* Store configuration information */ - for (Address = 0; Address < PCI_TYPE0_ADDRESSES; Address++) - { - if (0 != PciConfig.u.type0.BaseAddresses[Address]) - { - if (/*PCI_BASE_ADDRESS_SPACE_MEMORY*/ 0 == - (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) - { - Descriptor->Type = CmResourceTypeMemory; - Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ - Descriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; /* FIXME Just a guess */ - Descriptor->u.Memory.Start.QuadPart = (PciConfig.u.type0.BaseAddresses[Address] & PCI_ADDRESS_MEMORY_ADDRESS_MASK); - Descriptor->u.Memory.Length = PciSize(Size[Address], PCI_ADDRESS_MEMORY_ADDRESS_MASK); - } - else if (PCI_ADDRESS_IO_SPACE == - (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) - { - Descriptor->Type = CmResourceTypePort; - Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; /* FIXME I have no idea... */ - Descriptor->Flags = CM_RESOURCE_PORT_IO; /* FIXME Just a guess */ - Descriptor->u.Port.Start.QuadPart = PciConfig.u.type0.BaseAddresses[Address] &= PCI_ADDRESS_IO_ADDRESS_MASK; - Descriptor->u.Port.Length = PciSize(Size[Address], PCI_ADDRESS_IO_ADDRESS_MASK & 0xffff); - } - else - { - ASSERT(FALSE); - return STATUS_UNSUCCESSFUL; - } - Descriptor++; - } - } - - if (0 != PciConfig.u.type0.InterruptLine) - { - Descriptor->Type = CmResourceTypeInterrupt; - Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a guess */ - Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; /* FIXME Just a guess */ - Descriptor->u.Interrupt.Level = PciConfig.u.type0.InterruptLine; - Descriptor->u.Interrupt.Vector = PciConfig.u.type0.InterruptLine; - Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; - - Descriptor++; - } - - ASSERT(Descriptor == (*AllocatedResources)->List[0].PartialResourceList.PartialDescriptors + ResourceCount); - - /* FIXME: Should store the resources in the registry resource map */ - - return Status; -} - -ULONG -NTAPI -HaliPciInterfaceReadConfig(IN PBUS_HANDLER RootBusHandler, - IN ULONG BusNumber, - IN PCI_SLOT_NUMBER SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - BUS_HANDLER BusHandler; - PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)Buffer; - - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Read configuration data */ - HalpReadPCIConfig(&BusHandler, SlotNumber, Buffer, Offset, Length); - - /* Check if caller only wanted at least Vendor ID */ - if (Length >= 2) - { - /* Validate it */ - if (PciData->VendorID != PCI_INVALID_VENDORID) - { - /* Check if this is the new maximum bus number */ - if (HalpMaxPciBus < BusHandler.BusNumber) - { - /* Set it */ - HalpMaxPciBus = BusHandler.BusNumber; - } - } - } - - /* Return length */ - return Length; -} - -PPCI_REGISTRY_INFO_INTERNAL -NTAPI -HalpQueryPciRegistryInfo(VOID) -{ - WCHAR NameBuffer[8]; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ConfigName, IdentName; - HANDLE KeyHandle, BusKeyHandle; - NTSTATUS Status; - UCHAR KeyBuffer[sizeof(PPCI_REGISTRY_INFO) + 100]; - PKEY_VALUE_FULL_INFORMATION ValueInfo = (PVOID)KeyBuffer; - ULONG ResultLength; - PWSTR Tag; - ULONG i; - PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - PPCI_REGISTRY_INFO PciRegInfo; - PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; - - /* Setup the object attributes for the key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\Hardware\\Description\\" - L"System\\MultiFunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* Open the key */ - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return NULL; - - /* Setup the receiving string */ - KeyName.Buffer = NameBuffer; - KeyName.MaximumLength = sizeof(NameBuffer); - - /* Setup the configuration and identifier key names */ - RtlInitUnicodeString(&ConfigName, L"ConfigurationData"); - RtlInitUnicodeString(&IdentName, L"Identifier"); - - /* Keep looping for each ID */ - for (i = 0; TRUE; i++) - { - /* Setup the key name */ - RtlIntegerToUnicodeString(i, 10, &KeyName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - - /* Open it */ - Status = ZwOpenKey(&BusKeyHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* None left, fail */ - ZwClose(KeyHandle); - return NULL; - } - - /* Read the registry data */ - Status = ZwQueryValueKey(BusKeyHandle, - &IdentName, - KeyValueFullInformation, - ValueInfo, - sizeof(KeyBuffer), - &ResultLength); - if (!NT_SUCCESS(Status)) - { - /* Failed, try the next one */ - ZwClose(BusKeyHandle); - continue; - } - - /* Get the PCI Tag and validate it */ - Tag = (PWSTR)((ULONG_PTR)ValueInfo + ValueInfo->DataOffset); - if ((Tag[0] != L'P') || - (Tag[1] != L'C') || - (Tag[2] != L'I') || - (Tag[3])) - { - /* Not a valid PCI entry, skip it */ - ZwClose(BusKeyHandle); - continue; - } - - /* Now read our PCI structure */ - Status = ZwQueryValueKey(BusKeyHandle, - &ConfigName, - KeyValueFullInformation, - ValueInfo, - sizeof(KeyBuffer), - &ResultLength); - ZwClose(BusKeyHandle); - if (!NT_SUCCESS(Status)) continue; - - /* We read it OK! Get the actual resource descriptors */ - FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR) - ((ULONG_PTR)ValueInfo + ValueInfo->DataOffset); - PartialDescriptor = (PCM_PARTIAL_RESOURCE_DESCRIPTOR) - ((ULONG_PTR)FullDescriptor-> - PartialResourceList.PartialDescriptors); - - /* Check if this is our PCI Registry Information */ - if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) - { - /* Close the key */ - ZwClose(KeyHandle); - - /* FIXME: Check PnP\PCI\CardList */ - - /* Get the PCI information */ - PciRegInfo = (PPCI_REGISTRY_INFO)(PartialDescriptor + 1); - - /* Allocate the return structure */ - PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PCI_REGISTRY_INFO_INTERNAL), - ' laH'); - if (!PciRegistryInfo) return NULL; - - /* Fill it out */ - PciRegistryInfo->HardwareMechanism = PciRegInfo->HardwareMechanism; - PciRegistryInfo->NoBuses = PciRegInfo->NoBuses; - PciRegistryInfo->MajorRevision = PciRegInfo->MajorRevision; - PciRegistryInfo->MinorRevision = PciRegInfo->MinorRevision; - PciRegistryInfo->ElementCount = 0; - } - } -} - -VOID -NTAPI -HalpInitializePciStubs(VOID) -{ - PPCI_REGISTRY_INFO_INTERNAL PciRegistryInfo; - UCHAR PciType; - PPCIPBUSDATA BusData = (PPCIPBUSDATA)HalpFakePciBusHandler.BusData; - ULONG i; - PCI_SLOT_NUMBER j; - ULONG VendorId = 0; - - /* Query registry information */ - PciRegistryInfo = HalpQueryPciRegistryInfo(); - if (!PciRegistryInfo) - { - /* Assume type 1 */ - PciType = 1; - } - else - { - /* Get the type and free the info structure */ - PciType = PciRegistryInfo->HardwareMechanism & 0xF; - ExFreePool(PciRegistryInfo); - } - - /* Initialize the PCI lock */ - KeInitializeSpinLock(&HalpPCIConfigLock); - - /* Check the type of PCI bus */ - switch (PciType) - { - /* Type 1 PCI Bus */ - case 1: - - /* Copy the Type 1 handler data */ - RtlCopyMemory(&PCIConfigHandler, - &PCIConfigHandlerType1, - sizeof(PCIConfigHandler)); - - /* Set correct I/O Ports */ - BusData->Config.Type1.Address = PCI_TYPE1_ADDRESS_PORT; - BusData->Config.Type1.Data = PCI_TYPE1_DATA_PORT; - break; - - /* Type 2 PCI Bus */ - case 2: - - /* Copy the Type 1 handler data */ - RtlCopyMemory(&PCIConfigHandler, - &PCIConfigHandlerType2, - sizeof (PCIConfigHandler)); - - /* Set correct I/O Ports */ - BusData->Config.Type2.CSE = PCI_TYPE2_CSE_PORT; - BusData->Config.Type2.Forward = PCI_TYPE2_FORWARD_PORT; - BusData->Config.Type2.Base = PCI_TYPE2_ADDRESS_BASE; - - /* Only 16 devices supported, not 32 */ - BusData->MaxDevice = 16; - break; - - default: - - /* Invalid type */ - DbgPrint("HAL: Unnkown PCI type\n"); - } - - /* Loop all possible buses */ - for (i = 0; i < 256; i++) - { - /* Loop all devices */ - for (j.u.AsULONG = 0; j.u.AsULONG < 32; j.u.AsULONG++) - { - /* Query the interface */ - if (HaliPciInterfaceReadConfig(NULL, - i, - j, - &VendorId, - 0, - sizeof(ULONG))) - { - /* Validate the vendor ID */ - if ((USHORT)VendorId != PCI_INVALID_VENDORID) - { - /* Set this as the maximum ID */ - HalpMaxPciBus = i; - break; - } - } - } - } - - /* We're done */ - HalpPCIConfigInitialized = TRUE; -} - -VOID -NTAPI -HalpInitializePciBus(VOID) -{ - /* Initialize the stubs */ - HalpInitializePciStubs(); - - /* FIXME: Initialize NMI Crash Flag */ -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,9 +6,14 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>sysbus.c</file> + </directory> <file>beep.c</file> <file>bios.c</file> - <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> <file>drive.c</file> Modified: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,8 +6,13 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>sysbus.c</file> + </directory> <file>beep.c</file> - <file>bus.c</file> <file>cmos.c</file> <file>dma.c</file> <file>drive.c</file> Modified: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -6,7 +6,9 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="generic"> - <file>pci.c</file> + <directory name="bus"> + <file>pcibus.c</file> + </directory> </directory> </module> </group> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -11,7 +11,9 @@ <library>hal_generic_up</library> <library>ntoskrnl</library> <directory name="generic"> - <file>pci.c</file> + <directory name="bus"> + <file>pcibus.c</file> + </directory> </directory> <directory name="xbox"> <file>halinit_xbox.c</file> Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/haltypes.h [iso-8859-1] Fri Oct 30 23:07:26 2009 @@ -44,7 +44,7 @@ // typedef PBUS_HANDLER -(NTAPI *pHalHandlerForConfigSpace)( +(FASTCALL *pHalHandlerForConfigSpace)( IN BUS_DATA_TYPE ConfigSpace, IN ULONG BusNumber ); @@ -101,15 +101,15 @@ // typedef NTSTATUS -(NTAPI *pAdjustResourceList)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, - IN OUT PCM_RESOURCE_LIST Resources -); - -typedef -NTSTATUS -(NTAPI *pAssignSlotResources)( +(NTAPI *PADJUSTRESOURCELIST)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *Resources +); + +typedef +NTSTATUS +(NTAPI *PASSIGNSLOTRESOURCES)( IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN PUNICODE_STRING RegistryPath, @@ -122,20 +122,20 @@ typedef ULONG -(NTAPI *pGetSetBusData)( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - OUT PUCHAR Buffer, +(NTAPI *PGETSETBUSDATA)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN ULONG SlotNumber, + OUT PVOID Buffer, IN ULONG Offset, IN ULONG Length ); typedef ULONG -(NTAPI *pGetInterruptVector)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, +(NTAPI *PGETINTERRUPTVECTOR)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, IN ULONG BusInterruptLevel, IN ULONG BusInterruptVector, OUT PKIRQL Irql, @@ -143,10 +143,10 @@ ); typedef -ULONG -(NTAPI *pTranslateBusAddress)( - IN PBUS_HANDLER BusHandler, - IN ULONG BusNumber, +BOOLEAN +(NTAPI *PTRANSLATEBUSADDRESS)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress @@ -187,8 +187,37 @@ } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; // +// HAL Supported Range +// +#define HAL_SUPPORTED_RANGE_VERSION 1 +typedef struct _SUPPORTED_RANGE +{ + struct _SUPPORTED_RANGE *Next; + ULONG SystemAddressSpace; + LONGLONG SystemBase; + LONGLONG Base; + LONGLONG Limit; +} SUPPORTED_RANGE, *PSUPPORTED_RANGE; + +typedef struct _SUPPORTED_RANGES +{ + USHORT Version; + BOOLEAN Sorted; + UCHAR Reserved; + ULONG NoIO; + SUPPORTED_RANGE IO; + ULONG NoMemory; + SUPPORTED_RANGE Memory; + ULONG NoPrefetchMemory; + SUPPORTED_RANGE PrefetchMemory; + ULONG NoDma; + SUPPORTED_RANGE Dma; +} SUPPORTED_RANGES, *PSUPPORTED_RANGES; + +// // HAL Bus Handler // +#define HAL_BUS_HANDLER_VERSION 1 typedef struct _BUS_HANDLER { ULONG Version; @@ -199,15 +228,29 @@ struct _BUS_HANDLER *ParentHandler; PVOID BusData; ULONG DeviceControlExtensionSize; - //PSUPPORTED_RANGES BusAddresses; + PSUPPORTED_RANGES BusAddresses; ULONG Reserved[4]; - pGetSetBusData GetBusData; - pGetSetBusData SetBusData; - pAdjustResourceList AdjustResourceList; - pAssignSlotResources AssignSlotResources; - pGetInterruptVector GetInterruptVector; - pTranslateBusAddress TranslateBusAddress; + PGETSETBUSDATA GetBusData; + PGETSETBUSDATA SetBusData; + PADJUSTRESOURCELIST AdjustResourceList; + PASSIGNSLOTRESOURCES AssignSlotResources; + PGETINTERRUPTVECTOR GetInterruptVector; + PTRANSLATEBUSADDRESS TranslateBusAddress; + PVOID Spare1; + PVOID Spare2; + PVOID Spare3; + PVOID Spare4; + PVOID Spare5; + PVOID Spare6; + PVOID Spare7; + PVOID Spare8; } BUS_HANDLER; + +// +// HAL Chip Hacks +// +#define HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE 0x02 +#define HAL_PCI_CHIP_HACK_USB_SMI_DISABLE 0x08 // // Kernel Exports

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs