Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 23684: Dmitry Philippov: Implement SmProcessFileRenameList()
by fireball＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: fireball Date: Thu Aug 24 15:06:48 2006 New Revision: 23684 URL: http://svn.reactos.org/svn/reactos?rev=23684&view=rev Log: Dmitry Philippov: Implement SmProcessFileRenameList() Modified: trunk/reactos/base/system/smss/initmv.c Modified: trunk/reactos/base/system/smss/initmv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initmv.c?… ============================================================================== --- trunk/reactos/base/system/smss/initmv.c (original) +++ trunk/reactos/base/system/smss/initmv.c Thu Aug 24 15:06:48 2006 @@ -1,52 +1,455 @@ /* $Id$ * - * initmv.c - Process the file rename list - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. - * - * -------------------------------------------------------------------- + * PROJECT: ReactOS Operating System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/smss/initmv.c + * PURPOSE: Process the file rename list. + * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) + * UPDATE HISTORY: + * Created 13/08/2006 */ + - +/* INCLUDES ******************************************************************/ #include "smss.h" #define NDEBUG #include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +/*++ +* @name SmpDeleteFile +* +* The SmpDeleteFile function deletes a specify file. +* +* @param lpFileName +* the name of a file which should be deleted +* +* @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL +* othwerwise. +* +* @remarks +* This function is called by SmpMoveFilesQueryRoutine(). +* +* +*--*/ NTSTATUS -SmProcessFileRenameList(VOID) +SmpDeleteFile( IN LPCWSTR lpFileName ) { - DPRINT("SmProcessFileRenameList() called\n"); - - /* FIXME: implement it! */ -/* - * open HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\FileRenameOperations - * for each item in its value - * clone the old file in the new name, - * delete the source. - * - */ - - DPRINT("SmProcessFileRenameList() done\n"); - - return(STATUS_SUCCESS); + FILE_DISPOSITION_INFORMATION FileDispInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING FileNameU; + HANDLE FileHandle; + NTSTATUS Status; + + DPRINT("SmpDeleteFile ( %S )\n", lpFileName); + + if( !lpFileName ) + return (STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&FileNameU, lpFileName); + + InitializeObjectAttributes(&ObjectAttributes, + &FileNameU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile (&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + + RtlFreeUnicodeString(&FileNameU); + + if( !NT_SUCCESS(Status) ) { + DPRINT("NtCreateFile() failed (Status %lx)\n", Status); + return (Status); + } + + FileDispInfo.DeleteFile = TRUE; + + Status = NtSetInformationFile( + FileHandle, + &IoStatusBlock, + &FileDispInfo, + sizeof(FILE_DISPOSITION_INFORMATION), + FileDispositionInformation ); + + NtClose(FileHandle); + + return (Status); } + +/*++ +* @name SmpMoveFile +* +* The SmpMoveFile function deletes a specify file. +* +* @param lpExistingFileName +* the name of an existing file which should be removed +* +* @param lpNewFileName +* a new name of an existing file. +* +* @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL +* othwerwise. +* +* @remarks +* This function called from the SmpMoveFilesQueryRoutine function. +* +* +*--*/ +NTSTATUS +SmpMoveFile( IN LPCWSTR lpExistingFileName, + IN LPCWSTR lpNewFileName + ) +{ + PFILE_RENAME_INFORMATION FileRenameInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING ExistingFileNameU; + HANDLE FileHandle; + DWORD FileNameSize; + BOOLEAN ReplaceIfExists; + NTSTATUS Status; + + if( !lpExistingFileName || !lpNewFileName ) + return (STATUS_INVALID_PARAMETER); + + DPRINT("SmpMoveFile (%S, %S)\n", lpExistingFileName, lpNewFileName); + + RtlInitUnicodeString(&ExistingFileNameU, lpExistingFileName); + + InitializeObjectAttributes(&ObjectAttributes, + &ExistingFileNameU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile (&FileHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + + if( !NT_SUCCESS(Status) ) { + DPRINT("NtCreateFile() failed (Status %lx)\n", Status); + return (Status); + } + + FileNameSize = wcslen(lpNewFileName)*sizeof(*lpNewFileName); + FileRenameInfo = RtlAllocateHeap( + RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(FILE_RENAME_INFORMATION)+FileNameSize); + if( !FileRenameInfo ) { + DPRINT("RtlAllocateHeap failed\n"); + NtClose(FileHandle); + return (STATUS_NO_MEMORY); + } + + if( L'!' == *lpNewFileName ) { + lpNewFileName++; + FileNameSize -= sizeof(*lpNewFileName); + ReplaceIfExists = TRUE; + } + else { + ReplaceIfExists = FALSE; + } + + FileRenameInfo->RootDirectory = NULL; + FileRenameInfo->ReplaceIfExists = ReplaceIfExists; + FileRenameInfo->FileNameLength = FileNameSize; + RtlCopyMemory(FileRenameInfo->FileName, lpNewFileName, FileNameSize); + + Status = NtSetInformationFile( + FileHandle, + &IoStatusBlock, + FileRenameInfo, + sizeof(FILE_RENAME_INFORMATION)+FileNameSize, + FileRenameInformation ); + + RtlFreeHeap(RtlGetProcessHeap(), 0, FileRenameInfo); + + /* FIXME: After the FileRenameInformation parameter will be implemented into the fs driver + the following code can be removed */ + if( STATUS_NOT_IMPLEMENTED == Status ) + { + HANDLE FileHandleNew; + UNICODE_STRING NewFileNameU; + FILE_BASIC_INFORMATION FileBasicInfo; + UCHAR *lpBuffer = NULL; + SIZE_T RegionSize = 0x10000; + LARGE_INTEGER BytesCopied; + BOOL EndOfFileFound; + + Status = NtQueryInformationFile( + FileHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if( !NT_SUCCESS(Status) ) { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + return (Status); + } + + RtlInitUnicodeString(&NewFileNameU, lpNewFileName); + + InitializeObjectAttributes(&ObjectAttributes, + &NewFileNameU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile (&FileHandleNew, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + ReplaceIfExists ? FILE_OVERWRITE_IF : FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + + if( !NT_SUCCESS(Status) ) { + DPRINT("NtCreateFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + return (Status); + } + + Status = NtAllocateVirtualMemory( + NtCurrentProcess(), + (PVOID *)&lpBuffer, + 2, + &RegionSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if( !NT_SUCCESS(Status) ) { + DPRINT("NtAllocateVirtualMemory() failed (Status %lx)\n", Status); + NtClose(FileHandle); + SmpDeleteFile(lpNewFileName); + return (Status); + } + BytesCopied.QuadPart = 0; + EndOfFileFound = FALSE; + while( !EndOfFileFound + && NT_SUCCESS(Status) ) + { + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + lpBuffer, + RegionSize, + NULL, + NULL); + if( NT_SUCCESS(Status) ) { + Status = NtWriteFile(FileHandleNew, + NULL, + NULL, + NULL, + &IoStatusBlock, + lpBuffer, + IoStatusBlock.Information, + NULL, + NULL); + if( NT_SUCCESS(Status) ) { + BytesCopied.QuadPart += IoStatusBlock.Information; + } + else { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + } + } + else { + if( STATUS_END_OF_FILE == Status ) { + EndOfFileFound = TRUE; + Status = STATUS_SUCCESS; + } + else { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + } + } + } + + NtFreeVirtualMemory(NtCurrentProcess(), + (PVOID *)&lpBuffer, + &RegionSize, + MEM_RELEASE); + + Status = NtQueryInformationFile( + FileHandleNew, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if( !NT_SUCCESS(Status) ) { + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); + } + + Status = NtSetInformationFile(FileHandleNew, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if( !NT_SUCCESS(Status) ) { + DPRINT("NtSetInformationFile() failed (Status %lx)\n", Status); + } + NtClose(FileHandleNew); + NtClose(FileHandle); + + SmpDeleteFile(lpExistingFileName); + + return (Status); + } + + NtClose(FileHandle); + + return (Status); +} + + +/*++ +* @name SmpMoveFilesQueryRoutine +* +* The SmpMoveFilesQueryRoutine function processes registry entries. +* +* @param ValueName +* The name of the value. +* +* @param ValueType +* The type of the value. +* +* @param ValueData +* The null-terminated data for the value. +* +* @param ValueLength +* The length of ValueData. +* +* @param Context +* NULL +* +* @param EntryContext +* NULL +* +* @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL +* othwerwise. +* +* @remarks +* +* +* +*--*/ +static NTSTATUS STDCALL +SmpMoveFilesQueryRoutine(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + NTSTATUS Status; + static LPWSTR FistFileName = NULL; + + DPRINT("SmpMoveFilesQueryRoutine() called \n"); + DPRINT("ValueData = %S \n", ValueData); + + if( !FistFileName ) + { + /* save a first file name */ + FistFileName = ValueData; + Status = STATUS_SUCCESS; + } + else + { + if( 0 == *((LPWSTR)ValueData) ) { + /* delete if second file name is absent */ + Status = SmpDeleteFile( FistFileName ); + } else { + /* remove a file */ + Status = SmpMoveFile( FistFileName, (LPCWSTR)ValueData ); + } + FistFileName = NULL; + } + + return Status; +} + + +/*++ +* @name SmProcessFileRenameList +* @implemented +* +* The SmProcessFileRenameList function moves or deletes files thats have been added to the specify registry key for delayed moving. +* +* @param VOID +* +* @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL +* othwerwise. +* +* @remarks +* This function reads the following registry value: +* HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations +* This registry value is of type REG_MULTI_SZ. The each operation is specifed as two file names. +* A first name is a source file, a second name is a destination file. +* In the case of deleting operation a second file name must be the empty string. +* For exapmle: +* szxSrcFile\0szxDestFile\0\0 <-- the szxSrcFile file will be renamed to the szxDestFile file +* szxSomeFile\0\0\0 <-- the szxSomeFile file will be removed +* After it will be done, the registry value will be deleted. +* +* +*--*/ +NTSTATUS +SmProcessFileRenameList( VOID ) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + DPRINT("SmProcessFileRenameList() called\n"); + + RtlZeroMemory( &QueryTable, sizeof(QueryTable) ); + QueryTable[0].Name = L"PendingFileRenameOperations"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DELETE; + QueryTable[0].DefaultType = REG_NONE; + QueryTable[0].QueryRoutine = SmpMoveFilesQueryRoutine; + + Status = RtlQueryRegistryValues( + RTL_REGISTRY_CONTROL, + L"\\Session Manager", + QueryTable, + NULL, + NULL); + + if( !NT_SUCCESS(Status) ) { + DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + } + + /* FIXME: RtlQueryRegistryValues can return an error status if the PendingFileRenameOperations value + does not exist, in this case smss hungs, therefore we always return STATUS_SUCCESS */ + return (STATUS_SUCCESS); +} + /* EOF */

