Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23715: Fix a missing referencing in PsImpersonateClient (dereferenced in PsRevertThreadToSelf) PspWriteTebImpersonationInfo may be used to set or to clear impersonation info => remove an extra assignment
by hpoussin＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: hpoussin Date: Sat Aug 26 12:46:18 2006 New Revision: 23715 URL: http://svn.reactos.org/svn/reactos?rev=23715&view=rev Log: Fix a missing referencing in PsImpersonateClient (dereferenced in PsRevertThreadToSelf) PspWriteTebImpersonationInfo may be used to set or to clear impersonation info => remove an extra assignment Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sat Aug 26 12:46:18 2006 @@ -149,9 +149,6 @@ Teb->ImpersonationLocale = 0; Teb->IsImpersonating = 0; } - - /* Set new flag */ - Thread->ActiveImpersonationInfo = TRUE; /* Check if we're in a different thread */ if (Thread != CurrentThread) @@ -638,6 +635,7 @@ Impersonation->CopyOnOpen = CopyOnOpen; Impersonation->EffectiveOnly = EffectiveOnly; Impersonation->Token = Token; + ObReferenceObject(Token); /* Unlock the thread */ PspUnlockThreadSecurityExclusive(Thread);

1 0

[ion] 23714: - Transform TRAP_PROLOG into a GAS macro. - Remove code in the page fault handler which was corrupting the trap frame. - Remove some ROS hacks that dealt with the fact the trap frame was getting corrupted, since now it isn't anymore. - Enable code that checks for Teb->GdiBatchCount during win32k system calls. The bugs that were mentionned in the #if 0 are fixed.
by ion＠svn.reactos.org 26 Aug '06

26 Aug '06

Author: ion Date: Sat Aug 26 10:14:32 2006 New Revision: 23714 URL: http://svn.reactos.org/svn/reactos?rev=23714&view=rev Log: - Transform TRAP_PROLOG into a GAS macro. - Remove code in the page fault handler which was corrupting the trap frame. - Remove some ROS hacks that dealt with the fact the trap frame was getting corrupted, since now it isn't anymore. - Enable code that checks for Teb->GdiBatchCount during win32k system calls. The bugs that were mentionned in the #if 0 are fixed. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/mm/i386/pfault.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2371… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sat Aug 26 10:14:32 2006 @@ -327,6 +327,7 @@ #define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 #define TEB_DEALLOCATION_STACK 0xE0C +#define TEB_GDI_BATCH_COUNT 0xF70 #define TEB_GUARANTEED_STACK_BYTES 0xF78 #define TEB_FLS_DATA 0xFB4 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 Sat Aug 26 10:14:32 2006 @@ -266,63 +266,64 @@ // /* Handle trap */ // <Your Trap Code Here> // -#define TRAP_PROLOG(Label) \ - /* Just to be safe, clear out the HIWORD, since it's reserved */ \ - mov word ptr [esp+2], 0; \ -\ - /* Save the non-volatiles */ \ - push ebp; \ - push ebx; \ - push esi; \ - push edi; \ -\ - /* Save FS and set it to PCR */ \ - push fs; \ - mov ebx, KGDT_R0_PCR; \ - mov fs, bx; \ -\ - /* Save exception list and bogus previous mode */ \ - push fs:[KPCR_EXCEPTION_LIST]; \ - push -1; \ -\ - /* Save volatiles and segment registers */ \ - push eax; \ - push ecx; \ - push edx; \ - push ds; \ - push es; \ - push gs; \ -\ - /* Set the R3 data segment */ \ - mov ax, KGDT_R3_DATA + RPL_MASK; \ -\ - /* Skip debug registers and debug stuff */ \ - sub esp, 0x30; \ -\ - /* Load the segment registers */ \ - mov ds, ax; \ - mov es, ax; \ -\ - /* Set up frame */ \ - mov ebp, esp; \ -\ - /* Check if this was from V86 Mode */ \ - /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ \ - /* jnz V86_Label; */ \ -\ - /* Get current thread */ \ - mov ecx, [fs:KPCR_CURRENT_THREAD]; \ - cld; \ -\ - /* Flush DR7 */ \ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0; \ -\ - /* Check if the thread was being debugged */ \ - /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ \ - /* jnz Dr_Label; */ \ -\ - /* Set the Trap Frame Debug Header */ \ +.macro TRAP_PROLOG Label + /* Just to be safe, clear out the HIWORD, since it's reserved */ + mov word ptr [esp+2], 0 + + /* Save the non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Save FS and set it to PCR */ + push fs + mov ebx, KGDT_R0_PCR + mov fs, bx + + /* Save exception list and bogus previous mode */ + push fs:[KPCR_EXCEPTION_LIST] + push -1 + + /* Save volatiles and segment registers */ + push eax + push ecx + push edx + push ds + push es + push gs + + /* Set the R3 data segment */ + mov ax, KGDT_R3_DATA + RPL_MASK + + /* Skip debug registers and debug stuff */ + sub esp, 0x30 + + /* Load the segment registers */ + mov ds, ax + mov es, ax + + /* Set up frame */ + mov ebp, esp + + /* Check if this was from V86 Mode */ + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ + /* jnz V86_Label; */ + + /* Get current thread */ + mov ecx, [fs:KPCR_CURRENT_THREAD] + cld + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ + /* jnz Dr_Label; */ + + /* Set the Trap Frame Debug Header */ SET_TF_DEBUG_HEADER +.endm // // @name INT_PROLOG @@ -507,23 +508,6 @@ /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz 0f - mov edi, [edi+4] -0: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - /* Enable interrupts */ sti .endm @@ -754,20 +738,9 @@ #if DBG 0: -#if 0 - /* Print a message */ - mov esi, [esp+KTRAP_FRAME_DEBUGARGMARK] - mov edi, [esp+KTRAP_FRAME_DEBUGARGMARK-4] - push edi - push esi - push offset Broken - call _DbgPrint - add esp, 12 -#endif - jmp 2b // ros hack - /* Fix up the mask */ add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + 6: int 3 jmp 5b 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 Sat Aug 26 10:14:32 2006 @@ -187,23 +187,6 @@ /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz PrevWasKernelMode - mov edi, [edi+4] -PrevWasKernelMode: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - /* Enable interrupts */ sti @@ -229,9 +212,6 @@ /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange -#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. - // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be - // sent through the PsInitializeWin32Callouts structure) /* Check if this was Win32K */ cmp ecx, SERVICE_TABLE_TEST jnz NotWin32K @@ -242,15 +222,14 @@ /* Check if we should flush the User Batch */ xor ebx, ebx or ebx, [ecx+TEB_GDI_BATCH_COUNT] - jz NoWin32K + jz NotWin32K /* Flush it */ push edx push eax - call [_KeGdiFlushUserBatch] + //call [_KeGdiFlushUserBatch] pop eax pop edx -#endif NotWin32K: /* Increase total syscall count */ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Sat Aug 26 10:14:32 2006 @@ -36,9 +36,6 @@ ASSERT(ExceptionNr == 14); - /* Store the exception number in an unused field in the trap frame. */ - Tf->DbgArgMark = 14; - /* get the faulting address */ cr2 = Ke386GetCr2(); Tf->DbgArgPointer = cr2;

1 0

[turner] 23713: * Implement: /low, /normal, /high, /realtime, /belownormal, and /abovenormal * Correctly build the string used to create the process.
by turner＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: turner Date: Sat Aug 26 03:12:50 2006 New Revision: 23713 URL: http://svn.reactos.org/svn/reactos?rev=23713&view=rev Log: * Implement: /low, /normal, /high, /realtime, /belownormal, and /abovenormal * Correctly build the string used to create the process. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Sat Aug 26 03:12:50 2006 @@ -23,6 +23,7 @@ TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; + TCHAR RestWithoutArgs[CMDLINE_LENGTH]; INT size; LPTSTR comspec; BOOL bWait = FALSE; @@ -31,15 +32,63 @@ TCHAR szFullCmdLine [CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; - + LPTSTR *arg; + INT argc = 0; + INT i = 0; + DWORD Priority = 0; - - if (_tcsncmp (Rest, _T("/?"), 2) == 0) - { - ConOutResPaging(TRUE,STRING_START_HELP1); - return 0; - } - + RestWithoutArgs[0] = _T('\0'); + _tcscpy(first,First); + arg = split (Rest, &argc, FALSE); + + + for (i = 0; i < argc; i++) + { + if (!_tcsncmp (arg[i], _T("/?"), 2)) + { + freep(arg); + ConOutResPaging(TRUE,STRING_START_HELP1); + return 0; + } + else if(!_tcsicmp(arg[i], "/LOW")) + { + Priority = IDLE_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/NORMAL")) + { + Priority = NORMAL_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/HIGH")) + { + Priority = HIGH_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/REALTIME")) + { + Priority = REALTIME_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/ABOVENORMAL")) + { + Priority = ABOVE_NORMAL_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/BELOWNORMAL")) + { + Priority = BELOW_NORMAL_PRIORITY_CLASS; + } + else + { + if(RestWithoutArgs[0] != _T('\0')) + { + _tcscat(RestWithoutArgs,_T(" ")); + } + _tcscat(RestWithoutArgs,arg[i]); + } + } + + + + + freep (arg); + /* get comspec */ comspec = malloc ( MAX_PATH * sizeof(TCHAR)); if (comspec == NULL) @@ -51,7 +100,10 @@ size = GetEnvironmentVariable (_T("COMSPEC"), comspec, 512); if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) { - Rest = _T("cmd"); + RestWithoutArgs[0] = _T('c'); + RestWithoutArgs[1] = _T('m'); + RestWithoutArgs[2] = _T('d'); + RestWithoutArgs[3] = _T('\0'); } else { @@ -68,14 +120,14 @@ nErrorLevel = 0; - if( !*Rest ) - { - _tcscpy(Rest,_T("\"")); - _tcscat(Rest,comspec); - _tcscat(Rest,_T("\"")); - } - - rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if(!_tcslen(RestWithoutArgs)) + { + _tcscpy(RestWithoutArgs,_T("\"")); + _tcscat(RestWithoutArgs,comspec); + _tcscat(RestWithoutArgs,_T("\"")); + } + + rest = malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL) @@ -84,7 +136,7 @@ return 1; } - param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + param =malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL) @@ -97,12 +149,11 @@ param[0] = _T('\0'); - _tcscpy(rest,Rest); + _tcscpy(rest,RestWithoutArgs); /* Parsing the command that gets called by start, and it's parameters */ if(!_tcschr(rest,_T('\"'))) { - INT i = 0; INT count = _tcslen(rest); /* find the end of the command and start of the args */ @@ -111,7 +162,7 @@ if(rest[i] == _T(' ')) { - _tcscpy(param,&rest[i]); + _tcscpy(param,&rest[i+1]); rest[i] = _T('\0'); break; } @@ -119,7 +170,6 @@ } else { - INT i = 0; INT count = _tcslen(rest); BOOL bInside = FALSE; @@ -130,7 +180,7 @@ bInside = !bInside; if((rest[i] == _T(' ')) && !bInside) { - _tcscpy(param,&rest[i]); + _tcscpy(param,&rest[i+1]); rest[i] = _T('\0'); break; } @@ -233,12 +283,12 @@ if (bBat == TRUE) { bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); } else { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); } if (bCreate)

