Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HALX86] Rearrange files in x86 HAL

Browse source 
- Rename UP -> PIC. The "up" folder in fact contains the code for
  managing the Intel 8259 PIC chip
- Move amd64/processor.c -> apic/processor.c. The code is not tied to
  amd64
- Remove platform from "halinit*" files. They already reside in the
  corresponding folder
This commit is contained in:
Victor Perevertkin 2021-03-15 02:42:49 +03:00
parent 2d066c93fe
commit 7601fb549c
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
17 changed files with 47 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hal/halx86/CMakeLists.txt
View file

@ -44,11 +44,11 @@ endfunction()
include(generic.cmake) include(generic.cmake)
include(acpi.cmake) include(acpi.cmake)
include(apic.cmake) include(apic.cmake)
include(up.cmake)
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
include(pcidata.cmake) include(pcidata.cmake)
include(legacy.cmake) include(legacy.cmake)
include(up.cmake)
include(pic.cmake) include(pic.cmake)
include(xbox.cmake) include(xbox.cmake)
include(pc98.cmake) include(pc98.cmake)
@ -58,7 +58,7 @@ if(ARCH STREQUAL "i386")
remove_definitions(-DSARCH_PC98) remove_definitions(-DSARCH_PC98)
# hal # hal
add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic) 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(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic)
add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) 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(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic)
@ -73,12 +73,10 @@ if(ARCH STREQUAL "i386")
elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "amd64")
list(APPEND HAL_SOURCE list(APPEND HAL_SOURCE
generic/spinlock.c
amd64/x86bios.c amd64/x86bios.c
amd64/halinit.c amd64/halinit.c)
amd64/processor.c)
add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic)
target_link_libraries(hal fast486) target_link_libraries(hal fast486)
endif() endif()

3
hal/halx86/apic.cmake
View file

@ -6,7 +6,8 @@ list(APPEND HAL_APIC_ASM_SOURCE
list(APPEND HAL_APIC_SOURCE list(APPEND HAL_APIC_SOURCE
apic/apic.c apic/apic.c
apic/apictimer.c apic/apictimer.c
apic/halinit_apic.c apic/halinit.c
apic/processor.c
apic/rtctimer.c apic/rtctimer.c
apic/tsc.c) apic/tsc.c)

9
hal/halx86/apic/halinit_apic.c → hal/halx86/apic/halinit.c
View file

@ -1,9 +1,8 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Hardware Abstraction Layer
* PROJECT: ReactOS kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* FILE: hal/halx86/apic/halinit_apic.c * PURPOSE: Initialize the x86 HAL
* PURPOSE: Initialize the x86 hal * COPYRIGHT: Copyright 2011 Timo Kreuzer <timo.kreuzer@reactos.org>
* PROGRAMMER: Timo Kreuzer (timo.kreuzer@reactos.org)
*/ */
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/

9
hal/halx86/amd64/processor.c → hal/halx86/apic/processor.c
View file

@ -1,9 +1,8 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS Hardware Abstraction Layer
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* FILE: hal/halx86/amd64/processor.c * PURPOSE: HAL Processor Routines
* PURPOSE: HAL Processor Routines * COPYRIGHT: Copyright 2010 Timo Kreuzer <timo.kreuzer@reactos.org>
* PROGRAMMERS: Timo Kreuzer (timo.kreuzer@reactos.org)
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/

8
hal/halx86/minihal/CMakeLists.txt
View file

@ -17,10 +17,10 @@ list(APPEND MINI_HAL_SOURCE
../generic/sysinfo.c ../generic/sysinfo.c
../generic/timer.c ../generic/timer.c
../generic/usage.c ../generic/usage.c
../up/halinit_mini.c ../pic/pic.c
../up/pic.c ../pic/processor.c
../up/processor.c ../include/hal.h
../include/hal.h) halinit.c)
if(SARCH STREQUAL "xbox") if(SARCH STREQUAL "xbox")
list(APPEND MINI_HAL_SOURCE list(APPEND MINI_HAL_SOURCE

11
hal/halx86/up/halinit_mini.c → hal/halx86/minihal/halinit.c
View file

@ -1,11 +1,8 @@
/* /*
* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Mini-HAL
* PROJECT: ReactOS kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* FILE: hal/halx86/up/halinit_mini.c * PURPOSE: Initialize the x86 HAL
* PURPOSE: Initialize the x86 hal * COPYRIGHT: Copyright 1998 David Welch <welch@cwcom.net>
* PROGRAMMER: David Welch (welch@cwcom.net)
* UPDATE HISTORY:
* 11/06/98: Created
*/ */
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/

7
hal/halx86/pc98.cmake
View file

@ -27,12 +27,13 @@ list(APPEND HAL_PC98_ASM_SOURCE
list(APPEND HAL_PC98_SOURCE list(APPEND HAL_PC98_SOURCE
pc98/irql.c pc98/irql.c
generic/timer.c generic/timer.c
up/halinit_up.c pic/halinit.c
up/pic.c) pic/pic.c
pic/processor.c)
list(APPEND HAL_PC98_ASM_SOURCE list(APPEND HAL_PC98_ASM_SOURCE
generic/trap.S generic/trap.S
up/pic.S) pic/pic.S)
# Legacy # Legacy
list(APPEND HAL_PC98_SOURCE list(APPEND HAL_PC98_SOURCE

9
hal/halx86/pic.cmake
View file

@ -2,15 +2,16 @@
list(APPEND HAL_PIC_ASM_SOURCE list(APPEND HAL_PIC_ASM_SOURCE
generic/systimer.S generic/systimer.S
generic/trap.S generic/trap.S
up/pic.S) pic/pic.S)
list(APPEND HAL_PIC_SOURCE list(APPEND HAL_PIC_SOURCE
generic/clock.c generic/clock.c
generic/profil.c generic/profil.c
generic/timer.c generic/timer.c
up/halinit_up.c pic/halinit.c
up/irql.c pic/irql.c
up/pic.c) pic/pic.c
pic/processor.c)
add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE}) add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE})
add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE} ${lib_hal_pic_asm})