1 0

[fireball] 23683: Temporary fix a call to KeUpdateSystemTime(), passing third CLOCK_INCREMENT's value (100000) as third param.
by fireball＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: fireball Date: Thu Aug 24 13:32:32 2006 New Revision: 23683 URL: http://svn.reactos.org/svn/reactos?rev=23683&view=rev Log: Temporary fix a call to KeUpdateSystemTime(), passing third CLOCK_INCREMENT's value (100000) as third param. Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=2… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Thu Aug 24 13:32:32 2006 @@ -818,7 +818,7 @@ MpsIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); if (KeGetCurrentProcessorNumber() == 0) { - KeUpdateSystemTime(&KernelTrapFrame, oldIrql); + KeUpdateSystemTime(&KernelTrapFrame, oldIrql, 100000); // FIXME: CLOCK_INCREMENT? } else {

1 0

[fireball] 23682: Fix compiling
by fireball＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: fireball Date: Thu Aug 24 13:01:22 2006 New Revision: 23682 URL: http://svn.reactos.org/svn/reactos?rev=23682&view=rev Log: Fix compiling Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h Thu Aug 24 13:01:22 2006 @@ -861,7 +861,7 @@ ); //helpers -static VOID +VOID NTAPI uhci_dpc_callback( PKDPC dpc, PVOID context, @@ -877,7 +877,7 @@ #endif } -BOOL +NTSTATUS uhci_submit_urb( PUHCI_DEV uhci, PUSB_DEV pdev,

1 0

