Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[gadamopoulos] 68865: [SHELL32] - When binding to a drive item try to initialize the new CFSFolder using IPersistFolder3. That allows us to get the path of the drive right from the pidl instead of ...
by gadamopoulos＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: gadamopoulos Date: Sat Aug 29 21:09:29 2015 New Revision: 68865 URL: http://svn.reactos.org/svn/reactos?rev=68865&view=rev Log: [SHELL32] - When binding to a drive item try to initialize the new CFSFolder using IPersistFolder3. That allows us to get the path of the drive right from the pidl instead of getting a new reference to the CDrivesFolder and using GetDisplayNameOf for the pidl. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Aug 29 21:09:29 2015 @@ -163,7 +163,7 @@ CComPtr<IPersistFolder> ppf; CComPtr<IPersistFolder3> ppf3; - if (_ILIsFolder(pidlChild) && + if ((_ILIsFolder(pidlChild) || _ILIsDrive(pidlChild)) && SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) { PERSIST_FOLDER_TARGET_INFO ppfti;

1 0

[hbelusca] 68864: [NTOS:KD]: Disable to dprints.
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 16:56:09 2015 New Revision: 68864 URL: http://svn.reactos.org/svn/reactos?rev=68864&view=rev Log: [NTOS:KD]: Disable to dprints. Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Aug 29 16:56:09 2015 @@ -194,7 +194,7 @@ if (!NT_SUCCESS(Status)) { /* This should never happen */ - KdpDprintf("Failed to delete deferred breakpoint at address 0x%p\n", + KdpDprintf("Unable to delete deferred breakpoint at address 0x%p\n", KdpBreakpointTable[i].Address); KdpOweBreakpoint = TRUE; } @@ -252,8 +252,8 @@ if (!NT_SUCCESS(Status)) { /* Memory is inaccessible now, restoring original instruction is deferred */ - KdpDprintf("Failed to delete breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); + // KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + // KdpBreakpointTable[BpIndex].Address); KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_EXPIRED; KdpOweBreakpoint = TRUE; return FALSE; @@ -293,8 +293,9 @@ NULL); if (!NT_SUCCESS(Status)) { - KdpDprintf("Failed to restore breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); + /* Memory is inaccessible now, restoring breakpoint is deferred */ + // KdpDprintf("Failed to restore breakpoint at address 0x%p\n", + // KdpBreakpointTable[BpIndex].Address); KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_PENDING; KdpOweBreakpoint = TRUE; return FALSE;

1 0