1 0

[hpoussin] 23712: Implement IOCTL_SERIAL_WAIT_ON_MASK Better implementation of IOCTL_SERIAL_SET_WAIT_MASK Remove "Serial:" prefix on debug output
by hpoussin＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: hpoussin Date: Sat Aug 26 02:07:10 2006 New Revision: 23712 URL: http://svn.reactos.org/svn/reactos?rev=23712&view=rev Log: Implement IOCTL_SERIAL_WAIT_ON_MASK Better implementation of IOCTL_SERIAL_SET_WAIT_MASK Remove "Serial:" prefix on debug output Modified: trunk/reactos/drivers/base/serial/circularbuffer.c trunk/reactos/drivers/base/serial/cleanup.c trunk/reactos/drivers/base/serial/close.c trunk/reactos/drivers/base/serial/create.c trunk/reactos/drivers/base/serial/devctrl.c trunk/reactos/drivers/base/serial/info.c trunk/reactos/drivers/base/serial/misc.c trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/base/serial/power.c trunk/reactos/drivers/base/serial/rw.c trunk/reactos/drivers/base/serial/serial.h Modified: trunk/reactos/drivers/base/serial/circularbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/circul… ============================================================================== --- trunk/reactos/drivers/base/serial/circularbuffer.c (original) +++ trunk/reactos/drivers/base/serial/circularbuffer.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PCIRCULAR_BUFFER pBuffer, IN ULONG BufferSize) { - DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + DPRINT("InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); ASSERT(pBuffer); pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) @@ -29,7 +29,7 @@ FreeCircularBuffer( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + DPRINT("FreeCircularBuffer(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); if (pBuffer->Buffer != NULL) ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); @@ -40,9 +40,18 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + DPRINT("IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); +} + +ULONG +GetNumberOfElementsInCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("GetNumberOfElementsInCircularBuffer(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); + return (pBuffer->WritePosition + pBuffer->Length - pBuffer->ReadPosition) % pBuffer->Length; } NTSTATUS @@ -51,7 +60,7 @@ IN UCHAR Entry) { ULONG NextPosition; - DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + DPRINT("PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer); ASSERT(pBuffer->Length); NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; @@ -67,7 +76,7 @@ IN PCIRCULAR_BUFFER pBuffer, OUT PUCHAR Entry) { - DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + DPRINT("PopCircularBufferEntry(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) @@ -84,7 +93,7 @@ { PUCHAR NewBuffer; - DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + DPRINT("IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (pBuffer->Length > NewBufferSize) Modified: trunk/reactos/drivers/base/serial/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/cleanu… ============================================================================== --- trunk/reactos/drivers/base/serial/cleanup.c (original) +++ trunk/reactos/drivers/base/serial/cleanup.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("Serial: IRP_MJ_CLEANUP\n"); + DPRINT("IRP_MJ_CLEANUP\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/base/serial/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/close.… ============================================================================== --- trunk/reactos/drivers/base/serial/close.c (original) +++ trunk/reactos/drivers/base/serial/close.c Sat Aug 26 02:07:10 2006 @@ -17,7 +17,7 @@ { PSERIAL_DEVICE_EXTENSION pDeviceExtension; - DPRINT("Serial: IRP_MJ_CLOSE\n"); + DPRINT("IRP_MJ_CLOSE\n"); pDeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; pDeviceExtension->IsOpened = FALSE; Modified: trunk/reactos/drivers/base/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/create… ============================================================================== --- trunk/reactos/drivers/base/serial/create.c (original) +++ trunk/reactos/drivers/base/serial/create.c Sat Aug 26 02:07:10 2006 @@ -19,7 +19,7 @@ PSERIAL_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_CREATE\n"); + DPRINT("IRP_MJ_CREATE\n"); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -32,12 +32,12 @@ if(DeviceExtension->IsOpened) { - DPRINT("Serial: COM%lu is already opened\n", DeviceExtension->ComPort); + DPRINT("COM%lu is already opened\n", DeviceExtension->ComPort); Status = STATUS_ACCESS_DENIED; goto ByeBye; } - DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); + DPRINT("Open COM%lu: successfull\n", DeviceExtension->ComPort); DeviceExtension->IsOpened = TRUE; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/base/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/devctr… ============================================================================== --- trunk/reactos/drivers/base/serial/devctrl.c (original) +++ trunk/reactos/drivers/base/serial/devctrl.c Sat Aug 26 02:07:10 2006 @@ -65,7 +65,7 @@ if (NT_SUCCESS(Status)) { UCHAR Lcr; - DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); + DPRINT("SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); /* Set Bit 7 of LCR to expose baud registers */ Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr | SR_LCR_DLAB); @@ -95,7 +95,7 @@ ASSERT(DeviceExtension); ASSERT(NewSettings); - DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", + DPRINT("SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); /* Verify parameters */ @@ -289,7 +289,7 @@ PUCHAR ComPortBase; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); + DPRINT("IRP_MJ_DEVICE_CONTROL dispatch\n"); Stack = IoGetCurrentIrpStackLocation(Irp); LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; @@ -305,7 +305,7 @@ { case IOCTL_SERIAL_CLEAR_STATS: { - DPRINT("Serial: IOCTL_SERIAL_CLEAR_STATS\n"); + DPRINT("IOCTL_SERIAL_CLEAR_STATS\n"); KeSynchronizeExecution( DeviceExtension->Interrupt, (PKSYNCHRONIZE_ROUTINE)SerialClearPerfStats, @@ -315,7 +315,7 @@ } case IOCTL_SERIAL_CLR_DTR: { - DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); + DPRINT("IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -329,7 +329,7 @@ } case IOCTL_SERIAL_CLR_RTS: { - DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); + DPRINT("IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -345,7 +345,7 @@ { /* Obsolete on Microsoft Windows 2000+ */ PULONG pConfigSize; - DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); + DPRINT("IOCTL_SERIAL_CONFIG_SIZE\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -359,7 +359,7 @@ } case IOCTL_SERIAL_GET_BAUD_RATE: { - DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); + DPRINT("IOCTL_SERIAL_GET_BAUD_RATE\n"); if (LengthOut < sizeof(SERIAL_BAUD_RATE)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -375,23 +375,17 @@ case IOCTL_SERIAL_GET_CHARS: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_CHARS not implemented.\n"); + DPRINT1("IOCTL_SERIAL_GET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_COMMSTATUS: { - DPRINT("Serial: IOCTL_SERIAL_GET_COMMSTATUS\n"); + DPRINT("IOCTL_SERIAL_GET_COMMSTATUS\n"); if (LengthOut < sizeof(SERIAL_STATUS)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { Status = SerialGetCommStatus((PSERIAL_STATUS)BufferOut, DeviceExtension); @@ -402,7 +396,7 @@ case IOCTL_SERIAL_GET_DTRRTS: { PULONG pDtrRts; - DPRINT("Serial: IOCTL_SERIAL_GET_DTRRTS\n"); + DPRINT("IOCTL_SERIAL_GET_DTRRTS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -421,13 +415,13 @@ case IOCTL_SERIAL_GET_HANDFLOW: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); + DPRINT1("IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_LINE_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_GET_LINE_CONTROL\n"); + DPRINT("IOCTL_SERIAL_GET_LINE_CONTROL\n"); if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -443,7 +437,7 @@ case IOCTL_SERIAL_GET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEM_CONTROL\n"); + DPRINT("IOCTL_SERIAL_GET_MODEM_CONTROL\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -458,7 +452,7 @@ case IOCTL_SERIAL_GET_MODEMSTATUS: { PULONG pMSR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEMSTATUS\n"); + DPRINT("IOCTL_SERIAL_GET_MODEMSTATUS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -472,17 +466,11 @@ } case IOCTL_SERIAL_GET_PROPERTIES: { - DPRINT("Serial: IOCTL_SERIAL_GET_PROPERTIES\n"); + DPRINT("IOCTL_SERIAL_GET_PROPERTIES\n"); if (LengthOut < sizeof(SERIAL_COMMPROP)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { Status = SerialGetCommProp((PSERIAL_COMMPROP)BufferOut, DeviceExtension); @@ -492,17 +480,11 @@ } case IOCTL_SERIAL_GET_STATS: { - DPRINT("Serial: IOCTL_SERIAL_GET_STATS\n"); + DPRINT("IOCTL_SERIAL_GET_STATS\n"); if (LengthOut < sizeof(SERIALPERF_STATS)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { KeSynchronizeExecution(DeviceExtension->Interrupt, @@ -514,7 +496,7 @@ } case IOCTL_SERIAL_GET_TIMEOUTS: { - DPRINT("Serial: IOCTL_SERIAL_GET_TIMEOUTS\n"); + DPRINT("IOCTL_SERIAL_GET_TIMEOUTS\n"); if (LengthOut != sizeof(SERIAL_TIMEOUTS) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -528,7 +510,7 @@ case IOCTL_SERIAL_GET_WAIT_MASK: { PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_GET_WAIT_MASK\n"); + DPRINT("IOCTL_SERIAL_GET_WAIT_MASK\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -543,21 +525,21 @@ case IOCTL_SERIAL_IMMEDIATE_CHAR: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); + DPRINT1("IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_LSRMST_INSERT: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); + DPRINT1("IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_PURGE: { KIRQL Irql; - DPRINT("Serial: IOCTL_SERIAL_PURGE\n"); + DPRINT("IOCTL_SERIAL_PURGE\n"); /* FIXME: SERIAL_PURGE_RXABORT and SERIAL_PURGE_TXABORT * should stop current request */ if (LengthIn != sizeof(ULONG) || BufferIn == NULL) @@ -607,14 +589,14 @@ case IOCTL_SERIAL_RESET_DEVICE: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); + DPRINT1("IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BAUD_RATE: { PULONG pNewBaudRate; - DPRINT("Serial: IOCTL_SERIAL_SET_BAUD_RATE\n"); + DPRINT("IOCTL_SERIAL_SET_BAUD_RATE\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -627,21 +609,21 @@ case IOCTL_SERIAL_SET_BREAK_OFF: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BREAK_ON: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_CHARS: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_CHARS not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } @@ -649,7 +631,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_DTR\n"); + DPRINT("IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -666,7 +648,7 @@ } case IOCTL_SERIAL_SET_FIFO_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_SET_FIFO_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_FIFO_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -683,13 +665,13 @@ case IOCTL_SERIAL_SET_HANDFLOW: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_LINE_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_SET_LINE_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_LINE_CONTROL\n"); if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferIn == NULL) @@ -701,7 +683,7 @@ case IOCTL_SERIAL_SET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_SET_MODEM_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_MODEM_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -747,7 +729,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_RTS\n"); + DPRINT("IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -764,7 +746,7 @@ } case IOCTL_SERIAL_SET_TIMEOUTS: { - DPRINT("Serial: IOCTL_SERIAL_SET_TIMEOUTS\n"); + DPRINT("IOCTL_SERIAL_SET_TIMEOUTS\n"); if (LengthIn != sizeof(SERIAL_TIMEOUTS) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -776,13 +758,18 @@ } case IOCTL_SERIAL_SET_WAIT_MASK: { - PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_SET_WAIT_MASK\n"); + PULONG pWaitMask = (PULONG)BufferIn; + DPRINT("IOCTL_SERIAL_SET_WAIT_MASK\n"); + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; - else - { - pWaitMask = (PULONG)BufferIn; + else if (DeviceExtension->WaitOnMaskIrp) /* FIXME: Race condition ; field may be currently in modification */ + { + DPRINT("An IRP is already currently processed\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { DeviceExtension->WaitMask = *pWaitMask; Status = STATUS_SUCCESS; } @@ -791,42 +778,75 @@ case IOCTL_SERIAL_SET_XOFF: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XOFF not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_XOFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_XON: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XON not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_XON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_WAIT_ON_MASK: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_WAIT_ON_MASK not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + PIRP WaitingIrp; + DPRINT("IOCTL_SERIAL_WAIT_ON_MASK\n"); + + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + /* FIXME: Race condition here: + * If an interrupt comes before we can mark the Irp + * as pending, it might be possible to complete the + * Irp before pending it, leading to a crash! */ + WaitingIrp = InterlockedCompareExchangePointer( + &DeviceExtension->WaitOnMaskIrp, + Irp, + NULL); + + /* Check if an Irp is already pending */ + if (WaitingIrp != NULL) + { + /* Unable to have a 2nd pending IRP for this IOCTL */ + DPRINT("Unable to pend a second IRP for IOCTL_SERIAL_WAIT_ON_MASK\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_PENDING; + /* FIXME: immediately return if a wait event already occurred */ + } + } break; } case IOCTL_SERIAL_XOFF_COUNTER: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); + DPRINT1("IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } default: { /* Pass Irp to lower driver */ - DPRINT("Serial: Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + DPRINT("Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDevice, Irp); } } - Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + } + else + { + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } return Status; } Modified: trunk/reactos/drivers/base/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/info.c… ============================================================================== --- trunk/reactos/drivers/base/serial/info.c (original) +++ trunk/reactos/drivers/base/serial/info.c Sat Aug 26 02:07:10 2006 @@ -33,7 +33,7 @@ { PFILE_STANDARD_INFORMATION StandardInfo = (PFILE_STANDARD_INFORMATION)SystemBuffer; - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); + DPRINT("IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!StandardInfo) @@ -55,7 +55,7 @@ ASSERT(PositionInfo); - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); + DPRINT("IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!PositionInfo) @@ -69,7 +69,7 @@ } default: { - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); + DPRINT("IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/base/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/misc.c… ============================================================================== --- trunk/reactos/drivers/base/serial/misc.c (original) +++ trunk/reactos/drivers/base/serial/misc.c Sat Aug 26 02:07:10 2006 @@ -36,7 +36,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Serial: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -84,7 +84,7 @@ while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) { Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - DPRINT("Serial: Byte received on COM%lu: 0x%02x\n", + DPRINT("Byte received on COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); Status = PushCircularBufferEntry(&DeviceExtension->InputBuffer, Byte); if (NT_SUCCESS(Status)) @@ -125,7 +125,7 @@ if (!NT_SUCCESS(Status)) break; WRITE_PORT_UCHAR(SER_THR(ComPortBase), Byte); - DPRINT("Serial: Byte sent to COM%lu: 0x%02x\n", + DPRINT("Byte sent to COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; } @@ -136,6 +136,16 @@ WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); +} + +VOID NTAPI +SerialCompleteIrp( + IN PKDPC Dpc, + IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION + IN PVOID pIrp, // real type PIRP + IN PVOID Unused) +{ + IoCompleteRequest((PIRP)pIrp, IO_NO_INCREMENT); } BOOLEAN NTAPI @@ -147,6 +157,10 @@ PSERIAL_DEVICE_EXTENSION DeviceExtension; PUCHAR ComPortBase; UCHAR Iir; + ULONG Events = 0; + BOOLEAN ret = FALSE; + + /* FIXME: sometimes, produce SERIAL_EV_RXFLAG event */ DeviceObject = (PDEVICE_OBJECT)ServiceContext; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -163,7 +177,7 @@ case SR_IIR_MSR_CHANGE: { UCHAR MSR, IER; - DPRINT("Serial: SR_IIR_MSR_CHANGE\n"); + DPRINT("SR_IIR_MSR_CHANGE\n"); MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); if (MSR & SR_MSR_CTS_CHANGED) @@ -172,6 +186,7 @@ KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); else ; /* FIXME: stop transmission */ + Events |= SERIAL_EV_CTS; } if (MSR & SR_MSR_DSR_CHANGED) { @@ -179,50 +194,103 @@ KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); else ; /* FIXME: stop reception */ + Events |= SERIAL_EV_DSR; } if (MSR & SR_MSR_RI_CHANGED) { DPRINT("SR_MSR_RI_CHANGED changed: now %d\n", MSR & SI_MSR_RI); + Events |= SERIAL_EV_RING; } if (MSR & SR_MSR_DCD_CHANGED) { DPRINT("SR_MSR_DCD_CHANGED changed: now %d\n", MSR & SR_MSR_DCD); + Events |= SERIAL_EV_RLSD; } IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_MSR_CHANGE); - return TRUE; + + ret = TRUE; + goto done; } case SR_IIR_THR_EMPTY: { - DPRINT("Serial: SR_IIR_THR_EMPTY\n"); + DPRINT("SR_IIR_THR_EMPTY\n"); KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); - return TRUE; + Events |= SERIAL_EV_TXEMPTY; + + ret = TRUE; + goto done; } case SR_IIR_DATA_RECEIVED: { - DPRINT("Serial: SR_IIR_DATA_RECEIVED\n"); + ULONG AlreadyReceivedBytes, Limit; + DPRINT("SR_IIR_DATA_RECEIVED\n"); KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); - return TRUE; + Events |= SERIAL_EV_RXCHAR; + + /* Check if buffer will be 80% full */ + AlreadyReceivedBytes = GetNumberOfElementsInCircularBuffer( + &DeviceExtension->InputBuffer) * 5; + Limit = DeviceExtension->InputBuffer.Length * 4; + if (AlreadyReceivedBytes < Limit && AlreadyReceivedBytes + 1 >= Limit) + { + /* Buffer is full at 80% */ + Events |= SERIAL_EV_RX80FULL; + } + + ret = TRUE; + goto done; } case SR_IIR_ERROR: { UCHAR LSR; - DPRINT("Serial: SR_IIR_ERROR\n"); + DPRINT("SR_IIR_ERROR\n"); LSR = READ_PORT_UCHAR(SER_LSR(ComPortBase)); if (LSR & SR_LSR_OVERRUN_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.SerialOverrunErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_PARITY_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.ParityErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_FRAMING_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.FrameErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_BREAK_INT) + { InterlockedIncrement((PLONG)&DeviceExtension->BreakInterruptErrorCount); - - return TRUE; - } - } - return FALSE; -} + Events |= SERIAL_EV_BREAK; + } + + ret = TRUE; + goto done; + } + } + +done: + if (!ret) + return FALSE; + if (DeviceExtension->WaitOnMaskIrp && (Events & DeviceExtension->WaitMask)) + { + /* Finish pending IRP */ + PULONG pEvents = (PULONG)DeviceExtension->WaitOnMaskIrp->AssociatedIrp.SystemBuffer; + + DeviceExtension->WaitOnMaskIrp->IoStatus.Status = STATUS_SUCCESS; + DeviceExtension->WaitOnMaskIrp->IoStatus.Information = sizeof(ULONG); + *pEvents = Events; + KeInsertQueueDpc(&DeviceExtension->CompleteIrpDpc, DeviceExtension->WaitOnMaskIrp, NULL); + + /* We are now ready to handle another IRP, even if this one is not completed */ + DeviceExtension->WaitOnMaskIrp = NULL; + return STATUS_SUCCESS; + } + return TRUE; +} Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Sat Aug 26 02:07:10 2006 @@ -28,7 +28,7 @@ static ULONG DeviceNumber = 0; static ULONG ComPortNumber = 1; - DPRINT("Serial: SerialAddDeviceInternal called\n"); + DPRINT("SerialAddDeviceInternal()\n"); ASSERT(DriverObject); ASSERT(Pdo); @@ -45,7 +45,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoCreateDevice() failed with status 0x%08x\n", Status); + DPRINT("IoCreateDevice() failed with status 0x%08x\n", Status); Fdo = NULL; goto ByeBye; } @@ -56,7 +56,7 @@ Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_COMPORT, NULL, &DeviceExtension->SerialInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); + DPRINT("IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); goto ByeBye; } @@ -78,11 +78,12 @@ KeInitializeEvent(&DeviceExtension->InputBufferNotEmpty, NotificationEvent, FALSE); KeInitializeDpc(&DeviceExtension->ReceivedByteDpc, SerialReceiveByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->SendByteDpc, SerialSendByte, DeviceExtension); + KeInitializeDpc(&DeviceExtension->CompleteIrpDpc, SerialCompleteIrp, DeviceExtension); Fdo->Flags |= DO_POWER_PAGABLE; Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); goto ByeBye; } Fdo->Flags |= DO_BUFFERED_IO; @@ -185,7 +186,7 @@ } } } - DPRINT("Serial: New COM port. Base = 0x%lx, Irql = %u\n", + DPRINT("New COM port. Base = 0x%lx, Irql = %u\n", DeviceExtension->BaseAddress, Dirql); if (!DeviceExtension->BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; @@ -212,7 +213,7 @@ Status = SerialSetBaudRate(DeviceExtension, DeviceExtension->BaudRate); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: SerialSetBaudRate() failed with status 0x%08x\n", Status); + DPRINT("SerialSetBaudRate() failed with status 0x%08x\n", Status); return Status; } @@ -223,7 +224,7 @@ Status = SerialSetLineControl(DeviceExtension, &DeviceExtension->SerialLineControl); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: SerialSetLineControl() failed with status 0x%08x\n", Status); + DPRINT("SerialSetLineControl() failed with status 0x%08x\n", Status); return Status; } @@ -245,7 +246,7 @@ Status = IoCreateSymbolicLink(&LinkName, &DeviceName); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoCreateSymbolicLink() failed with status 0x%08x\n", Status); + DPRINT("IoCreateSymbolicLink() failed with status 0x%08x\n", Status); return Status; } @@ -258,7 +259,7 @@ Affinity, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoConnectInterrupt() failed with status 0x%08x\n", Status); + DPRINT("IoConnectInterrupt() failed with status 0x%08x\n", Status); IoSetDeviceInterfaceState(&DeviceExtension->SerialInterfaceName, FALSE); IoDeleteSymbolicLink(&LinkName); return Status; @@ -313,7 +314,7 @@ IRP_MN_QUERY_REMOVE_DEVICE 0x1 IRP_MN_REMOVE_DEVICE 0x2 { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); IoAcquireRemoveLock IoReleaseRemoveLockAndWait pass request to DeviceExtension-LowerDriver @@ -336,7 +337,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); @@ -345,7 +346,7 @@ */ if (Stack->Parameters.StartDevice.AllocatedResources == NULL) { - DPRINT1("Serial: no allocated resources. Can't start COM%lu\n", + DPRINT1("No allocated resources. Can't start COM%lu\n", ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort); Status = STATUS_INSUFFICIENT_RESOURCES; break; @@ -366,16 +367,16 @@ { case BusRelations: { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } case RemovalRelations: { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: - DPRINT1("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -383,7 +384,7 @@ } default: { - DPRINT1("Serial: unknown minor function 0x%x\n", MinorFunction); + DPRINT1("Unknown minor function 0x%x\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/base/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/power.… ============================================================================== --- trunk/reactos/drivers/base/serial/power.c (original) +++ trunk/reactos/drivers/base/serial/power.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("Serial: IRP_MJ_POWER dispatch\n"); + DPRINT("IRP_MJ_POWER dispatch\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/base/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/rw.c?r… ============================================================================== --- trunk/reactos/drivers/base/serial/rw.c (original) +++ trunk/reactos/drivers/base/serial/rw.c Sat Aug 26 02:07:10 2006 @@ -44,10 +44,10 @@ Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); - DPRINT("Serial: UseIntervalTimeout = %s, IntervalTimeout = %lu\n", + DPRINT("UseIntervalTimeout = %s, IntervalTimeout = %lu\n", WorkItemData->UseIntervalTimeout ? "YES" : "NO", WorkItemData->UseIntervalTimeout ? WorkItemData->IntervalTimeout.QuadPart : 0); - DPRINT("Serial: UseTotalTimeout = %s\n", + DPRINT("UseTotalTimeout = %s\n", WorkItemData->UseTotalTimeout ? "YES" : "NO"); ObjectCount = 1; @@ -69,7 +69,7 @@ && Length > 0) { PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - DPRINT("Serial: reading byte from buffer: 0x%02x\n", ReceivedByte); + DPRINT("Reading byte from buffer: 0x%02x\n", ReceivedByte); Buffer[Information++] = ReceivedByte; Length--; @@ -80,7 +80,7 @@ if (WorkItemData->DontWait && !(WorkItemData->ReadAtLeastOneByte && Information == 0)) { - DPRINT("Serial: buffer empty. Don't wait more bytes\n"); + DPRINT("Buffer empty. Don't wait more bytes\n"); break; } @@ -97,7 +97,7 @@ if (Status == STATUS_TIMEOUT /* interval timeout */ || Status == STATUS_WAIT_1) /* total timeout */ { - DPRINT("Serial: timeout when reading bytes. Status = 0x%08lx\n", Status); + DPRINT("Timeout when reading bytes. Status = 0x%08lx\n", Status); break; } } @@ -121,7 +121,7 @@ PWORKITEM_DATA WorkItemData; PIRP Irp; - DPRINT("Serial: SerialReadWorkItem() called\n"); + DPRINT("SerialReadWorkItem() called\n"); WorkItemData = (PWORKITEM_DATA)pWorkItemData; Irp = WorkItemData->Irp; @@ -147,7 +147,7 @@ PIO_WORKITEM WorkItem; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_READ\n"); + DPRINT("IRP_MJ_READ\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Length = Stack->Parameters.Read.Length; @@ -259,7 +259,7 @@ KIRQL Irql; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("Serial: IRP_MJ_WRITE\n"); + DPRINT("IRP_MJ_WRITE\n"); /* FIXME: pend operation if possible */ /* FIXME: use write timeouts */ @@ -296,7 +296,7 @@ } else { - DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); + DPRINT("Buffer overrun on COM%lu\n", DeviceExtension->ComPort); DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; break; } Modified: trunk/reactos/drivers/base/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.h (original) +++ trunk/reactos/drivers/base/serial/serial.h Sat Aug 26 02:07:10 2006 @@ -81,10 +81,12 @@ PKINTERRUPT Interrupt; KDPC ReceivedByteDpc; KDPC SendByteDpc; + KDPC CompleteIrpDpc; SERIAL_LINE_CONTROL SerialLineControl; UART_TYPE UartType; ULONG WaitMask; + PIRP WaitOnMaskIrp; ULONG BreakInterruptErrorCount; SERIALPERF_STATS SerialPerfStats; @@ -204,6 +206,10 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer); +ULONG +GetNumberOfElementsInCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer); + NTSTATUS PushCircularBufferEntry( IN PCIRCULAR_BUFFER pBuffer, @@ -286,8 +292,8 @@ SerialReceiveByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION - IN PVOID pByte, // real type UCHAR - IN PVOID Unused); + IN PVOID Unused1, + IN PVOID Unused2); VOID NTAPI SerialSendByte( @@ -296,6 +302,13 @@ IN PVOID Unused1, IN PVOID Unused2); +VOID NTAPI +SerialCompleteIrp( + IN PKDPC Dpc, + IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION + IN PVOID pIrp, // real type PIRP + IN PVOID Unused); + BOOLEAN NTAPI SerialInterruptService( IN PKINTERRUPT Interrupt,