[ion] 23681: - Add more missing offsets to asm.h (as always, taken from ks386.inc) - Fix incorrect KPCR_PRCB_DPC_ROUTINE_ACTIVE which was totally wrong (And could've caused a crash in the context swicher) - Also fix the definition of KRCB which was off-by-4 after about offset ~0x500. It wasn't causing problems because assembly code only used < 0x500. - Write the ASM implementation of KeUpdateRunTime (not used yet).
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 11:48:50 2006 New Revision: 23681 URL: http://svn.reactos.org/svn/reactos?rev=23681&view=rev Log: - Add more missing offsets to asm.h (as always, taken from ks386.inc) - Fix incorrect KPCR_PRCB_DPC_ROUTINE_ACTIVE which was totally wrong (And could've caused a crash in the context swicher) - Also fix the definition of KRCB which was off-by-4 after about offset ~0x500. It wasn't causing problems because assembly code only used < 0x500. - Write the ASM implementation of KeUpdateRunTime (not used yet). Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2368… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Thu Aug 24 11:48:50 2006 @@ -109,6 +109,9 @@ #define KTHREAD_CALLBACK_STACK 0x114 #define KTHREAD_APC_STATE_INDEX 0x11C #define KTHREAD_STACK_BASE 0x158 +#define KTHREAD_QUANTUM 0x15D +#define KTHREAD_KERNEL_TIME 0x160 +#define KTHREAD_USER_TIME 0x18C // // KPROCESS Offsets @@ -145,6 +148,7 @@ #define KPCR_SET_MEMBER 0x48 #define KPCR_NUMBER 0x51 #define KPCR_CURRENT_THREAD 0x124 +#define KPCR_PRCB_IDLE_THREAD 0x12C #define KPCR_PROCESSOR_NUMBER 0x130 #define KPCR_PRCB_SET_MEMBER 0x134 #define KPCR_PRCB_CPU_TYPE 0x138 @@ -152,8 +156,21 @@ #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C #define KPCR_PRCB_INTERRUPT_COUNT 0x644 +#define KPCR_PRCB_KERNEL_TIME 0x648 +#define KPCR_PRCB_USER_TIME 0x64C +#define KPCR_PRCB_DPC_TIME 0x650 +#define KPCR_PRCB_DEBUG_DPC_TIME 0x654 +#define KPCR_PRCB_INTERRUPT_TIME 0x658 +#define KPCR_PRCB_ADJUST_DPC_THRESHOLD 0x65C #define KPCR_SYSTEM_CALLS 0x6B8 -#define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0x994 +#define KPCR_PRCB_DPC_QUEUE_DEPTH 0xA4C +#define KPCR_PRCB_DPC_COUNT 0xA50 +#define KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH 0xA6C +#define KPCR_PRCB_DPC_REQUEST_RATE 0xA70 +#define KPCR_PRCB_DPC_INTERRUPT_REQUESTED 0xA78 +#define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0xA7A +#define KPCR_PRCB_DPC_LAST_COUNT 0xA80 +#define KPCR_PRCB_QUANTUM_END 0xAA1 // // KINTERRUPT Offsets @@ -432,6 +449,11 @@ #define DISPATCH_LEVEL 0x2 #define CLOCK2_LEVEL 0x1C #define HIGH_LEVEL 0x1F + +// +// Quantum Decrements +// +#define CLOCK_QUANTUM_DECREMENT 0x3 #endif // Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Thu Aug 24 11:48:50 2006 @@ -407,7 +407,6 @@ #endif ULONG SpareCounter0; #if (NTDDI_VERSION < NTDDI_LONGHORN) - ULONG KeContextSwitches; ULONG KeDcacheFlushCount; ULONG KeExceptionDispatchCount; ULONG KeFirstLevelTbFills; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Aug 24 11:48:50 2006 @@ -1054,7 +1054,7 @@ Prcb = ((PKPCR)KPCR_BASE)->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - sii->ContextSwitches = Prcb->KeContextSwitches; + //sii->ContextSwitches = Prcb->KeContextSwitches; sii->DpcCount = 0; /* FIXME */ sii->DpcRate = 0; /* FIXME */ sii->TimeIncrement = ti; Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Thu Aug 24 11:48:50 2006 @@ -19,6 +19,141 @@ .extern _KeMaximumIncrement /* FUNCTIONS ******************************************************************/ + +.globl _KeUpdateRunTime2@0 +.func KeUpdateRunTime2@0 +_KeUpdateRunTime2@0: + + /* Get KPCR */ + mov eax, [fs:KPCR_SELF] + + /* Save EBX */ + push ebx + + /* Increase interrupt count */ + inc dword ptr [eax+KPCR_PRCB_INTERRUPT_COUNT] + + /* Get the current thread and process */ + mov ebx, [eax+KPCR_CURRENT_THREAD] + mov ecx, [ebx+KTHREAD_APCSTATE_PROCESS] + + /* Check if this was V86 or user mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz NotKern + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jnz NotKern + + /* Increase kernel time */ + inc dword ptr [eax+KPCR_PRCB_KERNEL_TIME] + + /* Check if IRQL was DISPATCH_LEVEL */ + cmp byte ptr [esp+8], DISPATCH_LEVEL + jb BelowDispatch + ja AboveDispatch + + /* Check if the DPC routine is active */ + cmp dword ptr[eax+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 + jz BelowDispatch + + /* At dispatch, increase DPC time */ + inc dword ptr [eax+KPCR_PRCB_DPC_TIME] + jmp AfterSet + +AboveDispatch: + /* Update interrupt time */ + inc dword ptr [eax+KPCR_PRCB_INTERRUPT_TIME] + jmp AfterSet + +BelowDispatch: + /* Update kernel time */ + inc dword ptr [ebx+KTHREAD_KERNEL_TIME] + jmp AfterSet + +NotKern: + /* Update user time */ + inc dword ptr [eax+KPCR_PRCB_USER_TIME] + inc dword ptr [ebx+KTHREAD_USER_TIME] + +AfterSet: + /* Get the DPC Count and last count, and set the ne wone */ + mov ecx, [eax+KPCR_PRCB_DPC_COUNT] + mov edx, [eax+KPCR_PRCB_DPC_LAST_COUNT] + mov [eax+KPCR_PRCB_DPC_LAST_COUNT], ecx + + /* Substract counts and add request rate, divide by two to get average */ + sub ecx, edx + add ecx, [eax+KPCR_PRCB_DPC_REQUEST_RATE] + shr ecx, 1 + + /* Set this as the new request rate */ + mov [eax+KPCR_PRCB_DPC_REQUEST_RATE], ecx + + /* Check for depth > 0, DPCs to be inactive, and no other pending request */ + cmp dword ptr [eax+KPCR_PRCB_DPC_QUEUE_DEPTH], 0 + je DontRequest + cmp byte ptr [eax+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 + jnz DontRequest + cmp byte ptr [eax+KPCR_PRCB_DPC_INTERRUPT_REQUESTED], 0 + jnz DontRequest + + /* Request a DPC */ + mov ecx, DISPATCH_LEVEL + call @HalRequestSoftwareInterrupt@4 + + /* Restore PCR address */ + mov eax, [fs:KPCR_SELF] + + /* Get the DPC request rate and threshold adjust, and set it */ + mov ecx, [eax+KPCR_PRCB_DPC_REQUEST_RATE] + mov edx, _KiAdjustDpcThreshold + mov [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD], edx + + /* Check if the rate now is not ideal */ + cmp ecx, _KiIdealDpcRate + jge RateOk + cmp dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH], 1 + je RateOk + + /* Fix the depth */ + dec dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] + jmp RateOk + +DontRequest: + /* We didn't request a DPC, decrease the threshold */ + dec dword ptr [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD] + jnz RateOk + + /* We're at 0 now, reset it */ + mov ecx, _KiAdjustDpcThreshold + mov [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD], ecx + + /* Get maximum depth and check it */ + mov ecx, _KiMaximumDpcQueueDepth + cmp ecx, [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] + je RateOk + + /* Increase it, it's below maximum */ + inc dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] + +RateOk: + /* Decrement quantum and verify it */ + sub byte ptr [ebx+KTHREAD_QUANTUM], CLOCK_QUANTUM_DECREMENT + jg QuantumNotEmpty + + /* Make sure this isn't the idle thread */ + cmp ebx, [eax+KPCR_PRCB_IDLE_THREAD] + jz QuantumNotEmpty + + /* Set quantum end */ + mov byte ptr [eax+KPCR_PRCB_QUANTUM_END], 1 + mov ecx, DISPATCH_LEVEL + call @HalRequestSoftwareInterrupt@4 + +QuantumNotEmpty: + /* Restore ebx and return */ + pop ebx + ret 4 +.endfunc .globl _KeUpdateSystemTime2@0 .func KeUpdateSystemTime2@0

1 0

[ion] 23680: - Make KeUpdateSystemTime independent, so that it returns and exits from the current ROSterrupt by itself. - Make KeUpdateRunTime increase the interrupt count, check for V86 as well as for user-mode by using the CS and EFLAGS (isntead of PreviousMode), also only request DPCs if DpcInterruptRequested isn't already set, and only perform Quantum End if this isn't the idle thread. - Add clock.S which will have the clock interrupt handlers of the kernel (UpdateSystemTime and UpdateRunTim
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 10:52:33 2006 New Revision: 23680 URL: http://svn.reactos.org/svn/reactos?rev=23680&view=rev Log: - Make KeUpdateSystemTime independent, so that it returns and exits from the current ROSterrupt by itself. - Make KeUpdateRunTime increase the interrupt count, check for V86 as well as for user-mode by using the CS and EFLAGS (isntead of PreviousMode), also only request DPCs if DpcInterruptRequested isn't already set, and only perform Quantum End if this isn't the idle thread. - Add clock.S which will have the clock interrupt handlers of the kernel (UpdateSystemTime and UpdateRunTime) and ultimately replace the only reason irqhand.S is still around (the clock interrupt). Implement the current version of KeUpdateSystemTime in assembly, with stack optimizations since we'll be called from the HAL later. Added: trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Aug 24 10:52:33 2006 @@ -247,18 +247,15 @@ IN KIRQL Irql) { PKPRCB Prcb = KeGetCurrentPrcb(); - PKTHREAD CurrentThread; - PKPROCESS CurrentProcess; - - /* Make sure we don't go further if we're in early boot phase. */ - if (!(Prcb) || !(Prcb->CurrentThread)) return; - - /* Get the current thread and process */ - CurrentThread = Prcb->CurrentThread; - CurrentProcess = CurrentThread->ApcState.Process; + PKTHREAD CurrentThread = Prcb->CurrentThread; + PKPROCESS CurrentProcess = CurrentThread->ApcState.Process; + + /* Increase interrupt count */ + Prcb->InterruptCount++; /* Check if we came from user mode */ - if (TrapFrame->PreviousPreviousMode != KernelMode) + if ((TrapFrame->EFlags & EFLAGS_V86_MASK) || + (TrapFrame->SegCs & MODE_MASK)) { /* Update user times */ CurrentThread->UserTime++; @@ -267,6 +264,9 @@ } else { + /* Update CPU kernel time in all cases */ + Prcb->KernelTime++; + /* Check IRQ */ if (Irql > DISPATCH_LEVEL) { @@ -284,9 +284,6 @@ /* This was DPC time */ Prcb->DpcTime++; } - - /* Update CPU kernel time in all cases */ - Prcb->KernelTime++; } /* Set the last DPC Count and request rate */ @@ -295,7 +292,9 @@ Prcb->DpcRequestRate) / 2; /* Check if we should request a DPC */ - if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + if ((Prcb->DpcData[0].DpcQueueDepth) && + !(Prcb->DpcRoutineActive) && + !(Prcb->DpcInterruptRequested)) { /* Request one */ HalRequestSoftwareInterrupt(DISPATCH_LEVEL); @@ -335,7 +334,8 @@ * we don't care about the quantum value anymore after the QuantumEnd * flag is set. */ - if ((CurrentThread->Quantum -= 3) <= 0) + if (((CurrentThread->Quantum -= 3) <= 0) && + (Prcb->IdleThread != CurrentThread)) { Prcb->QuantumEnd = TRUE; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); @@ -414,6 +414,10 @@ KiTickOffset += KeMaximumIncrement; KeUpdateRunTime(TrapFrame, Irql); } + + /* Return from the interrupt */ + Ke386DisableInterrupts(); + HalEndSystemInterrupt(Irql, 0); } /* Added: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (added) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Thu Aug 24 10:52:33 2006 @@ -1,0 +1,113 @@ +/* + * FILE: ntoskrnl/ke/i386/clock.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Clock Management + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +#include <internal/i386/asmmacro.S> +.intel_syntax noprefix + +/* GLOBALS *******************************************************************/ + +.extern _KeTimeAdjustment +.extern _KiTickOffset +.extern _KeTickCount +.extern _KeMaximumIncrement + +/* FUNCTIONS ******************************************************************/ + +.globl _KeUpdateSystemTime2@0 +.func KeUpdateSystemTime2@0 +_KeUpdateSystemTime2@0: + + /* Get shared data in ECX */ + mov ecx, USER_SHARED_DATA + + /* Get interrupt time */ + mov edi, [ecx+USER_SHARED_DATA_INTERRUPT_TIME] + mov esi, [ecx+USER_SHARED_DATA_INTERRUPT_TIME+4] + + /* Add the increment and get the carry */ + add edi, eax + adc esi, 0 + + /* Now store the updated times */ + mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME+8], esi + mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME], edi + mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME+4], esi + + /* Substract tick count and get the low count */ + LOCK sub _KiTickOffset, eax + mov eax, _KeTickCount + mov ebx, eax + jg IncompleteTick + + /* Get shared data in ECX */ + mov ebx, USER_SHARED_DATA + + /* Get system time */ + mov edi, [ebx+USER_SHARED_DATA_SYSTEM_TIME] + mov esi, [ebx+USER_SHARED_DATA_SYSTEM_TIME+4] + + /* Add the increment and get the carry */ + add ecx, _KeTimeAdjustment + adc edx, 0 + + /* Now store the updated times */ + mov [ebx+USER_SHARED_DATA_SYSTEM_TIME+8], edx + mov [ebx+USER_SHARED_DATA_SYSTEM_TIME], ecx + mov [ebx+USER_SHARED_DATA_SYSTEM_TIME+4], edx + + /* Put tick count back in EBX */ + mov ebx, eax + + /* Copyit in ECX and get hich count */ + mov ecx, eax + mov edx, _KeTickCount + 4 + + /* Add the increment and get the carry */ + add ecx, 1 + adc edx, 0 + + /* Now store the updated tick */ + mov [_KeTickCount+8], edx + mov [_KeTickCount], ecx + mov [_KeTickCount+4], edx + + /* Store in in shared data too */ + mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+8], edx + mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx + mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx + +IncompleteTick: + + /* Queue DPC to handle registered timers */ + + /* Check if this was a full tick */ + cmp dword ptr _KiTickOffset, 0 + jg IncompleteTick2 + + /* Increase tick offset */ + mov eax, _KeMaximumIncrement + add _KiTickOffset, eax + + /* Update system run time */ + push esp + call _KeUpdateRunTime@8 + jmp Done + +IncompleteTick2: + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + +Done: + /* Exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Thu Aug 24 10:52:33 2006 @@ -156,7 +156,7 @@ if (KiClockSetupComplete) { KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); + return KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); } /* Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Aug 24 10:52:33 2006 @@ -29,6 +29,7 @@ <file first="true">main_asm.S</file> <file>cpu.S</file> <file>ctxswitch.S</file> + <file>clock.S</file> <file>exp.c</file> <file>fpu.c</file> <file>gdt.c</file>

1 0

[ion] 23679: - Update KeUpdateSystemTime to use variable increments. - Update KeTickCount properly instead of an ugly timecast hack. - Also update UserSharedData->TickCount. - Get rid of KiRawTicks. - Properly update KiTickOffset at the end.
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 10:27:29 2006 New Revision: 23679 URL: http://svn.reactos.org/svn/reactos?rev=23679&view=rev Log: - Update KeUpdateSystemTime to use variable increments. - Update KeTickCount properly instead of an ugly timecast hack. - Also update UserSharedData->TickCount. - Get rid of KiRawTicks. - Properly update KiTickOffset at the end. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2367… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Thu Aug 24 10:27:29 2006 @@ -246,6 +246,16 @@ // // KUSER_SHARED_DATA Offsets // +#ifdef __ASM__ +#define USER_SHARED_DATA 0xFFDF0000 +#endif +#define USER_SHARED_DATA_INTERRUPT_TIME 0x8 +#define USER_SHARED_DATA_SYSTEM_TIME 0x14 +#define USER_SHARED_DATA_TICK_COUNT 0x320 + +// +// KUSER_SHARED_DATA Offsets (this stuff is trash) +// #define KERNEL_USER_SHARED_DATA 0x7FFE0000 #define KUSER_SHARED_PROCESSOR_FEATURES KERNEL_USER_SHARED_DATA + 0x274 #define KUSER_SHARED_SYSCALL KERNEL_USER_SHARED_DATA + 0x300 Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Aug 24 10:27:29 2006 @@ -231,7 +231,8 @@ NTAPI KeUpdateSystemTime( PKTRAP_FRAME TrapFrame, - KIRQL Irql + KIRQL Irql, + ULONG Increment ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Aug 24 10:27:29 2006 @@ -260,13 +260,6 @@ VOID STDCALL -KeUpdateSystemTime( - PKTRAP_FRAME TrapFrame, - KIRQL Irql -); - -VOID -STDCALL KeUpdateRunTime( PKTRAP_FRAME TrapFrame, KIRQL Irql Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Aug 24 10:27:29 2006 @@ -63,6 +63,7 @@ ULONG KeMaximumIncrement = 100000; ULONG KeMinimumIncrement = 100000; +ULONG KeTimeAdjustment = 100000; #define MICROSECONDS_PER_TICK (10000) #define TICKS_TO_CALIBRATE (1) @@ -353,23 +354,23 @@ VOID STDCALL KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) + IN KIRQL Irql, + IN ULONG Increment) { LONG OldOffset; LARGE_INTEGER Time; ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - if (!KiClockSetupComplete) return; /* Update interrupt time */ Time.LowPart = SharedUserData->InterruptTime.LowPart; Time.HighPart = SharedUserData->InterruptTime.High1Time; - Time.QuadPart += CLOCK_INCREMENT; + Time.QuadPart += Increment; SharedUserData->InterruptTime.High2Time = Time.u.HighPart; SharedUserData->InterruptTime.LowPart = Time.u.LowPart; SharedUserData->InterruptTime.High1Time = Time.u.HighPart; /* Increase the tick offset */ - KiTickOffset -= CLOCK_INCREMENT; + KiTickOffset -= Increment; OldOffset = KiTickOffset; /* Check if this isn't a tick yet */ @@ -380,28 +381,39 @@ } else { - /* This was a tick, calculate the next one */ - KiTickOffset += CLOCK_INCREMENT; - /* Setup time structure for system time */ Time.LowPart = SharedUserData->SystemTime.LowPart; Time.HighPart = SharedUserData->SystemTime.High1Time; - Time.QuadPart += CLOCK_INCREMENT; + Time.QuadPart += KeTimeAdjustment; SharedUserData->SystemTime.High2Time = Time.HighPart; SharedUserData->SystemTime.LowPart = Time.LowPart; SharedUserData->SystemTime.High1Time = Time.HighPart; - /* Update tick count */ - (*(PULONGLONG)&KeTickCount)++; + /* Setup time structure for tick time */ + Time.LowPart = KeTickCount.LowPart; + Time.HighPart = KeTickCount.High1Time; + Time.QuadPart += 1; + KeTickCount.High2Time = Time.HighPart; + KeTickCount.LowPart = Time.LowPart; + KeTickCount.High1Time = Time.HighPart; + SharedUserData->TickCount.High2Time = Time.HighPart; + SharedUserData->TickCount.LowPart = Time.LowPart; + SharedUserData->TickCount.High1Time = Time.HighPart; + + /* Update tick count in shared user data as well */ SharedUserData->TickCountLowDeprecated++; - KiRawTicks++; /* Queue a DPC that will expire timers */ KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); } /* Update process and thread times */ - if (OldOffset <= 0) KeUpdateRunTime(TrapFrame, Irql); + if (OldOffset <= 0) + { + /* This was a tick, calculate the next one */ + KiTickOffset += KeMaximumIncrement; + KeUpdateRunTime(TrapFrame, Irql); + } } /* Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Thu Aug 24 10:27:29 2006 @@ -153,8 +153,11 @@ Ke386EnableInterrupts(); //DPRINT1("Tick\n"); + if (KiClockSetupComplete) + { KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - KeUpdateSystemTime(&KernelTrapFrame, old_level); + KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); + } /* * End the system interrupt. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 24 10:27:29 2006 @@ -12,7 +12,7 @@ #include <internal/i386/asmmacro.S> .intel_syntax noprefix -/* GLOBALS ******************************************************************/ +/* GLOBALS *******************************************************************/ .globl _KiIdt _KiIdt: Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Thu Aug 24 10:27:29 2006 @@ -648,7 +648,7 @@ KeTickCount DATA @KeTryToAcquireGuardedMutex@4 KeUpdateRunTime@8 -KeUpdateSystemTime@8 +KeUpdateSystemTime@12 KeUnstackDetachProcess@4 KeUserModeCallback@20 KeWaitForMultipleObjects@32

1 0

[ion] 23678: - Write a basic Clock Interrupt handler in the HAL (doesn't deal with changing increments yet, just like current ROS). It will call KeUpdateSystemTime once ready. - Implement KeDisconnectInterrupt with the new implementation. - Put Clock Interrupt initialization in the right place (might still be too late: must investigate more). - Added a debug print when unexpected interrupts are called, just noticed this happens on my checked machine, and it's a useful tracing tool.
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 09:36:50 2006 New Revision: 23678 URL: http://svn.reactos.org/svn/reactos?rev=23678&view=rev Log: - Write a basic Clock Interrupt handler in the HAL (doesn't deal with changing increments yet, just like current ROS). It will call KeUpdateSystemTime once ready. - Implement KeDisconnectInterrupt with the new implementation. - Put Clock Interrupt initialization in the right place (might still be too late: must investigate more). - Added a debug print when unexpected interrupts are called, just noticed this happens on my checked machine, and it's a useful tracing tool. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Thu Aug 24 09:36:50 2006 @@ -19,6 +19,7 @@ PVOID HalpZeroPageMapping = NULL; HALP_HOOKS HalpHooks; +VOID NTAPI HalpClockInterrupt(VOID); /* FUNCTIONS ***************************************************************/ @@ -31,6 +32,10 @@ return STATUS_SUCCESS; } +#define MAKEULONG(x, y) \ + (((((ULONG)(x))<<16) & 0xffff0000) | \ + ((ULONG)(y) & 0xffff)) + BOOLEAN STDCALL HalInitSystem (ULONG BootPhase, PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -42,6 +47,14 @@ } else if (BootPhase == 1) { +#if 0 + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(IRQ2VECTOR(0), CLOCK2_LEVEL, Latched); +#endif /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); HalpInitBusHandlers(); Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Thu Aug 24 09:36:50 2006 @@ -12,8 +12,7 @@ .intel_syntax noprefix .extern _Kei386EoiHelper@0 - -/* GLOBALS *******************************************************************/ +.extern _KeUpdateSystemTime@0 /* FUNCTIONS *****************************************************************/ @@ -21,6 +20,31 @@ .func HalpClockInterrupt@0 _HalpClockInterrupt@0: - jmp $ + /* Enter trap */ + INT_PROLOG Hci, DoPushFakeErrorCode + + /* Push vector and make stack for IRQL */ + push 0x30 + sub esp, 4 + + /* Begin the interrupt */ + push esp + push 0x30 + push CLOCK2_LEVEL + call _HalBeginSystemInterrupt@12 + + /* Check if it's spurious */ + or al, al + jz Spurious + + /* Do a tick */ + //jmp _KeUpdateSystemTime@0 + +Spurious: + + /* Exit the interrupt */ + add esp, 8 + mov esi, $ + jmp _Kei386EoiHelper@0 .endfunc Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Thu Aug 24 09:36:50 2006 @@ -15,8 +15,6 @@ #define NDEBUG #include <debug.h> -VOID NTAPI HalpClockInterrupt(VOID); - /* FUNCTIONS ***************************************************************/ VOID @@ -24,15 +22,6 @@ { HalpInitPICs(); - /* Enable the clock interrupt */ -#if 0 - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].ExtendedOffset = - (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].Offset = - (USHORT)HalpClockInterrupt; -#endif - HalEnableSystemInterrupt(IRQ2VECTOR(0), CLOCK2_LEVEL, Latched); - /* Setup busy waiting */ HalpCalibrateStallExecution(); } Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Aug 24 09:36:50 2006 @@ -37,7 +37,7 @@ CHAR KiTimerSystemAuditing = 0; static KDPC KiExpireTimerDpc; -static BOOLEAN KiClockSetupComplete = FALSE; +BOOLEAN KiClockSetupComplete = FALSE; extern ULONG KiMaximumDpcQueueDepth; extern ULONG KiMinimumDpcRate; Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Thu Aug 24 09:36:50 2006 @@ -65,15 +65,10 @@ NTAPI KiChainedDispatch(VOID); - -/* GLOBALS *****************************************************************/ +/* DEPRECATED FUNCTIONS ******************************************************/ void irq_handler_0(void); - extern IDT_DESCRIPTOR KiIdt[256]; - -/* FUNCTIONS ****************************************************************/ - #define PRESENT (0x8000) #define I486_INTERRUPT_GATE (0xe00) @@ -168,6 +163,8 @@ HalEndSystemInterrupt (old_level, 0); } +/* PRIVATE FUNCTIONS *********************************************************/ + VOID NTAPI KiGetVectorDispatch(IN ULONG Vector, @@ -274,6 +271,8 @@ ((PKIPCR)KeGetPcr())->IDT[Interrupt->Vector].Offset = (USHORT)PtrToUlong(Handler); } + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented @@ -430,65 +429,84 @@ /* * @implemented - * - * FUNCTION: Releases a drivers isr - * ARGUMENTS: - * InterruptObject = isr to release */ -BOOLEAN +BOOLEAN STDCALL -KeDisconnectInterrupt(PKINTERRUPT InterruptObject) -{ -#if 0 - KIRQL oldlvl,synch_oldlvl; - PISR_TABLE CurrentIsr; +KeDisconnectInterrupt(PKINTERRUPT Interrupt) +{ + KIRQL OldIrql, Irql; + ULONG Vector; + DISPATCH_INFO Dispatch; + PKINTERRUPT NextInterrupt; BOOLEAN State; - DPRINT1("KeDisconnectInterrupt\n"); - ASSERT (InterruptObject->Number < KeNumberProcessors); - /* Set the affinity */ - KeSetSystemAffinityThread(1 << InterruptObject->Number); - - /* Get the ISR Tabe */ - CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] - [(ULONG)InterruptObject->Number]; - - /* Raise IRQL to required level and lock table */ - KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); - KiAcquireSpinLock(&CurrentIsr->Lock); + KeSetSystemAffinityThread(1 << Interrupt->Number); + + /* Lock the dispatcher */ + OldIrql = KeAcquireDispatcherDatabaseLock(); /* Check if it's actually connected */ - if ((State = InterruptObject->Connected)) - { - /* Lock the Interrupt */ - synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - - /* Remove this one, and check if all are gone */ - RemoveEntryList(&InterruptObject->InterruptListEntry); - if (IsListEmpty(&CurrentIsr->ListHead)) - { - /* Completely Disable the Interrupt */ - HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); - } - + State = Interrupt->Connected; + if (State) + { + /* Get the vector and IRQL */ + Irql = Interrupt->Irql; + Vector = Interrupt->Vector; + + /* Get vector dispatch data */ + KiGetVectorDispatch(Vector, &Dispatch); + + /* Check if it was chained */ + if (Dispatch.Type == ChainConnect) + { + /* Check if the top-level interrupt is being removed */ + ASSERT(Irql <= SYNCH_LEVEL); + if (Interrupt == Dispatch.Interrupt) + { + /* Get the next one */ + Dispatch.Interrupt = CONTAINING_RECORD(Dispatch.Interrupt-> + InterruptListEntry.Flink, + KINTERRUPT, + InterruptListEntry); + + /* Reconnect it */ + KiConnectVectorToInterrupt(Dispatch.Interrupt, ChainConnect); + } + + /* Remove it */ + RemoveEntryList(&Interrupt->InterruptListEntry); + + /* Get the next one */ + NextInterrupt = CONTAINING_RECORD(Dispatch.Interrupt-> + InterruptListEntry.Flink, + KINTERRUPT, + InterruptListEntry); + + /* Check if this is the only one left */ + if (Dispatch.Interrupt == NextInterrupt) + { + /* Connect it in non-chained mode */ + KiConnectVectorToInterrupt(Dispatch.Interrupt, NormalConnect); + } + } + else + { + /* Only one left, disable and remove it */ + HalDisableSystemInterrupt(Interrupt->Vector, Irql); + KiConnectVectorToInterrupt(Interrupt, NoConnect); + } + /* Disconnect it */ - InterruptObject->Connected = FALSE; - - /* Release the interrupt lock */ - KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); - } - /* Release the table spinlock */ - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - - /* Go back to default affinity */ + Interrupt->Connected = FALSE; + } + + /* Unlock the dispatcher and revert affinity */ + KeReleaseDispatcherDatabaseLock(OldIrql); KeRevertToUserAffinityThread(); - - /* Return Old Interrupt State */ + + /* Return to caller */ return State; -#endif - return 0; } /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 24 09:36:50 2006 @@ -81,6 +81,9 @@ _KiUnexpectedEntrySize: .long _KiUnexpectedInterrupt1 - _KiUnexpectedInterrupt0 +_UnexpectedMsg: + .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount: @@ -1348,76 +1351,13 @@ jmp _Kei386EoiHelper2ndEntry Handled: - /* Unexpected, exit the interrupt */ - mov esi, $ - cli - call _HalEndSystemInterrupt@8 - jmp _Kei386EoiHelper@0 -.endfunc - -.globl _KiUnexpectedInterrupt -_KiUnexpectedInterrupt: - - /* Bugcheck with invalid interrupt code */ - push 0x12 - call _KeBugCheck@4 - -/* INTERRUPT HANDLERS ********************************************************/ - -.func KiInterruptTemplate -_KiInterruptTemplate: - - /* Enter interrupt trap */ - INT_PROLOG kit, DoPushFakeErrorCode -.endfunc - -_KiInterruptTemplate2ndDispatch: - /* Dummy code, will be replaced by the address of the KINTERRUPT */ - mov edi, 0 - -_KiInterruptTemplateObject: - /* Dummy jump, will be replaced by the actual jump */ - jmp _KeSynchronizeExecution@12 - -_KiInterruptTemplateDispatch: - /* Marks the end of the template so that the jump above can be edited */ - -.func KiChainedDispatch2ndLvl@0 -_KiChainedDispatch2ndLvl@0: - - /* Not yet supported */ - int 3 -.endfunc - -.func KiChainedDispatch@0 -_KiChainedDispatch@0: - - /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] - - /* Save trap frame */ - mov ebp, esp - - /* Save vector and IRQL */ - mov eax, [edi+KINTERRUPT_VECTOR] - mov ecx, [edi+KINTERRUPT_IRQL] - - /* Save old irql */ - push eax - sub esp, 4 - - /* Begin interrupt */ - push eax - push ecx - call _HalBeginSystemInterrupt@12 - - /* Check if it was handled */ - or eax, eax - jz SpuriousInt - sub esp, 12 - - /* Call the 2nd-level handler */ - call _KiChainedDispatch2ndLvl@0 + /* Unexpected interrupt, print a message on debug builds */ +#if DBG + push [esp+4] + push offset _UnexpectedMsg + call _DbgPrint + add esp, 8 +#endif /* Exit the interrupt */ mov esi, $ @@ -1426,6 +1366,77 @@ jmp _Kei386EoiHelper@0 .endfunc +.globl _KiUnexpectedInterrupt +_KiUnexpectedInterrupt: + + /* Bugcheck with invalid interrupt code */ + push 0x12 + call _KeBugCheck@4 + +/* INTERRUPT HANDLERS ********************************************************/ + +.func KiInterruptTemplate +_KiInterruptTemplate: + + /* Enter interrupt trap */ + INT_PROLOG kit, DoPushFakeErrorCode +.endfunc + +_KiInterruptTemplate2ndDispatch: + /* Dummy code, will be replaced by the address of the KINTERRUPT */ + mov edi, 0 + +_KiInterruptTemplateObject: + /* Dummy jump, will be replaced by the actual jump */ + jmp _KeSynchronizeExecution@12 + +_KiInterruptTemplateDispatch: + /* Marks the end of the template so that the jump above can be edited */ + +.func KiChainedDispatch2ndLvl@0 +_KiChainedDispatch2ndLvl@0: + + /* Not yet supported */ + int 3 +.endfunc + +.func KiChainedDispatch@0 +_KiChainedDispatch@0: + + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + + /* Save trap frame */ + mov ebp, esp + + /* Save vector and IRQL */ + mov eax, [edi+KINTERRUPT_VECTOR] + mov ecx, [edi+KINTERRUPT_IRQL] + + /* Save old irql */ + push eax + sub esp, 4 + + /* Begin interrupt */ + push eax + push ecx + call _HalBeginSystemInterrupt@12 + + /* Check if it was handled */ + or eax, eax + jz SpuriousInt + sub esp, 12 + + /* Call the 2nd-level handler */ + call _KiChainedDispatch2ndLvl@0 + + /* Exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endfunc + .func KiInterruptDispatch3@0 _KiInterruptDispatch3@0:

1 0

[ion] 23677: - Completely re-implement IRQ support (KeInitialize/Connect/Disconnect) interrupt using the same model as NT. Implementation was done by analyzing various of my systems at runtime with WinDBG and tracing through some of the code and dumping relevant objects. - Uses new code added to trap.s for generic dispatching, as well as the NT implementation which copies a "template" into the ->DispatchCode array of every KINTERRUPT object. - Also adds support for chained interrupts, but this h
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 06:53:40 2006 New Revision: 23677 URL: http://svn.reactos.org/svn/reactos?rev=23677&view=rev Log: - Completely re-implement IRQ support (KeInitialize/Connect/Disconnect) interrupt using the same model as NT. Implementation was done by analyzing various of my systems at runtime with WinDBG and tracing through some of the code and dumping relevant objects. - Uses new code added to trap.s for generic dispatching, as well as the NT implementation which copies a "template" into the ->DispatchCode array of every KINTERRUPT object. - Also adds support for chained interrupts, but this hasn't been tested yet. Floating interrupts are not supported on NT it seems, so I haven't implemented those at all. - KiDisableInterrupt not yet re-implemented, and timer code is still piggybacked on the old implementation. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Thu Aug 24 06:53:40 2006 @@ -291,7 +291,7 @@ .func HalBeginSystemInterrupt@12 _HalBeginSystemInterrupt@12: - /* Convert to vector and call the handler */ + /* Convert to IRQ and call the handler */ mov edx, [esp+8] sub edx, PRIMARY_VECTOR_BASE jmp HalpSysIntHandler[edx*4] Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Thu Aug 24 06:53:40 2006 @@ -24,116 +24,52 @@ #define NDEBUG #include <internal/debug.h> +typedef enum _CONNECT_TYPE +{ + NoConnect, + NormalConnect, + ChainConnect, + UnknownConnect +} CONNECT_TYPE, *PCONNECT_TYPE; + +typedef struct _DISPATCH_INFO +{ + CONNECT_TYPE Type; + PKINTERRUPT Interrupt; + PKINTERRUPT_ROUTINE NoDispatch; + PKINTERRUPT_ROUTINE InterruptDispatch; + PKINTERRUPT_ROUTINE FloatingDispatch; + PKINTERRUPT_ROUTINE ChainedDispatch; + PKINTERRUPT_ROUTINE *FlatDispatch; +} DISPATCH_INFO, *PDISPATCH_INFO; + extern ULONG KiInterruptTemplate[KINTERRUPT_DISPATCH_CODES]; extern PULONG KiInterruptTemplateObject; +extern PULONG KiInterruptTemplateDispatch; +extern PULONG KiInterruptTemplate2ndDispatch; +extern ULONG KiUnexpectedEntrySize; + +VOID +NTAPI +KiStartUnexpectedRange(VOID); + +VOID +NTAPI +KiEndUnexpectedRange(VOID); + +VOID +NTAPI +KiInterruptDispatch3(VOID); + +VOID +NTAPI +KiChainedDispatch(VOID); + /* GLOBALS *****************************************************************/ -/* Interrupt handler list */ - -#ifdef CONFIG_SMP - -#define INT_NAME2(intnum) KiUnexpectedInterrupt##intnum - -#define BUILD_INTERRUPT_HANDLER(intnum) \ -VOID INT_NAME2(intnum)(VOID); - -#define D(x,y) \ - BUILD_INTERRUPT_HANDLER(x##y) - -#define D16(x) \ - D(x,0) D(x,1) D(x,2) D(x,3) \ - D(x,4) D(x,5) D(x,6) D(x,7) \ - D(x,8) D(x,9) D(x,A) D(x,B) \ - D(x,C) D(x,D) D(x,E) D(x,F) - -D16(3) D16(4) D16(5) D16(6) -D16(7) D16(8) D16(9) D16(A) -D16(B) D16(C) D16(D) D16(E) -D16(F) - -#define L(x,y) \ - (ULONG)& INT_NAME2(x##y) - -#define L16(x) \ - L(x,0), L(x,1), L(x,2), L(x,3), \ - L(x,4), L(x,5), L(x,6), L(x,7), \ - L(x,8), L(x,9), L(x,A), L(x,B), \ - L(x,C), L(x,D), L(x,E), L(x,F) - -static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = { - L16(3), L16(4), L16(5), L16(6), - L16(7), L16(8), L16(9), L16(A), - L16(B), L16(C), L16(D), L16(E) -}; - -#undef L -#undef L16 -#undef D -#undef D16 - -#else /* CONFIG_SMP */ - void irq_handler_0(void); -void irq_handler_1(void); -void irq_handler_2(void); -void irq_handler_3(void); -void irq_handler_4(void); -void irq_handler_5(void); -void irq_handler_6(void); -void irq_handler_7(void); -void irq_handler_8(void); -void irq_handler_9(void); -void irq_handler_10(void); -void irq_handler_11(void); -void irq_handler_12(void); -void irq_handler_13(void); -void irq_handler_14(void); -void irq_handler_15(void); - -unsigned int irq_handler[NR_IRQS]= -{ - (int)&irq_handler_0, - (int)&irq_handler_1, - (int)&irq_handler_2, - (int)&irq_handler_3, - (int)&irq_handler_4, - (int)&irq_handler_5, - (int)&irq_handler_6, - (int)&irq_handler_7, - (int)&irq_handler_8, - (int)&irq_handler_9, - (int)&irq_handler_10, - (int)&irq_handler_11, - (int)&irq_handler_12, - (int)&irq_handler_13, - (int)&irq_handler_14, - (int)&irq_handler_15, -}; - -#endif /* CONFIG_SMP */ - -/* - * PURPOSE: Object describing each isr - * NOTE: The data in this table is only modified at passsive level but can - * be accessed at any irq level. - */ - -typedef struct -{ - LIST_ENTRY ListHead; - KSPIN_LOCK Lock; - ULONG Count; -} -ISR_TABLE, *PISR_TABLE; - -#ifdef CONFIG_SMP -static ISR_TABLE IsrTable[NR_IRQS][MAXIMUM_PROCESSORS]; -#else -static ISR_TABLE IsrTable[NR_IRQS][1]; -#endif - -#define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') + extern IDT_DESCRIPTOR KiIdt[256]; /* FUNCTIONS ****************************************************************/ @@ -146,28 +82,10 @@ NTAPI KeInitInterrupts (VOID) { - int i, j; - - - /* - * Setup the IDT entries to point to the interrupt handlers - */ - for (i=0;i<NR_IRQS;i++) - { - KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); - KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ + + KiIdt[IRQ_BASE].a=((ULONG)irq_handler_0&0xffff)+(KGDT_R0_CODE<<16); + KiIdt[IRQ_BASE].b=((ULONG)irq_handler_0&0xffff0000)+PRESENT+ I486_INTERRUPT_GATE; -#ifdef CONFIG_SMP - for (j = 0; j < MAXIMUM_PROCESSORS; j++) -#else - j = 0; -#endif - { - InitializeListHead(&IsrTable[i][j].ListHead); - KeInitializeSpinLock(&IsrTable[i][j].Lock); - IsrTable[i][j].Count = 0; - } - } } STATIC VOID @@ -191,47 +109,7 @@ TrapFrame->EFlags = IrqTrapFrame->Eflags; } -VOID STDCALL -KiInterruptDispatch2 (ULONG vector, KIRQL old_level) -/* - * FUNCTION: Calls all the interrupt handlers for a given irq. - * ARGUMENTS: - * vector - The number of the vector to call handlers for. - * old_level - The irql of the processor when the irq took place. - * NOTES: Must be called at DIRQL. - */ -{ - PKINTERRUPT isr; - PLIST_ENTRY current; - KIRQL oldlvl; - PISR_TABLE CurrentIsr; - - DPRINT("I(0x%.08x, 0x%.08x)\n", vector, old_level); - - /* - * Iterate the list until one of the isr tells us its device interrupted - */ - CurrentIsr = &IsrTable[vector - IRQ_BASE][(ULONG)KeGetCurrentProcessorNumber()]; - - KiAcquireSpinLock(&CurrentIsr->Lock); - - CurrentIsr->Count++; - current = CurrentIsr->ListHead.Flink; - - while (current != &CurrentIsr->ListHead) - { - isr = CONTAINING_RECORD(current,KINTERRUPT,InterruptListEntry); - oldlvl = KeAcquireInterruptSpinLock(isr); - if (isr->ServiceRoutine(isr, isr->ServiceContext)) - { - KeReleaseInterruptSpinLock(isr, oldlvl); - break; - } - KeReleaseInterruptSpinLock(isr, oldlvl); - current = current->Flink; - } - KiReleaseSpinLock(&CurrentIsr->Lock); -} +extern BOOLEAN KiClockSetupComplete; VOID KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe) @@ -243,6 +121,17 @@ { KIRQL old_level; KTRAP_FRAME KernelTrapFrame; + ASSERT(vector == 0x30); +#if 0 + PULONG Frame; + DPRINT1("Received Interrupt: %lx\n", vector); + DPRINT1("My trap frame: %p\n", Trapframe); + DPRINT1("Stack trace\n"); + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); + DPRINT1("Stack trace: %p %p %p %p\n", Frame, *Frame, Frame[1], *(PULONG)Frame[1]); + DPRINT1("Clock setup: %lx\n", KiClockSetupComplete); + if (KiClockSetupComplete) while(TRUE); +#endif /* * At this point we have interrupts disabled, nothing has been done to @@ -268,21 +157,9 @@ */ Ke386EnableInterrupts(); -#ifndef CONFIG_SMP - if (VECTOR2IRQ(vector) == 0) - { //DPRINT1("Tick\n"); KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); KeUpdateSystemTime(&KernelTrapFrame, old_level); - } - else -#endif - { - /* - * Actually call the ISR. - */ - KiInterruptDispatch2(vector, old_level); - } /* * End the system interrupt. @@ -291,135 +168,111 @@ HalEndSystemInterrupt (old_level, 0); } -/* - * @implemented - */ -BOOLEAN -STDCALL -KeConnectInterrupt(PKINTERRUPT InterruptObject) -{ - KIRQL oldlvl,synch_oldlvl; - PKINTERRUPT ListHead; - ULONG Vector; - PISR_TABLE CurrentIsr; - BOOLEAN Result; - - - Vector = InterruptObject->Vector; - DPRINT1("KeConnectInterrupt(): %lx\n", Vector); - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - Vector -= IRQ_BASE; - - ASSERT (InterruptObject->Number < KeNumberProcessors); - - KeSetSystemAffinityThread(1 << InterruptObject->Number); - - CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->Number]; - - KeRaiseIrql(VECTOR2IRQL(Vector + IRQ_BASE),&oldlvl); - KiAcquireSpinLock(&CurrentIsr->Lock); - - /* - * Check if the vector is already in use that we can share it - */ - if (!IsListEmpty(&CurrentIsr->ListHead)) - { - ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,InterruptListEntry); - if (InterruptObject->ShareVector == FALSE || ListHead->ShareVector==FALSE) - { - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - KeRevertToUserAffinityThread(); - return FALSE; - } - } - - synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - - DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHead.Blink); - - Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->Mode); - if (Result) - { - InsertTailList(&CurrentIsr->ListHead,&InterruptObject->InterruptListEntry); - DPRINT("%x %x\n",InterruptObject->InterruptListEntry.Flink, InterruptObject->InterruptListEntry.Blink); - } - - InterruptObject->Connected = TRUE; - KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); - - /* - * Release the table spinlock - */ - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - - KeRevertToUserAffinityThread(); - - return Result; -} - -/* - * @implemented - * - * FUNCTION: Releases a drivers isr - * ARGUMENTS: - * InterruptObject = isr to release - */ -BOOLEAN -STDCALL -KeDisconnectInterrupt(PKINTERRUPT InterruptObject) -{ - KIRQL oldlvl,synch_oldlvl; - PISR_TABLE CurrentIsr; - BOOLEAN State; - - DPRINT1("KeDisconnectInterrupt\n"); - ASSERT (InterruptObject->Number < KeNumberProcessors); - - /* Set the affinity */ - KeSetSystemAffinityThread(1 << InterruptObject->Number); - - /* Get the ISR Tabe */ - CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] - [(ULONG)InterruptObject->Number]; - - /* Raise IRQL to required level and lock table */ - KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); - KiAcquireSpinLock(&CurrentIsr->Lock); - - /* Check if it's actually connected */ - if ((State = InterruptObject->Connected)) - { - /* Lock the Interrupt */ - synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - - /* Remove this one, and check if all are gone */ - RemoveEntryList(&InterruptObject->InterruptListEntry); - if (IsListEmpty(&CurrentIsr->ListHead)) - { - /* Completely Disable the Interrupt */ - HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); - } - - /* Disconnect it */ - InterruptObject->Connected = FALSE; - - /* Release the interrupt lock */ - KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); - } - /* Release the table spinlock */ - KiReleaseSpinLock(&CurrentIsr->Lock); - KeLowerIrql(oldlvl); - - /* Go back to default affinity */ - KeRevertToUserAffinityThread(); - - /* Return Old Interrupt State */ - return State; +VOID +NTAPI +KiGetVectorDispatch(IN ULONG Vector, + IN PDISPATCH_INFO Dispatch) +{ + PKINTERRUPT_ROUTINE Handler; + ULONG Current; + + /* Setup the unhandled dispatch */ + Dispatch->NoDispatch = (PVOID)(((ULONG_PTR)&KiStartUnexpectedRange) + + (Vector - PRIMARY_VECTOR_BASE) * + KiUnexpectedEntrySize); + + /* Setup the handlers */ + Dispatch->InterruptDispatch = KiInterruptDispatch3; + Dispatch->FloatingDispatch = NULL; // Floating Interrupts are not supported + Dispatch->ChainedDispatch = KiChainedDispatch; + Dispatch->FlatDispatch = NULL; + + /* Get the current handler */ + Current = ((((PKIPCR)KeGetPcr())->IDT[Vector].ExtendedOffset << 16) + & 0xFFFF0000) | + (((PKIPCR)KeGetPcr())->IDT[Vector].Offset & 0xFFFF); + + /* Set the interrupt */ + Dispatch->Interrupt = CONTAINING_RECORD(Current, + KINTERRUPT, + DispatchCode); + + /* Check what this interrupt is connected to */ + if ((PKINTERRUPT_ROUTINE)Current == Dispatch->NoDispatch) + { + /* Not connected */ + Dispatch->Type = NoConnect; + } + else + { + /* Get the handler */ + Handler = Dispatch->Interrupt->DispatchAddress; + if (Handler == Dispatch->ChainedDispatch) + { + /* It's a chained interrupt */ + Dispatch->Type = ChainConnect; + } + else if ((Handler == Dispatch->InterruptDispatch) || + (Handler == Dispatch->FloatingDispatch)) + { + /* It's unchained */ + Dispatch->Type = NormalConnect; + } + else + { + /* Unknown */ + Dispatch->Type = UnknownConnect; + } + } +} + +VOID +NTAPI +KiConnectVectorToInterrupt(IN PKINTERRUPT Interrupt, + IN CONNECT_TYPE Type) +{ + DISPATCH_INFO Dispatch; + PKINTERRUPT_ROUTINE Handler; + PULONG Patch = &Interrupt->DispatchCode[0]; + + /* Get vector data */ + KiGetVectorDispatch(Interrupt->Vector, &Dispatch); + + /* Check if we're only disconnecting */ + if (Type == NoConnect) + { + /* Set the handler to NoDispatch */ + Handler = Dispatch.NoDispatch; + } + else + { + /* Get the right handler */ + Handler = (Type == NormalConnect) ? + Dispatch.InterruptDispatch: + Dispatch.ChainedDispatch; + ASSERT(Interrupt->FloatingSave == FALSE); + + /* Set the handler */ + Interrupt->DispatchAddress = Handler; + + /* Jump to the last 4 bytes */ + Patch = (PULONG)((ULONG_PTR)Patch + + ((ULONG_PTR)&KiInterruptTemplateDispatch - + (ULONG_PTR)KiInterruptTemplate) - 4); + + /* Apply the patch */ + *Patch = (ULONG)((ULONG_PTR)Handler - ((ULONG_PTR)Patch + 4)); + + /* Now set the final handler address */ + ASSERT(Dispatch.FlatDispatch == NULL); + Handler = (PVOID)&Interrupt->DispatchCode; + } + + /* Set the pointer in the IDT */ + ((PKIPCR)KeGetPcr())->IDT[Interrupt->Vector].ExtendedOffset = + (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[Interrupt->Vector].Offset = + (USHORT)PtrToUlong(Handler); } /* @@ -488,4 +341,154 @@ Interrupt->Connected = FALSE; } +/* + * @implemented + */ +BOOLEAN +NTAPI +KeConnectInterrupt(IN PKINTERRUPT Interrupt) +{ + BOOLEAN Connected, Error, Status; + KIRQL Irql, OldIrql; + UCHAR Number; + ULONG Vector; + DISPATCH_INFO Dispatch; + + /* Get data from interrupt */ + Number = Interrupt->Number; + Vector = Interrupt->Vector; + Irql = Interrupt->Irql; + + /* Validate the settings */ + if ((Irql > HIGH_LEVEL) || + (Number >= KeNumberProcessors) || + (Interrupt->SynchronizeIrql < Irql) || + (Interrupt->FloatingSave)) + { + DPRINT1("Invalid interrupt object\n"); + return FALSE; + } + + /* Set defaults */ + Connected = FALSE; + Error = FALSE; + + /* Set the system affinity and acquire the dispatcher lock */ + KeSetSystemAffinityThread(1 << Number); + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Check if it's already been connected */ + if (!Interrupt->Connected) + { + /* Get vector dispatching information */ + KiGetVectorDispatch(Vector, &Dispatch); + + /* Check if the vector is already connected */ + if (Dispatch.Type == NoConnect) + { + /* Do the connection */ + Interrupt->Connected = Connected = TRUE; + + /* Initialize the list */ + InitializeListHead(&Interrupt->InterruptListEntry); + + /* Connect and enable the interrupt */ + KiConnectVectorToInterrupt(Interrupt, NormalConnect); + Status = HalEnableSystemInterrupt(Vector, Irql, Interrupt->Mode); + if (!Status) Error = TRUE; + } + else if ((Dispatch.Type != UnknownConnect) && + (Interrupt->ShareVector) && + (Dispatch.Interrupt->ShareVector) && + (Dispatch.Interrupt->Mode == Interrupt->Mode)) + { + /* The vector is shared and the interrupts are compatible */ + ASSERT(FALSE); // FIXME: NOT YET SUPPORTED/TESTED + Interrupt->Connected = Connected = TRUE; + ASSERT(Irql <= SYNCH_LEVEL); + + /* Check if this is the first chain */ + if (Dispatch.Type != ChainConnect) + { + /* Setup the chainned handler */ + KiConnectVectorToInterrupt(Dispatch.Interrupt, ChainConnect); + } + + /* Insert into the interrupt list */ + InsertTailList(&Dispatch.Interrupt->InterruptListEntry, + &Interrupt->InterruptListEntry); + } + } + + /* Unlock the dispatcher and revert affinity */ + KeReleaseDispatcherDatabaseLock(OldIrql); + KeRevertToUserAffinityThread(); + + /* Return to caller */ + return Connected; +} + +/* + * @implemented + * + * FUNCTION: Releases a drivers isr + * ARGUMENTS: + * InterruptObject = isr to release + */ +BOOLEAN +STDCALL +KeDisconnectInterrupt(PKINTERRUPT InterruptObject) +{ +#if 0 + KIRQL oldlvl,synch_oldlvl; + PISR_TABLE CurrentIsr; + BOOLEAN State; + + DPRINT1("KeDisconnectInterrupt\n"); + ASSERT (InterruptObject->Number < KeNumberProcessors); + + /* Set the affinity */ + KeSetSystemAffinityThread(1 << InterruptObject->Number); + + /* Get the ISR Tabe */ + CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE] + [(ULONG)InterruptObject->Number]; + + /* Raise IRQL to required level and lock table */ + KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + /* Check if it's actually connected */ + if ((State = InterruptObject->Connected)) + { + /* Lock the Interrupt */ + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + + /* Remove this one, and check if all are gone */ + RemoveEntryList(&InterruptObject->InterruptListEntry); + if (IsListEmpty(&CurrentIsr->ListHead)) + { + /* Completely Disable the Interrupt */ + HalDisableSystemInterrupt(InterruptObject->Vector, InterruptObject->Irql); + } + + /* Disconnect it */ + InterruptObject->Connected = FALSE; + + /* Release the interrupt lock */ + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + } + /* Release the table spinlock */ + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + + /* Go back to default affinity */ + KeRevertToUserAffinityThread(); + + /* Return Old Interrupt State */ + return State; +#endif + return 0; +} + /* EOF */

1 0

[ion] 23676: - Implement Chained and Normal generic interrupt handlers. - Make generated handlers have a proper .func symbol for symbol data. - Make IDT writable, the page shouldn't be read-only. - Change some symbol names.
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 05:53:54 2006 New Revision: 23676 URL: http://svn.reactos.org/svn/reactos?rev=23676&view=rev Log: - Implement Chained and Normal generic interrupt handlers. - Make generated handlers have a proper .func symbol for symbol data. - Make IDT writable, the page shouldn't be read-only. - Change some symbol names. Modified: trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Thu Aug 24 05:53:54 2006 @@ -23,3 +23,4 @@ jmp $ .endfunc + Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2367… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Thu Aug 24 05:53:54 2006 @@ -154,6 +154,16 @@ #define KPCR_PRCB_INTERRUPT_COUNT 0x644 #define KPCR_SYSTEM_CALLS 0x6B8 #define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0x994 + +// +// KINTERRUPT Offsets +// +#define KINTERRUPT_SERVICE_ROUTINE 0x0C +#define KINTERRUPT_SERVICE_CONTEXT 0x10 +#define KINTERRUPT_ACTUAL_LOCK 0x1C +#define KINTERRUPT_IRQL 0x20 +#define KINTERRUPT_VECTOR 0x24 +#define KINTERRUPT_SYNCHRONIZE_IRQL 0x29 // // KGDTENTRY Offsets Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Thu Aug 24 05:53:54 2006 @@ -125,9 +125,11 @@ // @remark None. // .macro GENERATE_INT_HANDLER Number +.func KiUnexpectedInterrupt&Number _KiUnexpectedInterrupt&Number: push PRIMARY_VECTOR_BASE + Number - jmp _KiEndUnexpected + jmp _KiEndUnexpectedRange@0 +.endfunc .endm // Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Thu Aug 24 05:53:54 2006 @@ -489,6 +489,7 @@ NTAPI KeInit2(VOID) { + ULONG Protect; PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); KiInitializeBugCheck(); @@ -548,6 +549,10 @@ { DPRINT("Ke386L2CacheSize: %dkB\n", Pcr->SecondLevelCacheSize); } + + /* Set IDT to writable */ + Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); + MmSetPageProtect(NULL, (PVOID)KiIdt, Protect | PAGE_IS_WRITABLE); } VOID INIT_FUNCTION Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 24 05:53:54 2006 @@ -59,6 +59,12 @@ /* Interrupt template entrypoints */ .globl _KiInterruptTemplate .globl _KiInterruptTemplateObject +.globl _KiInterruptTemplateDispatch + +/* Chained and Normal generic interrupt handlers for 1st and 2nd level entry*/ +.globl _KiChainedDispatch2ndLvl@0 +.globl _KiInterruptDispatch3@0 +.globl _KiChainedDispatch@0 /* We implement the following trap exit points: */ .globl _KiServiceExit /* Exit from syscall */ @@ -70,6 +76,10 @@ _KiIdtDescriptor: .short 0x800 .long _KiIdt + +.globl _KiUnexpectedEntrySize +_KiUnexpectedEntrySize: + .long _KiUnexpectedInterrupt1 - _KiUnexpectedInterrupt0 /* SOFTWARE INTERRUPT SERVICES ***********************************************/ @@ -1301,12 +1311,13 @@ /* UNEXPECTED INTERRUPT HANDLERS **********************************************/ -.globl _KiStartUnexpected -_KiStartUnexpected: +.globl _KiStartUnexpectedRange@0 +_KiStartUnexpectedRange@0: GENERATE_INT_HANDLERS -_KiEndUnexpected: +.globl _KiEndUnexpectedRange@0 +_KiEndUnexpectedRange@0: jmp _KiUnexpectedInterruptTail .func KiUnexpectedInterruptTail @@ -1367,3 +1378,113 @@ _KiInterruptTemplateObject: /* Dummy jump, will be replaced by the actual jump */ jmp _KeSynchronizeExecution@12 + +_KiInterruptTemplateDispatch: + /* Marks the end of the template so that the jump above can be edited */ + +.func KiChainedDispatch2ndLvl@0 +_KiChainedDispatch2ndLvl@0: + + /* Not yet supported */ + int 3 +.endfunc + +.func KiChainedDispatch@0 +_KiChainedDispatch@0: + + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + + /* Save trap frame */ + mov ebp, esp + + /* Save vector and IRQL */ + mov eax, [edi+KINTERRUPT_VECTOR] + mov ecx, [edi+KINTERRUPT_IRQL] + + /* Save old irql */ + push eax + sub esp, 4 + + /* Begin interrupt */ + push eax + push ecx + call _HalBeginSystemInterrupt@12 + + /* Check if it was handled */ + or eax, eax + jz SpuriousInt + sub esp, 12 + + /* Call the 2nd-level handler */ + call _KiChainedDispatch2ndLvl@0 + + /* Exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endfunc + +.func KiInterruptDispatch3@0 +_KiInterruptDispatch3@0: + + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + + /* Save trap frame */ + mov ebp, esp + + /* Save vector and IRQL */ + mov eax, [edi+KINTERRUPT_VECTOR] + mov ecx, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] + + /* Save old irql */ + push eax + sub esp, 4 + push esp + + /* Begin interrupt */ + push eax + push ecx + call _HalBeginSystemInterrupt@12 + + /* Check if it was handled */ + or eax, eax + jz SpuriousInt + sub esp, 12 + + /* Acquire the lock */ +GetIntLock: + mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] + ACQUIRE_SPINLOCK(esi, IntSpin) + + /* Call the ISR */ + mov eax, [edi+KINTERRUPT_SERVICE_CONTEXT] + push eax + push edi + call [edi+KINTERRUPT_SERVICE_ROUTINE] + + /* Release the lock */ + RELEASE_SPINLOCK(esi) + + /* Clean up the stack */ + add esp, 12 + + /* Exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 + +SpuriousInt: + /* Exit the interrupt */ + add esp, 8 + mov esi, $ + jmp _Kei386EoiHelper@0 + +#ifdef CONFIG_SMP +IntSpin: + SPIN_ON_LOCK esi, GetIntLock +#endif +.endfunc

1 0

[fireball] 23675: - Add a new level of debug verbosity - Fix a bunch of warnings by Thomas and me
by fireball＠svn.reactos.org 23 Aug '06

23 Aug '06

Author: fireball Date: Thu Aug 24 02:17:09 2006 New Revision: 23675 URL: http://svn.reactos.org/svn/reactos?rev=23675&view=rev Log: - Add a new level of debug verbosity - Fix a bunch of warnings by Thomas and me Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c trunk/reactos/drivers/usb/nt4compat/usbdriver/debug.h trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c (contents, props changed) trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c (contents, props changed) trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd…

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