[tfaber] 68863: [HAL] - Implement HalStartProfileInterrupt, HalSetProfileInterval, and HalpProfileInterruptHandler Now kernrate works! CORE-10066 #resolve
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 16:45:00 2015 New Revision: 68863 URL: http://svn.reactos.org/svn/reactos?rev=68863&view=rev Log: [HAL] - Implement HalStartProfileInterrupt, HalSetProfileInterval, and HalpProfileInterruptHandler Now kernrate works! CORE-10066 #resolve Modified: trunk/reactos/hal/halx86/generic/profil.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/profil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/profil.… ============================================================================== --- trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -13,6 +13,11 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +BOOLEAN HalpProfilingStopped = TRUE; +UCHAR HalpProfileRate = 8; + /* FUNCTIONS *****************************************************************/ /* @@ -23,6 +28,8 @@ HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { UCHAR StatusB; + + UNREFERENCED_PARAMETER(ProfileSource); /* Acquire the CMOS lock */ HalpAcquireCmosSpinLock(); @@ -36,6 +43,8 @@ /* Write new value into Status Register B */ HalpWriteCmos(RTC_REGISTER_B, StatusB); + HalpProfilingStopped = TRUE; + /* Release the CMOS lock */ HalpReleaseCmosSpinLock(); } @@ -47,8 +56,27 @@ NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + UCHAR StatusA, StatusB; + + UNREFERENCED_PARAMETER(ProfileSource); + + HalpProfilingStopped = FALSE; + + /* Acquire the CMOS lock */ + HalpAcquireCmosSpinLock(); + + /* Set the interval in Status Register A */ + StatusA = HalpReadCmos(RTC_REGISTER_A); + StatusA = (StatusA & 0xF0) | HalpProfileRate; + HalpWriteCmos(RTC_REGISTER_A, StatusA); + + /* Enable periodic interrupts in Status Register B */ + StatusB = HalpReadCmos(RTC_REGISTER_B); + StatusB = StatusB | RTC_REG_B_PI; + HalpWriteCmos(RTC_REGISTER_B, StatusB); + + /* Release the CMOS lock */ + HalpReleaseCmosSpinLock(); } /* @@ -58,6 +86,32 @@ NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - UNIMPLEMENTED; - return Interval; + ULONG_PTR CurrentValue, NextValue; + UCHAR i; + + /* Normalize interval. 122100 ns is the smallest supported */ + Interval &= ~(1 << 31); + if (Interval < 1221) + Interval = 1221; + + /* Highest rate value of 15 means 500 ms */ + CurrentValue = 5000000; + for (i = 15; ; i--) + { + NextValue = (CurrentValue + 1) / 2; + if (Interval > CurrentValue - NextValue / 2) + break; + CurrentValue = NextValue; + } + + /* Interval as needed by RTC */ + HalpProfileRate = i; + + /* Reset the */ + if (!HalpProfilingStopped) + { + HalStartProfileInterrupt(0); + } + + return CurrentValue; } Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -188,9 +188,21 @@ /* Start the interrupt */ if (HalBeginSystemInterrupt(PROFILE_LEVEL, PRIMARY_VECTOR_BASE + 8, &Irql)) { - /* Profiling isn't yet enabled */ - UNIMPLEMENTED; - ASSERT(FALSE); + /* Spin until the interrupt pending bit is clear */ + HalpAcquireCmosSpinLock(); + while (HalpReadCmos(RTC_REGISTER_C) & RTC_REG_C_IRQ) + ; + HalpReleaseCmosSpinLock(); + + /* If profiling is enabled, call the kernel function */ + if (!HalpProfilingStopped) + { + KeProfileInterrupt(TrapFrame); + } + + /* Finish the interrupt */ + _disable(); + HalEndSystemInterrupt(Irql, TrapFrame); } /* Spurious, just end the interrupt */ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -68,6 +68,7 @@ #define RTC_REGISTER_B 0x0B #define RTC_REG_B_PI 0x40 #define RTC_REGISTER_C 0x0C +#define RTC_REG_C_IRQ 0x80 #define RTC_REGISTER_D 0x0D #define RTC_REGISTER_CENTURY 0x32 @@ -585,6 +586,9 @@ DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +/* profil.c */ +extern BOOLEAN HalpProfilingStopped; + /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); VOID HalpClockInterrupt(VOID);

1 0

[ekohl] 68862: [WINLOGON] - Read notification DLL parameters. - Use the Enabled value.
by ekohl＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: ekohl Date: Sat Aug 29 15:50:02 2015 New Revision: 68862 URL: http://svn.reactos.org/svn/reactos?rev=68862&view=rev Log: [WINLOGON] - Read notification DLL parameters. - Use the Enabled value. Modified: trunk/reactos/base/system/winlogon/notify.c Modified: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Sat Aug 29 15:50:02 2015 @@ -37,6 +37,12 @@ LIST_ENTRY ListEntry; HINSTANCE hInstance; + BOOL bEnabled; + BOOL bAsynchronous; + BOOL bSafe; + BOOL bImpersonate; + BOOL bSmartCardLogon; + DWORD dwMaxWait; PWLX_NOTIFY_HANDLER Handler[LastHandler]; } NOTIFICATION_ITEM, *PNOTIFICATION_ITEM; @@ -117,7 +123,57 @@ if (NotificationDll == NULL) return; + NotificationDll->bEnabled = TRUE; + NotificationDll->dwMaxWait = 30; /* FIXME: ??? */ NotificationDll->hInstance = hInstance; + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Asynchronous", + NULL, + &dwType, + (PBYTE)&NotificationDll->bAsynchronous, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Enabled", + NULL, + &dwType, + (PBYTE)&NotificationDll->bEnabled, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Impersonate", + NULL, + &dwType, + (PBYTE)&NotificationDll->bImpersonate, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Safe", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSafe, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"SmartCardLogonNotify", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSmartCardLogon, + &dwSize); + + dwSize = sizeof(DWORD); + RegQueryValueExW(hDllKey, + L"MaxWait", + NULL, + &dwType, + (PBYTE)&NotificationDll->dwMaxWait, + &dwSize); for (i = LogonHandler; i < LastHandler; i++) { @@ -243,7 +299,7 @@ NOTIFICATION_ITEM, ListEntry); TRACE("NotificationDll: %p\n", NotificationDll); - if (NotificationDll != NULL) + if (NotificationDll != NULL && NotificationDll->bEnabled) { TRACE("NotificationDll->Handler: %p\n", NotificationDll->Handler[Type]); if (NotificationDll->Handler[Type] != NULL)