1 0

[greatlrd] 23710: forget this file thx christ
by greatlrd＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: greatlrd Date: Fri Aug 25 22:26:26 2006 New Revision: 23710 URL: http://svn.reactos.org/svn/reactos?rev=23710&view=rev Log: forget this file thx christ Added: trunk/reactos/base/applications/network/net/net.rbuild Added: trunk/reactos/base/applications/network/net/net.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.rbuild (added) +++ trunk/reactos/base/applications/network/net/net.rbuild Fri Aug 25 22:26:26 2006 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<module name="net" type="win32cui" installbase="system32" installname="net.exe"> + <include base="ping">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>main.c</file> + <file>cmdstart.c</file> + <file>cmdStop.c</file> + <file>help.c</file> + <file>process.c</file> + +</module>

1 0

[greatlrd] 23709: Add frist version of ReactOS net command. I finish frist step early that I calc, you need samba-tng rpcclient to use net command in your path. net command only support follow command "net start, net start serivce_display name, net stop", more will follow later. The help text I need some help with to fill in the info how thuse command work and design the help text better.
by greatlrd＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: greatlrd Date: Fri Aug 25 21:50:26 2006 New Revision: 23709 URL: http://svn.reactos.org/svn/reactos?rev=23709&view=rev Log: Add frist version of ReactOS net command. I finish frist step early that I calc, you need samba-tng rpcclient to use net command in your path. net command only support follow command "net start, net start serivce_display name, net stop", more will follow later. The help text I need some help with to fill in the info how thuse command work and design the help text better. Added: trunk/reactos/base/applications/network/net/ trunk/reactos/base/applications/network/net/cmdStop.c (with props) trunk/reactos/base/applications/network/net/cmdstart.c (with props) trunk/reactos/base/applications/network/net/help.c (with props) trunk/reactos/base/applications/network/net/main.c (with props) trunk/reactos/base/applications/network/net/net.h (with props) trunk/reactos/base/applications/network/net/process.c (with props) Modified: trunk/reactos/base/applications/network/network.rbuild Added: trunk/reactos/base/applications/network/net/cmdStop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdStop.c (added) +++ trunk/reactos/base/applications/network/net/cmdStop.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,107 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdStop(INT argc, CHAR **argv ) +{ + char *string; + long size = 100*sizeof(char); + + if (argc>4) + { + help(); + return 0; + } + + if (argc==2) + { + string = (char *) malloc(size); + if (string != NULL) + { + sprintf(string,"rpcclient -c \"service enum\""); + system(string); + free(string); + } + return 0; + } + + if (argc==3) + { + stop_service(argv[1]); + return 0; + } + + return 0; +} + + +INT stop_service(CHAR *service) +{ + + CHAR *srvlst; + LONG pos=0; + LONG old_pos=0; + LONG row_size=0; + LONG size=0; + + CHAR *row; /* we assume display name can max be 20 row and each row is 80 char */ + + + /* Get the size for srvlst */ + myCreateProcessStartGetSzie("rpcclient -c \"service enum\"", &size); + if (size==0) + { + return 0; + } + + srvlst = (CHAR *) malloc(size); + if (srvlst == NULL) + { + return 0; + } + /* Get the server list */ + myCreateProcessStart("rpcclient -c \"service enum\"", srvlst, size); + + + /* scan after display name */ + while (pos<size) + { + old_pos = pos; + + if (1 == row_scanner_service(srvlst, &pos, size, service, NULL)) + { + row_size = (pos - old_pos)+32; /* 32 buffer for command */ + pos = old_pos; + row = (CHAR *) malloc(row_size*sizeof(CHAR)); + if (row == NULL) + { + return 0; + } + memset(row,0,row_size*sizeof(CHAR)); + if (1 == row_scanner_service(srvlst, &pos, size, service, &row[27])) + { + /* + display name found + now we can start the service + */ + + memcpy(row,"rpcclient -c \"service stop %s\"\"",27*sizeof(CHAR)); + row_size = strlen(row); + row[row_size] = '\"'; + system(row); + } + free(row); + } + } + + free(srvlst); + return 0; +} Propchange: trunk/reactos/base/applications/network/net/cmdStop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/cmdstart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdstart.c (added) +++ trunk/reactos/base/applications/network/net/cmdstart.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,107 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdStart(INT argc, CHAR **argv ) +{ + char *string; + long size = 100*sizeof(char); + + if (argc>4) + { + help(); + return 0; + } + + if (argc==2) + { + string = (char *) malloc(size); + if (string != NULL) + { + sprintf(string,"rpcclient -c \"service enum\""); + system(string); + free(string); + } + return 0; + } + + if (argc==3) + { + start_service(argv[1]); + return 0; + } + + return 0; +} + + +INT start_service(CHAR *service) +{ + + CHAR *srvlst; + LONG pos=0; + LONG old_pos=0; + LONG row_size=0; + LONG size=0; + + CHAR *row; /* we assume display name can max be 20 row and each row is 80 char */ + + + /* Get the size for srvlst */ + myCreateProcessStartGetSzie("rpcclient -c \"service enum\"", &size); + if (size==0) + { + return 0; + } + + srvlst = (CHAR *) malloc(size); + if (srvlst == NULL) + { + return 0; + } + /* Get the server list */ + myCreateProcessStart("rpcclient -c \"service enum\"", srvlst, size); + + + /* scan after display name */ + while (pos<size) + { + old_pos = pos; + + if (1 == row_scanner_service(srvlst, &pos, size, service, NULL)) + { + row_size = (pos - old_pos)+32; /* 32 buffer for command */ + pos = old_pos; + row = (CHAR *) malloc(row_size*sizeof(CHAR)); + if (row == NULL) + { + return 0; + } + memset(row,0,row_size*sizeof(CHAR)); + if (1 == row_scanner_service(srvlst, &pos, size, service, &row[28])) + { + /* + display name found + now we can start the service + */ + + memcpy(row,"rpcclient -c \"service start %s\"\"",28*sizeof(CHAR)); + row_size = strlen(row); + row[row_size] = '\"'; + system(row); + } + free(row); + } + } + + free(srvlst); + return 0; +} Propchange: trunk/reactos/base/applications/network/net/cmdstart.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c (added) +++ trunk/reactos/base/applications/network/net/help.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,199 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdHelp(INT argc, CHAR **argv) +{ + if (argc>3) + { + return 0; + } + + if (strcmp(argv[0],"ACCOUNTS")==0) + { + printf("ACCOUNTS\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"COMPUTER")==0) + { + printf("COMPUTER\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"CONFIG")==0) + { + printf("CONFIG\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"CONTINUE")==0) + { + printf("CONTINUE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"FILE")==0) + { + printf("FILE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"GROUP")==0) + { + printf("GROUP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"HELP")==0) + { + printf("HELP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"HELPMSG")==0) + { + printf("HELPMSG\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"LOCALGROUP")==0) + { + printf("LOCALGROUP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"NAME")==0) + { + printf("NAME\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"PRINT")==0) + { + printf("PRINT\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SEND")==0) + { + printf("SEND\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SESSION")==0) + { + printf("SESSION\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SHARE")==0) + { + printf("SHARE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"START")==0) + { + printf("START\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"STATISTICS")==0) + { + printf("STATISTICS\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"STOP")==0) + { + printf("STOP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"TIME")==0) + { + printf("TIME\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"USE")==0) + { + printf("USE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"USER")==0) + { + printf("USER\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"VIEW")==0) + { + printf("VIEW\n"); + printf("help text\n"); + return 0; + } + + help(); + return 0; +} + +void help() +{ + printf("NET ACCOUNTS\n"); + printf("NET COMPUTER\n"); + printf("NET CONFIG\n"); + printf("NET CONFIG SERVER\n"); + printf("NET CONFIG WORKSTATION\n"); + printf("NET CONTINUE\n"); + printf("NET FILE\n"); + printf("NET GROUP\n"); + + printf("NET HELP\n"); + printf("NET HELPMSG\n"); + printf("NET LOCALGROUP\n"); + printf("NET NAME\n"); + printf("NET PAUSE\n"); + printf("NET PRINT\n"); + printf("NET SEND\n"); + printf("NET SESSION\n"); + + printf("NET SHARE\n"); + printf("NET START\n"); + printf("NET STATISTICS\n"); + printf("NET STOP\n"); + printf("NET TIME\n"); + printf("NET USE\n"); + printf("NET USER\n"); + printf("NET VIEW\n"); +} Propchange: trunk/reactos/base/applications/network/net/help.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c (added) +++ trunk/reactos/base/applications/network/net/main.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,138 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + + + +int main(int argc, char **argv) +{ + if (argc<2) + { + help(); + return 1; + } + + if (stricmp(argv[1],"ACCOUNTS")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"COMPUTER")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"CONFIG")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"CONTINUE")==0) + { + return unimplement(); + } + + if (stricmp(argv[1],"FILE")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"GROUP")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"HELP")==0) + { + return cmdHelp(argc,&argv[1]); + } + if (stricmp(argv[1],"HELPMSG")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"LOCALGROUP")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"NAME")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"PRINT")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SEND")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SESSION")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SHARE")==0) + { + return unimplement(); + } + + if (stricmp(argv[1],"START")==0) + { + return cmdStart(argc, &argv[1]); + } + if (stricmp(argv[1],"STATISTICS")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"STOP")==0) + { + return cmdStop(argc, &argv[1]); + } + if (stricmp(argv[1],"TIME")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"USE")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"USER")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"VIEW")==0) + { + return unimplement(); + } + + help(); + return 1; +} + + +int unimplement() +{ + printf("This command is not implement yet\n"); + return 1; +} + + + + + + + + + + + + + + + + + + + Propchange: trunk/reactos/base/applications/network/net/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h (added) +++ trunk/reactos/base/applications/network/net/net.h Fri Aug 25 21:50:26 2006 @@ -1,0 +1,35 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <windows.h> + +void help(); +int unimplement(); + + +INT cmdHelp(INT argc, CHAR **argv); + +INT cmdStart(INT argc, CHAR **argv ); +INT start_service(CHAR *service); + +INT cmdStop(INT argc, CHAR **argv ); +INT stop_service(CHAR *service); + +/* Control and start rpcclient */ +BOOL myCreateProcessStartGetSzie(CHAR *cmdline, LONG *size); +BOOL myCreateProcessStart(CHAR *cmdline, CHAR *srvlst, LONG size); +BOOL myCreateProcess(HANDLE hChildStdoutWr, HANDLE hChildStdinRd, CHAR *cmdline); +LONG ReadPipe(HANDLE hStdoutWr, HANDLE hStdoutRd, CHAR *srvlst, LONG size); +LONG ReadPipeSize(HANDLE hStdoutWr, HANDLE hStdoutRd); +INT row_scanner_service(CHAR *buffer, LONG* pos, LONG size, CHAR *name,CHAR *save); + Propchange: trunk/reactos/base/applications/network/net/net.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/process.c (added) +++ trunk/reactos/base/applications/network/net/process.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,227 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +BOOL myCreateProcessStartGetSzie(CHAR *cmdline, LONG *size) +{ + HANDLE hChildStdinRd; + HANDLE hChildStdinWr; + HANDLE hChildStdoutRd; + HANDLE hChildStdoutWr; + SECURITY_ATTRIBUTES saAttr; + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0)) + { + return FALSE; + } + + if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0)) + { + return FALSE; + } + + myCreateProcess(hChildStdoutWr, hChildStdinRd,"rpcclient -c \"service enum\""); + *size = ReadPipeSize(hChildStdoutWr, hChildStdoutRd); + return TRUE; +} + +BOOL myCreateProcessStart(CHAR *cmdline, CHAR *srvlst, LONG size) +{ + HANDLE hChildStdinRd; + HANDLE hChildStdinWr; + HANDLE hChildStdoutRd; + HANDLE hChildStdoutWr; + SECURITY_ATTRIBUTES saAttr; + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0)) + { + return FALSE; + } + + if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0)) + { + return FALSE; + } + + myCreateProcess(hChildStdoutWr, hChildStdinRd,"rpcclient -c \"service enum\""); + + return ReadPipe(hChildStdoutWr, hChildStdoutRd, srvlst, size); +} + +BOOL myCreateProcess(HANDLE hStdoutWr, HANDLE hStdinRd, CHAR *cmdline) +{ + PROCESS_INFORMATION piProcInfo; + STARTUPINFO siStartInfo; + BOOL status = FALSE; + + ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) ); + ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) ); + siStartInfo.cb = sizeof(STARTUPINFO); + siStartInfo.hStdError = hStdoutWr; + siStartInfo.hStdOutput = hStdoutWr; + siStartInfo.hStdInput = hStdinRd; + siStartInfo.dwFlags |= STARTF_USESTDHANDLES; + status = CreateProcess(NULL, cmdline, NULL, NULL, + TRUE, 0, NULL, NULL, &siStartInfo, &piProcInfo); + + if (status != 0) + { + CloseHandle(piProcInfo.hProcess); + CloseHandle(piProcInfo.hThread); + return status; + } + return status; +} + +LONG ReadPipeSize(HANDLE hStdoutWr, HANDLE hStdoutRd) +{ + CHAR chBuf[2]; + LONG pos=0; + + if (!CloseHandle(hStdoutWr)) + { + return 0; /* fail */ + } + + for (;;) + { + long dwRead; + if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + { + break; + } + else + { + pos+=dwRead; + } + } + return pos; +} + +LONG ReadPipe(HANDLE hStdoutWr, HANDLE hStdoutRd, CHAR *srvlst, LONG size) +{ + CHAR chBuf[2]; + long pos=0; + + if (!CloseHandle(hStdoutWr)) + { + return 0; /* fail */ + } + + for (;;) + { + long dwRead; + if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + { + break; + } + else + { + srvlst[pos++] = chBuf[0] ; + } + } + return 0; +} + +INT row_scanner_service(CHAR *buffer, LONG* pos, LONG size, + CHAR *name,CHAR *save) +{ + LONG get_semi; + LONG t; + LONG row_size=0; + LONG start_pos; + + start_pos = *pos; + + if (*pos>=size) + { + return 0; + } + + + /* get row start */ + for (t=start_pos;t<size;t++) + { + if (buffer[t]=='\n') + { + buffer[t]='\0'; + if (buffer[t-1]==0x09) + { + buffer[t-1]='\0'; + } + if (buffer[t-1]==0x0d) + { + buffer[t-1]='\0'; + } + *pos = t+1; + row_size = t; + break; + } + } + + /* get : */ + get_semi=-1; + for (t=start_pos;t<row_size;t++) + { + if (buffer[t]==':') + { + get_semi=t; + break; + } + } + + if (get_semi==-1) + { + return 0; + } + + /* lock for space */ + for (t=get_semi+1;t<row_size;t++) + { + if (!isspace(buffer[t])) + { + break; + } + } + if (t==0) + { + /* : not found next row*/ + return 0; + } + + /* Compare now */ + if (strnicmp(name,&buffer[t],strlen(&buffer[t]))==0) + { + if (save != NULL) + { + /* lock for space */ + for (t=start_pos;t<get_semi;t++) + { + if (!isspace(buffer[t])) + { + break; + } + } + + memcpy(save,&buffer[t],get_semi-t); + } + return 1; + } + return 0; +} Propchange: trunk/reactos/base/applications/network/net/process.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/network.rbuild (original) +++ trunk/reactos/base/applications/network/network.rbuild Fri Aug 25 21:50:26 2006 @@ -12,6 +12,9 @@ </directory> <directory name="ipconfig"> <xi:include href="ipconfig/ipconfig.rbuild" /> +</directory> +<directory name="net"> + <xi:include href="net/net.rbuild" /> </directory> <directory name="netstat"> <xi:include href="netstat/netstat.rbuild" />