0
hal/halx86/up/halinit_up.c → hal/halx86/pic/halinit.c
View file

4
hal/halx86/up/halup.rc → hal/halx86/pic/halpic.rc
View file

@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL #define REACTOS_VERSION_DLL
#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer" #define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer"
#define REACTOS_STR_INTERNAL_NAME "halup" #define REACTOS_STR_INTERNAL_NAME "halpic"
#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll" #define REACTOS_STR_ORIGINAL_FILENAME "halpic.dll"
#include <reactos/version.rc> #include <reactos/version.rc>

0
hal/halx86/up/irql.c → hal/halx86/pic/irql.c
View file

8
hal/halx86/up/pic.S → hal/halx86/pic/pic.S
View file

@ -1,8 +1,8 @@
/* /*
* FILE: hal/halx86/up/pic.S * PROJECT: ReactOS Hardware Abstraction Layer
* COPYRIGHT: See COPYING in the top level directory * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* PURPOSE: HAL PIC Management and Control Code * PURPOSE: HAL PIC Management and Control Code
* PROGRAMMER: Thomas Faber (thomas.faber@reactos.org) * COPYRIGHT: Copyright 2016-2018 Thomas Faber <thomas.faber@reactos.org>
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/

0
hal/halx86/up/pic.c → hal/halx86/pic/pic.c
View file

9
hal/halx86/up/processor.c → hal/halx86/pic/processor.c
View file

@ -1,9 +1,8 @@
/* /*
* PROJECT: ReactOS HAL * PROJECT: ReactOS Hardware Abstraction Layer
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
* FILE: hal/halx86/up/processor.c * PURPOSE: HAL Processor Routines
* PURPOSE: HAL Processor Routines * COPYRIGHT: Copyright 2006 Alex Ionescu <alex.ionescu@reactos.org>
* PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org)
*/ */
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/

3
hal/halx86/up.cmake
View file

@ -1,7 +1,6 @@
list(APPEND HAL_UP_SOURCE list(APPEND HAL_UP_SOURCE
generic/spinlock.c generic/spinlock.c)
up/processor.c)
add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE})
add_dependencies(lib_hal_up bugcodes xdk) add_dependencies(lib_hal_up bugcodes xdk)

9
hal/halx86/xbox.cmake
View file

@ -3,7 +3,7 @@ list(APPEND HAL_XBOX_ASM_SOURCE
generic/systimer.S generic/systimer.S
generic/trap.S generic/trap.S
generic/v86.S generic/v86.S
up/pic.S) pic/pic.S)
list(APPEND HAL_XBOX_SOURCE list(APPEND HAL_XBOX_SOURCE
generic/beep.c generic/beep.c
@ -34,10 +34,11 @@ list(APPEND HAL_XBOX_SOURCE
generic/timer.c generic/timer.c
xbox/clock.c xbox/clock.c
xbox/part_xbox.c xbox/part_xbox.c
xbox/halinit_xbox.c xbox/halinit.c
xbox/reboot.c xbox/reboot.c
up/irql.c pic/irql.c
up/pic.c) pic/pic.c
pic/processor.c)
add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE})
add_library(lib_hal_xbox OBJECT ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) add_library(lib_hal_xbox OBJECT ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm})

0
hal/halx86/xbox/halinit_xbox.c → hal/halx86/xbox/halinit.c
View file