1 0

[tfaber] 68861: [NDK][NTOS] - Move KeProfileInterrupt[WithSource] declarations to NDK since they're exported - NtCreateProfile's fourth parameter is SIZE_T - Add NtCreateProfileEx prototype CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 15:04:01 2015 New Revision: 68861 URL: http://svn.reactos.org/svn/reactos?rev=68861&view=rev Log: [NDK][NTOS] - Move KeProfileInterrupt[WithSource] declarations to NDK since they're exported - NtCreateProfile's fourth parameter is SIZE_T - Add NtCreateProfileEx prototype CORE-10066 Modified: trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -287,6 +287,19 @@ VOID NTAPI +KeProfileInterrupt( + _In_ PKTRAP_FRAME TrapFrame +); + +VOID +NTAPI +KeProfileInterruptWithSource( + _In_ PKTRAP_FRAME TrapFrame, + _In_ KPROFILE_SOURCE Source +); + +VOID +NTAPI KeSetProfileIrql( _In_ KIRQL ProfileIrql ); @@ -353,12 +366,28 @@ _Out_ PHANDLE ProfileHandle, _In_ HANDLE ProcessHandle, _In_ PVOID ImageBase, - _In_ ULONG ImageSize, + _In_ SIZE_T ImageSize, _In_ ULONG Granularity, _Out_ PVOID Buffer, _In_ ULONG ProfilingSize, _In_ KPROFILE_SOURCE Source, _In_ KAFFINITY ProcessorMask +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateProfileEx( + _Out_ PHANDLE ProfileHandle, + _In_ HANDLE ProcessHandle, + _In_ PVOID ImageBase, + _In_ SIZE_T ImageSize, + _In_ ULONG Granularity, + _Out_ PVOID Buffer, + _In_ ULONG ProfilingSize, + _In_ KPROFILE_SOURCE Source, + _In_ USHORT GroupCount, + _In_reads_(GroupCount) PGROUP_AFFINITY Affinity ); NTSYSCALLAPI Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -95,7 +95,7 @@ NtCreateProfile(OUT PHANDLE ProfileHandle, IN HANDLE Process OPTIONAL, IN PVOID RangeBase, - IN ULONG RangeSize, + IN SIZE_T RangeSize, IN ULONG BucketSize, IN PVOID Buffer, IN ULONG BufferSize, Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Aug 29 15:04:01 2015 @@ -405,19 +405,6 @@ VOID NTAPI -KeProfileInterrupt( - PKTRAP_FRAME TrapFrame -); - -VOID -NTAPI -KeProfileInterruptWithSource( - IN PKTRAP_FRAME TrapFrame, - IN KPROFILE_SOURCE Source -); - -VOID -NTAPI KeUpdateRunTime( PKTRAP_FRAME TrapFrame, KIRQL Irql

1 0