1 0

[hpoussin] 23708: Add an assert in IntEngCreateXlate
by hpoussin＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: hpoussin Date: Fri Aug 25 19:49:31 2006 New Revision: 23708 URL: http://svn.reactos.org/svn/reactos?rev=23708&view=rev Log: Add an assert in IntEngCreateXlate Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c Fri Aug 25 19:49:31 2006 @@ -158,6 +158,9 @@ ULONG DestRedMask = 0, DestGreenMask = 0, DestBlueMask = 0; ULONG i; + ASSERT(SourcePalType || PaletteSource); + ASSERT(DestPalType || PaletteDest); + XlateGDI = EngAllocMem(0, sizeof(XLATEGDI), TAG_XLATEOBJ); if (XlateGDI == NULL) {

1 0

[ion] 23707: - Viva la deprecation! Trunk should now boot and the installer should work. - Basically revert the new HAL/KERNEL IRQ code by putting the old one in, but without the actual pain of svn reverting and losing all the previous code. - The old code goes in ntoskrnl\deprecated, and we only add a comment to the .rbuild file, re-export an old function, and initialize the old code in kernel.c. All the other kernel changes stay in-place to be tested. - Same for hal, basically replace irq.S wi
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 18:50:01 2006 New Revision: 23707 URL: http://svn.reactos.org/svn/reactos?rev=23707&view=rev Log: - Viva la deprecation! Trunk should now boot and the installer should work. - Basically revert the new HAL/KERNEL IRQ code by putting the old one in, but without the actual pain of svn reverting and losing all the previous code. - The old code goes in ntoskrnl\deprecated, and we only add a comment to the .rbuild file, re-export an old function, and initialize the old code in kernel.c. All the other kernel changes stay in-place to be tested. - Same for hal, basically replace irq.S with irql.c in the .rbuild file, and disable the call to Halpinit1. All the other changes remain. Added: trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/ntoskrnl/deprecated/ trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/deprecated/irqhand.S Modified: trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Fri Aug 25 18:50:01 2006 @@ -31,7 +31,7 @@ <define name="_NTHAL_" /> <define name="__USE_W32API" /> <file>ipi.c</file> - <file>irq.S</file> + <file>irql.c</file> <file>processor.c</file> <file>resource.c</file> <file>spinlock.c</file> 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 Fri Aug 25 18:50:01 2006 @@ -43,7 +43,7 @@ else if (BootPhase == 1) { /* Initialize the clock interrupt */ - HalpInitPhase1(); + //HalpInitPhase1(); /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Added: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (added) +++ trunk/reactos/hal/halx86/generic/irql.c Fri Aug 25 18:50:01 2006 @@ -1,0 +1,425 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/hal/x86/irql.c + * PURPOSE: Implements IRQLs + * PROGRAMMER: David Welch (welch(a)cwcom.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ******************************************************************/ + +/* + * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS +*/ + +typedef union +{ + USHORT both; + struct + { + BYTE master; + BYTE slave; + }; +} +PIC_MASK; + +/* + * PURPOSE: - Mask for HalEnableSystemInterrupt and HalDisableSystemInterrupt + * - At startup enable timer and cascade + */ +#if defined(__GNUC__) +static PIC_MASK pic_mask = {.both = 0xFFFA}; +#else +static PIC_MASK pic_mask = { 0xFFFA }; +#endif + + +/* + * PURPOSE: Mask for disabling of acknowledged interrupts + */ +#if defined(__GNUC__) +static PIC_MASK pic_mask_intr = {.both = 0x0000}; +#else +static PIC_MASK pic_mask_intr = { 0 }; +#endif + +static ULONG HalpPendingInterruptCount[NR_IRQS]; + +#define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) +#define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) + +VOID STDCALL +KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); + +/* FUNCTIONS ****************************************************************/ + +#undef KeGetCurrentIrql +KIRQL STDCALL KeGetCurrentIrql (VOID) +/* + * PURPOSE: Returns the current irq level + * RETURNS: The current irq level + */ +{ + return(KeGetPcr()->Irql); +} + +VOID NTAPI HalpInitPICs(VOID) +{ + memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); + + /* Initialization sequence */ + WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); + WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); + /* Start of hardware irqs (0x24) */ + WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); + WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); + /* 8259-1 is master */ + WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); + /* 8259-2 is slave */ + WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); + /* 8086 mode */ + WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); + WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); + /* Enable interrupts */ + WRITE_PORT_UCHAR((PUCHAR)0x21, pic_mask.master); + WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); + + /* We can now enable interrupts */ + Ki386EnableInterrupts(); +} + +VOID HalpEndSystemInterrupt(KIRQL Irql) +/* + * FUNCTION: Enable all irqs with higher priority. + */ +{ + ULONG flags; + const USHORT mask[] = + { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, + 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, + 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, + }; + + /* Interrupts should be disable while enabling irqs of both pics */ + Ki386SaveFlags(flags); + Ki386DisableInterrupts(); + + pic_mask_intr.both &= mask[Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + + /* restore flags */ + Ki386RestoreFlags(flags); +} + +VOID STATIC +HalpExecuteIrqs(KIRQL NewIrql) +{ + ULONG IrqLimit, i; + + IrqLimit = min(PROFILE_LEVEL - NewIrql, NR_IRQS); + + /* + * For each irq if there have been any deferred interrupts then now + * dispatch them. + */ + for (i = 0; i < IrqLimit; i++) + { + if (HalpPendingInterruptCount[i] > 0) + { + KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); + + while (HalpPendingInterruptCount[i] > 0) + { + /* + * For each deferred interrupt execute all the handlers at DIRQL. + */ + HalpPendingInterruptCount[i]--; + KiInterruptDispatch2(i + IRQ_BASE, NewIrql); + } + KeGetPcr()->Irql--; + HalpEndSystemInterrupt(KeGetPcr()->Irql); + } + } + +} + +VOID STATIC +HalpLowerIrql(KIRQL NewIrql) +{ + if (NewIrql >= PROFILE_LEVEL) + { + KeGetPcr()->Irql = NewIrql; + return; + } + HalpExecuteIrqs(NewIrql); + if (NewIrql >= DISPATCH_LEVEL) + { + KeGetPcr()->Irql = NewIrql; + return; + } + KeGetPcr()->Irql = DISPATCH_LEVEL; + if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) + { + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; + KiDispatchInterrupt(); + } + KeGetPcr()->Irql = APC_LEVEL; + if (NewIrql == APC_LEVEL) + { + return; + } + if (KeGetCurrentThread() != NULL && + KeGetCurrentThread()->ApcState.KernelApcPending) + { + KiDeliverApc(KernelMode, NULL, NULL); + } + KeGetPcr()->Irql = PASSIVE_LEVEL; +} + +/********************************************************************** + * NAME EXPORTED + * KfLowerIrql + * + * DESCRIPTION + * Restores the irq level on the current processor + * + * ARGUMENTS + * NewIrql = Irql to lower to + * + * RETURN VALUE + * None + * + * NOTES + * Uses fastcall convention + */ +VOID FASTCALL +KfLowerIrql (KIRQL NewIrql) +{ + DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); + + if (NewIrql > KeGetPcr()->Irql) + { + DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", + __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); + KEBUGCHECK(0); + for(;;); + } + + HalpLowerIrql(NewIrql); +} + +/********************************************************************** + * NAME EXPORTED + * KfRaiseIrql + * + * DESCRIPTION + * Raises the hardware priority (irql) + * + * ARGUMENTS + * NewIrql = Irql to raise to + * + * RETURN VALUE + * previous irq level + * + * NOTES + * Uses fastcall convention + */ + +KIRQL FASTCALL +KfRaiseIrql (KIRQL NewIrql) +{ + KIRQL OldIrql; + + DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); + + if (NewIrql < KeGetPcr()->Irql) + { + DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", + __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); + KEBUGCHECK (0); + for(;;); + } + + OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = NewIrql; + return OldIrql; +} + +/********************************************************************** + * NAME EXPORTED + * KeRaiseIrqlToDpcLevel + * + * DESCRIPTION + * Raises the hardware priority (irql) to DISPATCH level + * + * ARGUMENTS + * None + * + * RETURN VALUE + * Previous irq level + * + * NOTES + * Calls KfRaiseIrql + */ + +KIRQL STDCALL +KeRaiseIrqlToDpcLevel (VOID) +{ + return KfRaiseIrql (DISPATCH_LEVEL); +} + + +/********************************************************************** + * NAME EXPORTED + * KeRaiseIrqlToSynchLevel + * + * DESCRIPTION + * Raises the hardware priority (irql) to CLOCK2 level + * + * ARGUMENTS + * None + * + * RETURN VALUE + * Previous irq level + * + * NOTES + * Calls KfRaiseIrql + */ + +KIRQL STDCALL +KeRaiseIrqlToSynchLevel (VOID) +{ + return KfRaiseIrql (CLOCK2_LEVEL); +} + + +BOOLEAN STDCALL +HalBeginSystemInterrupt (KIRQL Irql, + ULONG Vector, + PKIRQL OldIrql) +{ + ULONG irq; + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + { + return(FALSE); + } + irq = Vector - IRQ_BASE; + pic_mask_intr.both |= ((1 << irq) & 0xfffe); // do not disable the timer interrupt + + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + WRITE_PORT_UCHAR((PUCHAR)0x20, 0x20); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + /* Send EOI to the PICs */ + WRITE_PORT_UCHAR((PUCHAR)0x20,0x20); + WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); + } + + if (KeGetPcr()->Irql >= Irql) + { + HalpPendingInterruptCount[irq]++; + return(FALSE); + } + *OldIrql = KeGetPcr()->Irql; + KeGetPcr()->Irql = Irql; + + return(TRUE); +} + + +VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) +/* + * FUNCTION: Finish a system interrupt and restore the specified irq level. + */ +{ + HalpLowerIrql(Irql); + HalpEndSystemInterrupt(Irql); +} + +BOOLEAN +STDCALL +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) +{ + ULONG irq; + + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + return FALSE; + + irq = Vector - IRQ_BASE; + pic_mask.both |= (1 << irq); + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.slave)); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + } + + return TRUE; +} + + +BOOLEAN +STDCALL +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) +{ + ULONG irq; + + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) + return FALSE; + + irq = Vector - IRQ_BASE; + pic_mask.both &= ~(1 << irq); + if (irq < 8) + { + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); + } + else + { + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + } + + return TRUE; +} + + +VOID FASTCALL +HalRequestSoftwareInterrupt( + IN KIRQL Request) +{ + switch (Request) + { + case APC_LEVEL: + ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; + break; + + case DISPATCH_LEVEL: + ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; + break; + + default: + KEBUGCHECK(0); + } +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (added) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Fri Aug 25 18:50:01 2006 @@ -1,0 +1,780 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/irq.c + * PURPOSE: IRQ handling + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + */ + +/* + * NOTE: In general the PIC interrupt priority facilities are used to + * preserve the NT IRQL semantics, global interrupt disables are only used + * to keep the PIC in a consistent state + * + */ + +/* INCLUDES ****************************************************************/ + +#include <ntoskrnl.h> +#include <../hal/halx86/include/halirq.h> +#include <../hal/halx86/include/mps.h> + +#define NDEBUG +#include <internal/debug.h> + +extern KDPC KiExpireTimerDpc; +extern ULONG KiMaximumDpcQueueDepth; +extern ULONG KiMinimumDpcRate; +extern ULONG KiAdjustDpcThreshold; +extern ULONG KiIdealDpcRate; +extern LONG KiTickOffset; +extern ULONG KeMaximumIncrement; +extern ULONG KeMinimumIncrement; +extern ULONG KeTimeAdjustment; +extern BOOLEAN KiClockSetupComplete; + +/* 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); + +static 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 ****************************************************************/ + +#define PRESENT (0x8000) +#define I486_INTERRUPT_GATE (0xe00) + +VOID +INIT_FUNCTION +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+ + 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 +KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, + PKTRAP_FRAME TrapFrame) +{ + TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; + TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; + TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; + TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; + TrapFrame->Eax = IrqTrapFrame->Eax; + TrapFrame->Ecx = IrqTrapFrame->Ecx; + TrapFrame->Edx = IrqTrapFrame->Edx; + TrapFrame->Ebx = IrqTrapFrame->Ebx; + TrapFrame->HardwareEsp = IrqTrapFrame->Esp; + TrapFrame->Ebp = IrqTrapFrame->Ebp; + TrapFrame->Esi = IrqTrapFrame->Esi; + TrapFrame->Edi = IrqTrapFrame->Edi; + TrapFrame->Eip = IrqTrapFrame->Eip; + TrapFrame->SegCs = IrqTrapFrame->Cs; + TrapFrame->EFlags = IrqTrapFrame->Eflags; +} + +STATIC VOID +KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, + PKIRQ_TRAPFRAME IrqTrapFrame) +{ + IrqTrapFrame->Gs = TrapFrame->SegGs; + IrqTrapFrame->Fs = TrapFrame->SegFs; + IrqTrapFrame->Es = TrapFrame->SegEs; + IrqTrapFrame->Ds = TrapFrame->SegDs; + IrqTrapFrame->Eax = TrapFrame->Eax; + IrqTrapFrame->Ecx = TrapFrame->Ecx; + IrqTrapFrame->Edx = TrapFrame->Edx; + IrqTrapFrame->Ebx = TrapFrame->Ebx; + IrqTrapFrame->Esp = TrapFrame->HardwareEsp; + IrqTrapFrame->Ebp = TrapFrame->Ebp; + IrqTrapFrame->Esi = TrapFrame->Esi; + IrqTrapFrame->Edi = TrapFrame->Edi; + IrqTrapFrame->Eip = TrapFrame->Eip; + IrqTrapFrame->Cs = TrapFrame->SegCs; + IrqTrapFrame->Eflags = TrapFrame->EFlags; +} + +/* + * NOTE: On Windows this function takes exactly one parameter and EBP is + * guaranteed to point to KTRAP_FRAME. The function is used only + * by HAL, so there's no point in keeping that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + 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; + + /* Check if we came from user mode */ + if (TrapFrame->PreviousPreviousMode != KernelMode) + { + /* Update user times */ + CurrentThread->UserTime++; + InterlockedIncrement((PLONG)&CurrentProcess->UserTime); + Prcb->UserTime++; + } + else + { + /* Check IRQ */ + if (Irql > DISPATCH_LEVEL) + { + /* This was an interrupt */ + Prcb->InterruptTime++; + } + else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) + { + /* This was normal kernel time */ + CurrentThread->KernelTime++; + InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); + } + else if (Irql == DISPATCH_LEVEL) + { + /* This was DPC time */ + Prcb->DpcTime++; + } + + /* Update CPU kernel time in all cases */ + Prcb->KernelTime++; + } + + /* Set the last DPC Count and request rate */ + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) / 2; + + /* Check if we should request a DPC */ + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + /* Request one */ + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Update the depth if needed */ + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + /* Decrease the maximum depth by one */ + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + /* Decrease the adjustment threshold */ + if (!(--Prcb->AdjustDpcThreshold)) + { + /* We've hit 0, reset it */ + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Check if we've hit queue maximum */ + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + /* Increase maximum by one */ + Prcb->MaximumDpcQueueDepth++; + } + } + } + + /* + * If we're at end of quantum request software interrupt. The rest + * is handled in KiDispatchInterrupt. + * + * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine + * which checks for quantum end will not be executed and decrementing + * the quantum here can result in overflow. This is not a problem since + * we don't care about the quantum value anymore after the QuantumEnd + * flag is set. + */ + if ((CurrentThread->Quantum -= 3) <= 0) + { + Prcb->QuantumEnd = TRUE; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } +} + + +/* + * NOTE: On Windows this function takes exactly zero parameters and EBP is + * guaranteed to point to KTRAP_FRAME. Also [esp+0] contains an IRQL. + * The function is used only by HAL, so there's no point in keeping + * that prototype. + * + * @implemented + */ +VOID +STDCALL +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + 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 += Increment; + SharedUserData->InterruptTime.High2Time = Time.u.HighPart; + SharedUserData->InterruptTime.LowPart = Time.u.LowPart; + SharedUserData->InterruptTime.High1Time = Time.u.HighPart; + + /* Increase the tick offset */ + KiTickOffset -= Increment; + OldOffset = KiTickOffset; + + /* Check if this isn't a tick yet */ + if (KiTickOffset > 0) + { + /* Expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + else + { + /* Setup time structure for system time */ + Time.LowPart = SharedUserData->SystemTime.LowPart; + Time.HighPart = SharedUserData->SystemTime.High1Time; + Time.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High2Time = Time.HighPart; + SharedUserData->SystemTime.LowPart = Time.LowPart; + SharedUserData->SystemTime.High1Time = Time.HighPart; + + /* 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++; + + /* Queue a DPC that will expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + + /* Update process and thread times */ + if (OldOffset <= 0) + { + /* This was a tick, calculate the next one */ + KiTickOffset += KeMaximumIncrement; + KeUpdateRunTime(TrapFrame, Irql); + } +} + +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); +} + +VOID +KiInterruptDispatch3 (ULONG vector, PKIRQ_TRAPFRAME Trapframe) +/* + * FUNCTION: Calls the irq specific handler for an irq + * ARGUMENTS: + * irq = IRQ that has interrupted + */ +{ + KIRQL old_level; + KTRAP_FRAME KernelTrapFrame; + PKTHREAD CurrentThread; + PKTRAP_FRAME OldTrapFrame=NULL; + + /* + * At this point we have interrupts disabled, nothing has been done to + * the PIC. + */ + + KeGetCurrentPrcb()->InterruptCount++; + + /* + * Notify the rest of the kernel of the raised irq level. For the + * default HAL this will send an EOI to the PIC and alter the IRQL. + */ + if (!HalBeginSystemInterrupt (VECTOR2IRQL(vector), + vector, + &old_level)) + { + return; + } + + + /* + * Enable interrupts + * NOTE: Only higher priority interrupts will get through + */ + Ke386EnableInterrupts(); + +#ifndef CONFIG_SMP + if (VECTOR2IRQ(vector) == 0) + { + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); + } + else +#endif + { + /* + * Actually call the ISR. + */ + KiInterruptDispatch2(vector, old_level); + } + + /* + * End the system interrupt. + */ + Ke386DisableInterrupts(); + + if (old_level==PASSIVE_LEVEL && Trapframe->Cs != KGDT_R0_CODE) + { + HalEndSystemInterrupt (APC_LEVEL, 0); + + CurrentThread = KeGetCurrentThread(); + if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) + { + DPRINT("PID: %d, TID: %d CS %04x/%04x\n", + ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, + ((PETHREAD)CurrentThread)->Cid.UniqueThread, + Trapframe->Cs, + CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); + if (CurrentThread->TrapFrame == NULL) + { + OldTrapFrame = CurrentThread->TrapFrame; + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + CurrentThread->TrapFrame = &KernelTrapFrame; + } + + Ke386EnableInterrupts(); + KiDeliverApc(UserMode, NULL, NULL); + Ke386DisableInterrupts(); + + ASSERT(KeGetCurrentThread() == CurrentThread); + if (CurrentThread->TrapFrame == &KernelTrapFrame) + { + KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); + CurrentThread->TrapFrame = OldTrapFrame; + } + } + KeLowerIrql(PASSIVE_LEVEL); + } + else + { + HalEndSystemInterrupt (old_level, 0); + } + +} + +static VOID +KeDumpIrqList(VOID) +{ + PKINTERRUPT current; + PLIST_ENTRY current_entry; + LONG i, j; + KIRQL oldlvl; + BOOLEAN printed; + + for (i=0;i<NR_IRQS;i++) + { + printed = FALSE; + KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl); + + for (j=0; j < KeNumberProcessors; j++) + { + KiAcquireSpinLock(&IsrTable[i][j].Lock); + + current_entry = IsrTable[i][j].ListHead.Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + while (current_entry!=&(IsrTable[i][j].ListHead)) + { + if (printed == FALSE) + { + printed = TRUE; + DPRINT("For irq %x:\n",i); + } + DPRINT(" Isr %x\n",current); + current_entry = current_entry->Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + } + KiReleaseSpinLock(&IsrTable[i][j].Lock); + } + KeLowerIrql(oldlvl); + } +} + +/* + * @implemented + */ +BOOLEAN +STDCALL +KeConnectInterrupt(PKINTERRUPT InterruptObject) +{ + KIRQL oldlvl,synch_oldlvl; + PKINTERRUPT ListHead; + ULONG Vector; + PISR_TABLE CurrentIsr; + BOOLEAN Result; + + DPRINT("KeConnectInterrupt()\n"); + + Vector = InterruptObject->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); + + KeDumpIrqList(); + + 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; +} + +/* + * @implemented + */ +VOID +STDCALL +KeInitializeInterrupt(PKINTERRUPT Interrupt, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + CHAR ProcessorNumber, + BOOLEAN FloatingSave) +{ + /* Set the Interrupt Header */ + Interrupt->Type = InterruptObject; + Interrupt->Size = sizeof(KINTERRUPT); + + /* Check if we got a spinlock */ + if (SpinLock) + { + Interrupt->ActualLock = SpinLock; + } + else + { + /* This means we'll be usin the built-in one */ + KeInitializeSpinLock(&Interrupt->SpinLock); + Interrupt->ActualLock = &Interrupt->SpinLock; + } + + /* Set the other settings */ + Interrupt->ServiceRoutine = ServiceRoutine; + Interrupt->ServiceContext = ServiceContext; + Interrupt->Vector = Vector; + Interrupt->Irql = Irql; + Interrupt->SynchronizeIrql = SynchronizeIrql; + Interrupt->Mode = InterruptMode; + Interrupt->ShareVector = ShareVector; + Interrupt->Number = ProcessorNumber; + Interrupt->FloatingSave = FloatingSave; + + /* Disconnect it at first */ + Interrupt->Connected = FALSE; +} + +VOID KePrintInterruptStatistic(VOID) +{ + LONG i, j; + + for (j = 0; j < KeNumberProcessors; j++) + { + DPRINT1("CPU%d:\n", j); + for (i = 0; i < NR_IRQS; i++) + { + if (IsrTable[i][j].Count) + { + DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); + } + } + } +} + +/* EOF */ Added: trunk/reactos/ntoskrnl/deprecated/irqhand.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irqhan… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irqhand.S (added) +++ trunk/reactos/ntoskrnl/deprecated/irqhand.S Fri Aug 25 18:50:01 2006 @@ -1,0 +1,89 @@ +#include <ndk/asm.h> +#include <../hal/halx86/include/halirq.h> + +_KiCommonInterrupt: + cld + pushl %ds + pushl %es + pushl %fs + pushl %gs + pushl $0xceafbeef + movl $KGDT_R0_DATA,%eax + movl %eax,%ds + movl %eax,%es + movl %eax,%gs + movl $KGDT_R0_PCR,%eax + movl %eax,%fs + pushl %esp + pushl %ebx + call _KiInterruptDispatch3 + addl $0xC, %esp + popl %gs + popl %fs + popl %es + popl %ds + popa + iret + + +#ifdef CONFIG_SMP + +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _KiUnexpectedInterrupt##intnum; \ + _KiUnexpectedInterrupt##intnum:; \ + pusha; \ + movl $0x##intnum, %ebx; \ + jmp _KiCommonInterrupt; + +/* Interrupt handlers and declarations */ + +#define B(x,y) \ + BUILD_INTERRUPT_HANDLER(x##y) + +#define B16(x) \ + B(x,0) B(x,1) B(x,2) B(x,3) \ + B(x,4) B(x,5) B(x,6) B(x,7) \ + B(x,8) B(x,9) B(x,A) B(x,B) \ + B(x,C) B(x,D) B(x,E) B(x,F) + +B16(3) B16(4) B16(5) B16(6) +B16(7) B16(8) B16(9) B16(A) +B16(B) B16(C) B16(D) B16(E) +B16(F) + +#undef B +#undef B16 +#undef BUILD_INTERRUPT_HANDLER + +#else /* CONFIG_SMP */ + +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _irq_handler_##intnum; \ + _irq_handler_##intnum:; \ + pusha; \ + movl $(##intnum + IRQ_BASE), %ebx; \ + jmp _KiCommonInterrupt; + +/* Interrupt handlers and declarations */ + +#define B(x) \ + BUILD_INTERRUPT_HANDLER(x) + +B(0) B(1) B(2) B(3) +B(4) B(5) B(6) B(7) +B(8) B(9) B(10) B(11) +B(12) B(13) B(14) B(15) + +#undef B +#undef BUILD_INTERRUPT_HANDLER + +#endif /* CONFIG_SMP */ + +.intel_syntax noprefix +.globl _KiUnexpectedInterrupt@0 +_KiUnexpectedInterrupt@0: + + /* Bugcheck with invalid interrupt code */ + push 0x12 + call _KeBugCheck@4 + 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 Fri Aug 25 18:50:01 2006 @@ -94,6 +94,7 @@ SharedUserData->SystemTime.High2Time = SystemBootTime.u.HighPart; SharedUserData->SystemTime.LowPart = SystemBootTime.u.LowPart; SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; + KiClockSetupComplete = TRUE; } VOID 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 Fri Aug 25 18:50:01 2006 @@ -380,6 +380,7 @@ InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); + KeInitInterrupts (); KeActiveProcessors |= 1 << 0; 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 Fri Aug 25 18:50:01 2006 @@ -663,6 +663,7 @@ KiCheckForKernelApcDelivery@0 KiDeliverApc@12 KiDispatchInterrupt@0 +KiInterruptDispatch2@8 KiEnableTimerWatchdog KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 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 Fri Aug 25 18:50:01 2006 @@ -33,7 +33,7 @@ <file>exp.c</file> <file>fpu.c</file> <file>gdt.c</file> - <file>irq.c</file> +  <file>kernel.c</file> <file>ldt.c</file> <file>thread.c</file> @@ -68,6 +68,10 @@ <file>usercall.c</file> <file>wait.c</file> </directory> + <directory name="deprecated"> + <file>irqhand.S</file> + <file>irq.c</file> + </directory> <directory name="cc"> <file>cacheman.c</file> <file>copy.c</file>

