From a064c5d9a02485a57ce1960e4377dd281ba28fbe Mon Sep 17 00:00:00 2001 From: Victor Perevertkin Date: Mon, 15 Mar 2021 02:51:25 +0300 Subject: [PATCH] [HALX86] Remove unused and empty files, remove halapic halapic (a.k.a. non-ACPI APIC HAL) is not going to be supported in near future --- hal/halx86/CMakeLists.txt | 4 +- hal/halx86/amd64/halinit.c | 53 -------------------- hal/halx86/amd64/mps.S | 97 ------------------------------------- hal/halx86/amd64/stubs.c | 21 -------- hal/halx86/amd64/systimer.S | 28 ----------- 5 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 hal/halx86/amd64/halinit.c delete mode 100644 hal/halx86/amd64/mps.S delete mode 100644 hal/halx86/amd64/stubs.c delete mode 100644 hal/halx86/amd64/systimer.S diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 890a4b4ebd6..abb3c1dd469 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -60,7 +60,6 @@ if(ARCH STREQUAL "i386") # hal add_hal(hal SOURCES pic/halpic.rc COMPONENTS generic legacy up pic) add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) - add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) @@ -73,8 +72,7 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") list(APPEND HAL_SOURCE - amd64/x86bios.c - amd64/halinit.c) + amd64/x86bios.c) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) target_link_libraries(hal fast486) diff --git a/hal/halx86/amd64/halinit.c b/hal/halx86/amd64/halinit.c deleted file mode 100644 index c67b94a70a7..00000000000 --- a/hal/halx86/amd64/halinit.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/amd64/halinit.c - * PURPOSE: HAL Entrypoint and Initialization - * PROGRAMMERS: - */ - -/* INCLUDES ******************************************************************/ - -#include -#define NDEBUG -#include - -/* GLOBALS *******************************************************************/ - -BOOLEAN HalpPciLockSettings; - -/* PRIVATE FUNCTIONS *********************************************************/ - -/* FUNCTIONS *****************************************************************/ -#if 0 -VOID -NTAPI -HalpInitProcessor( - IN ULONG ProcessorNumber, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - DPRINT1("ApicInitializeProcessor(%ld)\n", ProcessorNumber); - - /* Initialize the local APIC for this cpu */ - ApicInitializeLocalApic(ProcessorNumber); - - /* Initialize the timer */ - //ApicInitializeTimer(ProcessorNumber); - -} - - -VOID -HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - -} - -VOID -HalpInitPhase1(VOID) -{ - -} - -#endif - diff --git a/hal/halx86/amd64/mps.S b/hal/halx86/amd64/mps.S deleted file mode 100644 index 6d1b33c46db..00000000000 --- a/hal/halx86/amd64/mps.S +++ /dev/null @@ -1,97 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/amd64/mps.S - * PURPOSE: Intel MultiProcessor specification support - * PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net) - */ - -/* INCLUDES ******************************************************************/ - -#include - -#include - -/* FUNCTIONS *****************************************************************/ - -#define BEFORE \ - cld; \ - push rax; \ - push rbx; \ - push rcx; \ - push rdx; \ - push rsi; \ - push rdi; \ - push fs; \ - push gs; \ - -#define AFTER \ - pop gs; \ - pop fs; \ - pop rdi; \ - pop rsi; \ - pop rdx; \ - pop rcx; \ - pop rbx; \ - pop rax; \ - -#ifdef CONFIG_SMP -PUBLIC MpsIpiInterrupt -MpsIpiInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsIpiHandler - - /* Return to the caller */ - AFTER - iret -#endif - -PUBLIC MpsErrorInterrupt -MpsErrorInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsErrorHandler - - /* Return to the caller */ - AFTER - iret - - -PUBLIC MpsSpuriousInterrupt -MpsSpuriousInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call MpsSpuriousHandler - - /* Return to the caller */ - AFTER - iret - -PUBLIC MpsTimerInterrupt -MpsTimerInterrupt: - /* Save registers */ - BEFORE - - mov ebx, 0xef - mov eax, 0xceafbeef - push rax - push rsp - push rbx - call MpsTimerHandler - pop rax - pop rax - pop rax - - /* Return to the caller */ - AFTER - iret - -END -/* EOF */ diff --git a/hal/halx86/amd64/stubs.c b/hal/halx86/amd64/stubs.c deleted file mode 100644 index f3cfd726db6..00000000000 --- a/hal/halx86/amd64/stubs.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING.ARM in the top level directory - * FILE: hal/halx86/amd64/stubs.c - * PURPOSE: HAL stubs - * PROGRAMMERS: - */ - -/* INCLUDES *******************************************************************/ - -#include -#define NDEBUG -#include - -/* GLOBALS ********************************************************************/ - -//LARGE_INTEGER HalpPerformanceFrequency; - - -/* FUNCTIONS ******************************************************************/ - diff --git a/hal/halx86/amd64/systimer.S b/hal/halx86/amd64/systimer.S deleted file mode 100644 index f0adaef5932..00000000000 --- a/hal/halx86/amd64/systimer.S +++ /dev/null @@ -1,28 +0,0 @@ -/* - * FILE: hal/halx86/amd64/systimer.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Timer Interrupt and Management - * PROGRAMMER: Alex Ionescu (alex@relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include -#include - -/* GLOBALS *******************************************************************/ - -.data - -PUBLIC MsgUnimplemented -MsgUnimplemented: -.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" - - -/* FUNCTIONS *****************************************************************/ - -.code64 - - - -END