[HALX86] Rearrange files in x86 HAL

- 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

hal/halx86/CMakeLists.txt

···
 include(generic.cmake)
 include(acpi.cmake)
 include(apic.cmake)
+include(up.cmake)
 
 if(ARCH STREQUAL "i386")
     include(pcidata.cmake)
     include(legacy.cmake)
-    include(up.cmake)
     include(pic.cmake)
     include(xbox.cmake)
     include(pc98.cmake)
···
     remove_definitions(-DSARCH_PC98)
 
     # 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(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic)
     add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic)
···
 elseif(ARCH STREQUAL "amd64")
 
     list(APPEND HAL_SOURCE
-        generic/spinlock.c
         amd64/x86bios.c
-        amd64/halinit.c
-        amd64/processor.c)
+        amd64/halinit.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)
 
 endif()

hal/halx86/amd64/processor.c hal/halx86/apic/processor.c

···
 /*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halx86/amd64/processor.c
- * PURPOSE:         HAL Processor Routines
- * PROGRAMMERS:     Timo Kreuzer ([e-mail])
+ * PROJECT:     ReactOS Hardware Abstraction Layer
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     HAL Processor Routines
+ * COPYRIGHT:   Copyright 2010 Timo Kreuzer <[e-mail]>
  */
 
 /* INCLUDES ******************************************************************/

hal/halx86/apic.cmake

···
 list(APPEND HAL_APIC_SOURCE
     apic/apic.c
     apic/apictimer.c
-    apic/halinit_apic.c
+    apic/halinit.c
+    apic/processor.c
     apic/rtctimer.c
     apic/tsc.c)
 

hal/halx86/apic/halinit_apic.c hal/halx86/apic/halinit.c

···
 /*
- * COPYRIGHT:     See COPYING in the top level directory
- * PROJECT:       ReactOS kernel
- * FILE:          hal/halx86/apic/halinit_apic.c
- * PURPOSE:       Initialize the x86 hal
- * PROGRAMMER:    Timo Kreuzer ([e-mail])
+ * PROJECT:     ReactOS Hardware Abstraction Layer
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Initialize the x86 HAL
+ * COPYRIGHT:   Copyright 2011 Timo Kreuzer <[e-mail]>
  */
 
 /* INCLUDES *****************************************************************/

hal/halx86/minihal/CMakeLists.txt

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

hal/halx86/pc98.cmake

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

hal/halx86/pic.cmake

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

hal/halx86/pic/halpic.rc

···
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "X86 Uniprocessor Hardware Abstraction Layer"
+#define REACTOS_STR_INTERNAL_NAME     "halpic"
+#define REACTOS_STR_ORIGINAL_FILENAME "halpic.dll"
+#include <reactos/version.rc>

hal/halx86/up.cmake

···
 
 list(APPEND HAL_UP_SOURCE
-    generic/spinlock.c
-    up/processor.c)
+    generic/spinlock.c)
 
 add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE})
 add_dependencies(lib_hal_up bugcodes xdk)

hal/halx86/up/halinit_mini.c hal/halx86/minihal/halinit.c

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

hal/halx86/up/halup.rc

···
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION  "X86 Uniprocessor Hardware Abstraction Layer"
-#define REACTOS_STR_INTERNAL_NAME     "halup"
-#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll"
-#include <reactos/version.rc>

hal/halx86/up/pic.S hal/halx86/pic/pic.S

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

hal/halx86/up/processor.c hal/halx86/pic/processor.c

···
 /*
- * PROJECT:         ReactOS HAL
- * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            hal/halx86/up/processor.c
- * PURPOSE:         HAL Processor Routines
- * PROGRAMMERS:     Alex Ionescu ([e-mail])
+ * PROJECT:     ReactOS Hardware Abstraction Layer
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     HAL Processor Routines
+ * COPYRIGHT:   Copyright 2006 Alex Ionescu <[e-mail]>
  */
 
 /* INCLUDES ******************************************************************/

hal/halx86/xbox.cmake

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