1 0

[ion] 23706: - Fix some bugs
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 18:15:11 2006 New Revision: 23706 URL: http://svn.reactos.org/svn/reactos?rev=23706&view=rev Log: - Fix some bugs Modified: trunk/reactos/hal/halx86/generic/irq.S 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 Fri Aug 25 18:15:11 2006 @@ -392,7 +392,6 @@ /* There are pending software interrupts, call their handlers */ add esp, 12 jmp SoftIntHandlerTable2[eax*4] - ret 8 .endfunc .globl @KfLowerIrql@4 @@ -443,7 +442,6 @@ /* Get the IRQL and check if it's Software level only */ xor eax, eax mov al, [fs:KPCR_IRQL] - movzx ecx, cl cmp cl, DISPATCH_LEVEL jbe SetIrql @@ -508,7 +506,7 @@ cli /* Mask out interrupts */ - mov eax, KiI8259MaskTable + DISPATCH_LEVEL * 2 + mov eax, KiI8259MaskTable[DISPATCH_LEVEL*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8

1 0

[fireball] 23705: - Enable PIRQ when initializing UHCI, this solves the "no irq" problem on some UHC controllers (most popular type of such controller is the one emulated by VMWare) - Fix a mistake in the source code resulting in a bugcheck - Add _X86 to .rbuild (by Thomas)
by fireball＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: fireball Date: Fri Aug 25 17:20:13 2006 New Revision: 23705 URL: http://svn.reactos.org/svn/reactos?rev=23705&view=rev Log: - Enable PIRQ when initializing UHCI, this solves the "no irq" problem on some UHC controllers (most popular type of such controller is the one emulated by VMWare) - Fix a mistake in the source code resulting in a bugcheck - Add _X86 to .rbuild (by Thomas) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Fri Aug 25 17:20:13 2006 @@ -405,7 +405,7 @@ purb = NULL; // set the dev state - status = usb_query_and_lock_dev(dev_mgr, purb->endp_handle, &pdev); + status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); if (status != STATUS_SUCCESS) { usb_unlock_dev(pdev); 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 Fri Aug 25 17:20:13 2006 @@ -80,8 +80,11 @@ #define USBPORTSC_SUSP 0x1000 /* Suspend */ /* Legacy support register */ -#define USBLEGSUP 0xc0 -#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */ +#define USBLEGSUP 0xc0 +#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */ +#define USBLEGSUP_RWC 0x8f00 /* the R/WC bits */ +#define USBLEGSUP_RO 0x5040 /* R/O and reserved bits */ + #define UHCI_NULL_DATA_SIZE 0x7FF /* for UHCI controller TD */ Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Fri Aug 25 17:20:13 2006 @@ -908,12 +908,14 @@ } // send cmds to start the uhc -// shamelessly copied from linux's uhci.c +// shamelessly copied from linux's uhci.c (reset_hc(), configure_hc() routines) BOOLEAN uhci_start(PHCD hcd) { PUHCI_DEV uhci; PBYTE io_addr; + USHORT pirq; + PCI_SLOT_NUMBER SlotNum; int timeout = 10000; uhci = uhci_from_hcd(hcd); @@ -946,6 +948,18 @@ WRITE_PORT_USHORT((PUSHORT) (io_addr + USBCMD), USBCMD_RS | USBCMD_CF | USBCMD_MAXP); DbgPrint("uhci_start(): current uhci status=0x%x\n", uhci_status(uhci)); + + /* Enable PIRQ */ + pirq = USBLEGSUP_DEFAULT; + SlotNum.u.AsULONG = 0; + SlotNum.u.bits.DeviceNumber = ((uhci->pdev_ext->pci_addr & 0xff) >> 3); + SlotNum.u.bits.FunctionNumber = (uhci->pdev_ext->pci_addr & 0x07); + + DbgPrint("uhci_start(): set bus %d data at slot 0x%x\n", (uhci->pdev_ext->pci_addr >> 8), + SlotNum.u.AsULONG); + + HalSetBusDataByOffset(PCIConfiguration, (uhci->pdev_ext->pci_addr >> 8), SlotNum.u.AsULONG, + &pirq, USBLEGSUP, sizeof(pirq)); return TRUE; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Fri Aug 25 17:20:13 2006 @@ -1,5 +1,6 @@ <module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys"> <define name="INCLUDE_EHCI" /> + <define name="_X86" /> <include base="usbdriver">.</include> <library>ntoskrnl</library> <library>hal</library>

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