diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif index 3b9d25cb692..0f6bc673e67 100644 --- a/reactos/boot/bootdata/txtsetup.sif +++ b/reactos/boot/bootdata/txtsetup.sif @@ -40,7 +40,7 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS ;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT" +OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" diff --git a/reactos/ntoskrnl/dbgk/dbgkobj.c b/reactos/ntoskrnl/dbgk/dbgkobj.c index eeb87ea6132..6ee27f8b582 100644 --- a/reactos/ntoskrnl/dbgk/dbgkobj.c +++ b/reactos/ntoskrnl/dbgk/dbgkobj.c @@ -14,7 +14,7 @@ POBJECT_TYPE DbgkDebugObjectType; FAST_MUTEX DbgkpProcessDebugPortMutex; -ULONG DbgkpTraceLevel = 0; //-1; +ULONG DbgkpTraceLevel = 0; GENERIC_MAPPING DbgkDebugObjectMapping = { diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h index 176cb1df99f..1e21e1f0b12 100644 --- a/reactos/ntoskrnl/include/internal/ob.h +++ b/reactos/ntoskrnl/include/internal/ob.h @@ -9,7 +9,7 @@ // // Define this if you want debugging support // -#define _OB_DEBUG_ 0x00 +#define _OB_DEBUG_ 0x01 // // These define the Debug Masks Supported diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c index fae9d31c2ba..907dc8596b9 100644 --- a/reactos/ntoskrnl/io/iomgr/iomgr.c +++ b/reactos/ntoskrnl/io/iomgr/iomgr.c @@ -13,7 +13,7 @@ #define NDEBUG #include -ULONG IopTraceLevel = 0; //IO_API_DEBUG | IO_FILE_DEBUG; +ULONG IopTraceLevel = 0; // should go into a proper header VOID diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s index f01225ab4f2..c29b0512e64 100644 --- a/reactos/ntoskrnl/ke/i386/trap.s +++ b/reactos/ntoskrnl/ke/i386/trap.s @@ -2379,3 +2379,31 @@ IsrTimeout: /* Cleanup verification */ VERIFY_INT_END kid, 0 .endfunc + +.globl _KeSynchronizeExecution@12 +.func KeSynchronizeExecution@12 +_KeSynchronizeExecution@12: + + /* Save EBX and put the interrupt object in it */ + push ebx + mov ebx, [esp+8] + + /* Go to DIRQL */ + mov cl, [ebx+KINTERRUPT_SYNCHRONIZE_IRQL] + call @KfRaiseIrql@4 + + /* Call the routine */ + push eax + push [esp+20] + call [esp+20] + + /* Lower IRQL */ + mov ebx, eax + pop ecx + call @KfLowerIrql@4 + + /* Return status */ + mov eax, ebx + pop ebx + ret 12 +.endfunc diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c index 00a910b31f4..0b10ef07d14 100644 --- a/reactos/ntoskrnl/ke/spinlock.c +++ b/reactos/ntoskrnl/ke/spinlock.c @@ -247,31 +247,6 @@ KeAcquireInterruptSpinLock(IN PKINTERRUPT Interrupt) return OldIrql; } -/* - * @implemented - */ -BOOLEAN -NTAPI -KeSynchronizeExecution(IN PKINTERRUPT Interrupt, - IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, - IN PVOID SynchronizeContext) -{ - KIRQL OldIrql; - BOOLEAN Status; - - /* Raise IRQL and acquire lock on MP */ - OldIrql = KeAcquireInterruptSpinLock(Interrupt); - - /* Call the routine */ - Status = SynchronizeRoutine(SynchronizeContext); - - /* Release lock and lower IRQL */ - KeReleaseInterruptSpinLock(Interrupt, OldIrql); - - /* Return routine status */ - return Status; -} - /* * @implemented */ diff --git a/reactos/ntoskrnl/ob/obinit.c b/reactos/ntoskrnl/ob/obinit.c index 89fb834189a..d248516a29c 100644 --- a/reactos/ntoskrnl/ob/obinit.c +++ b/reactos/ntoskrnl/ob/obinit.c @@ -44,7 +44,7 @@ GENERIC_MAPPING ObpSymbolicLinkMapping = }; PDEVICE_MAP ObSystemDeviceMap = NULL; -ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; +ULONG ObpTraceLevel = 0; VOID NTAPI diff --git a/reactos/ntoskrnl/ps/query.c b/reactos/ntoskrnl/ps/query.c index c95de551bd2..6d5fbcb420f 100644 --- a/reactos/ntoskrnl/ps/query.c +++ b/reactos/ntoskrnl/ps/query.c @@ -17,7 +17,7 @@ #include "internal/ps_i.h" /* Debugging Level */ -ULONG PspTraceLevel = 0;//PS_KILL_DEBUG | PS_REF_DEBUG; +ULONG PspTraceLevel = 0; /* PRIVATE FUNCTIONS *********************************************************/