[tfaber] 68860: [NTOS] - Fix GCC build
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:35:02 2015 New Revision: 68860 URL: http://svn.reactos.org/svn/reactos?rev=68860&view=rev Log: [NTOS] - Fix GCC build Modified: trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 29 14:35:02 2015 @@ -331,8 +331,8 @@ /* Get the Pointer to the Bucket Value representing this Program Counter */ BucketValue = (PULONG)((ULONG_PTR)Profile->Buffer + - ((ProgramCounter - (ULONG_PTR)Profile->RangeBase) - >> Profile->BucketShift) &~ 0x3); + (((ProgramCounter - (ULONG_PTR)Profile->RangeBase) + >> Profile->BucketShift) &~ 0x3)); /* Increment the value */ (*BucketValue)++;

1 0

[tfaber] 68859: [NTOS:KE] - Fix swapped parameters of KeSetIntervalProfile - Calculate the correct bucket pointer in KiParseProfileList, and actually increment the counter CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:30:29 2015 New Revision: 68859 URL: http://svn.reactos.org/svn/reactos?rev=68859&view=rev Log: [NTOS:KE] - Fix swapped parameters of KeSetIntervalProfile - Calculate the correct bucket pointer in KiParseProfileList, and actually increment the counter CORE-10066 Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Aug 29 14:30:29 2015 @@ -399,8 +399,8 @@ VOID NTAPI KeSetIntervalProfile( - KPROFILE_SOURCE ProfileSource, - ULONG Interval + ULONG Interval, + KPROFILE_SOURCE ProfileSource ); VOID Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sat Aug 29 14:30:29 2015 @@ -261,8 +261,8 @@ VOID NTAPI -KeSetIntervalProfile(IN KPROFILE_SOURCE ProfileSource, - IN ULONG Interval) +KeSetIntervalProfile(IN ULONG Interval, + IN KPROFILE_SOURCE ProfileSource) { HAL_PROFILE_SOURCE_INTERVAL ProfileSourceInterval; @@ -330,12 +330,12 @@ } /* Get the Pointer to the Bucket Value representing this Program Counter */ - BucketValue = (PULONG)((((ULONG_PTR)Profile->Buffer + - (ProgramCounter - (ULONG_PTR)Profile->RangeBase)) + BucketValue = (PULONG)((ULONG_PTR)Profile->Buffer + + ((ProgramCounter - (ULONG_PTR)Profile->RangeBase) >> Profile->BucketShift) &~ 0x3); /* Increment the value */ - ++BucketValue; + (*BucketValue)++; } }

1 0

[tfaber] 68858: [NTOS:EX] - Fix MDL leak in NtStopProfile CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:14:43 2015 New Revision: 68858 URL: http://svn.reactos.org/svn/reactos?rev=68858&view=rev Log: [NTOS:EX] - Fix MDL leak in NtStopProfile CORE-10066 Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sat Aug 29 14:14:43 2015 @@ -453,6 +453,7 @@ /* Unlock the Buffer */ MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl); MmUnlockPages(Profile->Mdl); + IoFreeMdl(Profile->Mdl); ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE); /* Clear the Locked Buffer pointer, meaning the Object is Stopped */

1 0

[hbelusca] 68857: [HAL]: Addendum for r68856
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 14:09:57 2015 New Revision: 68857 URL: http://svn.reactos.org/svn/reactos?rev=68857&view=rev Log: [HAL]: Addendum for r68856 Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=68… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sat Aug 29 14:09:57 2015 @@ -952,7 +952,7 @@ Ocw2.EoiMode = SpecificEoi; /* Check which PIC needs the EOI */ - if (Irq > 8) + if (Irq >= 8) { /* Send the EOI for the IRQ */ __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF));

1 0

[tfaber] 68856: [HAL] - IRQ 8 belongs to the slave PIC, so send EOI appropriately CORE-10066
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 14:04:57 2015 New Revision: 68856 URL: http://svn.reactos.org/svn/reactos?rev=68856&view=rev Log: [HAL] - IRQ 8 belongs to the slave PIC, so send EOI appropriately CORE-10066 Modified: trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=68… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sat Aug 29 14:04:57 2015 @@ -808,7 +808,7 @@ Ocw2.EoiMode = SpecificEoi; /* Check which PIC needs the EOI */ - if (Irq > 8) + if (Irq >= 8) { /* Send the EOI for the IRQ */ __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015