From 7e3697b87ea765bb317e663ee162eb03ac037bc6 Mon Sep 17 00:00:00 2001 From: Justin Miller Date: Mon, 29 Jan 2024 20:09:59 -0800 Subject: [PATCH] ahhsdhasd --- drivers/storage/ide/uniata/CMakeLists.txt | 2 +- ntoskrnl/config/i386/cmhardwr.c | 2 +- ntoskrnl/ex/init.c | 4 +++- ntoskrnl/include/internal/spinlock.h | 2 +- ntoskrnl/ke/i386/kiinit.c | 2 +- ntoskrnl/ke/i386/thrdini.c | 9 +-------- ntoskrnl/ke/ipi.c | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 4a78222a28bae..2bc60b713c71d 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -38,6 +38,6 @@ endif() add_pch(uniata stdafx.h SOURCE) set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) -add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(uniata_reg.inf) add_driver_inf(uniata uniata_comm.inf) diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index c3dfad1e4bab5..fa64b909cfdd9 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -466,7 +466,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (!Prcb->CpuID) { /* Uh oh, no CPUID! Should not happen as we don't support 80386 and older 80486 */ - ASSERT(FALSE); + // ASSERT(FALSE); } else { diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 70427277a3f58..559e97082f6a0 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1562,7 +1562,9 @@ Phase1InitializationDiscard(IN PVOID Context) /* Start Application Processors */ KeStartAllProcessors(); - KeSetAffinityProcess(&PsInitialSystemProcess->Pcb, KeActiveProcessors); + // KeSetAffinityProcess(&PsInitialSystemProcess->Pcb, 2); + + // __debugbreak(); #endif /* Initialize all processors */ diff --git a/ntoskrnl/include/internal/spinlock.h b/ntoskrnl/include/internal/spinlock.h index 8f9ff957b36ff..d09a3acebd8fe 100644 --- a/ntoskrnl/include/internal/spinlock.h +++ b/ntoskrnl/include/internal/spinlock.h @@ -31,7 +31,7 @@ KxAcquireSpinLock( if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) { /* We do, bugcheck! */ - KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); + // KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); } #endif diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 653e351b83e2f..0cdc348bcfac3 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -118,7 +118,7 @@ KiInitMachineDependent(VOID) KiRestoreFastSyscallReturnState(); /* Loop every CPU */ - i = KeActiveProcessors; + i = 1; for (Affinity = 1; i; Affinity <<= 1) { /* Check if this is part of the set */ diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index cf3d1c6194b44..91e8ad3931f6d 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -262,10 +262,6 @@ KiIdleLoop(VOID) PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - if (KeGetCurrentProcessorNumber() > 0) - { - DPRINT1("test"); - } /* Now loop forever */ while (TRUE) { @@ -292,10 +288,7 @@ KiIdleLoop(VOID) { /* Enable interrupts */ _enable(); - if (KeGetCurrentProcessorNumber() > 0) - { - __debugbreak(); - } + /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; diff --git a/ntoskrnl/ke/ipi.c b/ntoskrnl/ke/ipi.c index 0256b80d778ba..32d5676478d96 100644 --- a/ntoskrnl/ke/ipi.c +++ b/ntoskrnl/ke/ipi.c @@ -181,7 +181,7 @@ KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFra /* Freeze level! Trigger a FREEZE interrupt */ if (InterlockedBitTestAndReset((PLONG)&Prcb->RequestSummary, IPI_FREEZE)) { - // KiFreezeTargetExecution(TrapFrame, ExceptionFrame); + KiFreezeTargetExecution(TrapFrame, ExceptionFrame); }