[ros-diffs] [reactos] 01/01: [HALXBOX][BOOTDATA][INF] Give the Xbox HAL its own personality (#2338)

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35710b51afb22539dd631…

commit 35710b51afb22539dd631fb52c2ff18403ca299c
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Thu Feb 13 16:02:11 2020 +0300
Commit:     GitHub <noreply(a)github.com>
CommitDate: Thu Feb 13 14:02:11 2020 +0100

    [HALXBOX][BOOTDATA][INF] Give the Xbox HAL its own personality (#2338)
    
    CORE-16216
---
 boot/bootdata/txtsetup.sif  |  2 +-
 hal/halx86/legacy/halpcat.c |  5 +++++
 media/inf/hal.inf           | 18 +++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 82247b5a154..02116f3e039 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -225,7 +225,7 @@ pci_up = "Standard PC Uniprocessor"
 ;pci_mp = "Standard PC Multiprocessor"
 acpi_up = "ACPI PC Uniprocessor"
 ;acpi_mp = "ACPI PC Multiprocessor"
-xbox = "Original Xbox"
+xbox = "Original Xbox (x86 based)"
 
 [Computer.NTamd64]
 x64_up = "Standard x64 Uniprocessor"
diff --git a/hal/halx86/legacy/halpcat.c b/hal/halx86/legacy/halpcat.c
index d097ca7c729..c660296d8e8 100644
--- a/hal/halx86/legacy/halpcat.c
+++ b/hal/halx86/legacy/halpcat.c
@@ -25,8 +25,13 @@
 
 /* This determines the HAL type */
 BOOLEAN HalDisableFirmwareMapper = FALSE;
+#if defined(SARCH_XBOX)
+PWCHAR HalHardwareIdString = L"xbox";
+PWCHAR HalName = L"Xbox HAL";
+#else
 PWCHAR HalHardwareIdString = L"e_isa_up";
 PWCHAR HalName = L"PC Compatible Eisa/Isa HAL";
+#endif
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
diff --git a/media/inf/hal.inf b/media/inf/hal.inf
index 3c1ce916042..f631cd14dd5 100644
--- a/media/inf/hal.inf
+++ b/media/inf/hal.inf
@@ -27,6 +27,7 @@ HKR, , Icon,           0, "-27"
 [GenericMfg]
 %acpipic_up.DeviceDesc% = NO_DRV,acpipic_up
 %e_isa_up.DeviceDesc% = NO_DRV,e_isa_up
+%xbox.DeviceDesc% = NO_DRV,xbox
 
 ;------------------------------ NO DRIVER -----------------------------
 
@@ -45,34 +46,44 @@ ComputerClassName = "Computer"
 GenericMfg = "(Generic computers)"
 acpipic_up.DeviceDesc = "ACPI Uniprocessor PC"
 e_isa_up.DeviceDesc = "Standard Uniprocessor PC"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0405]
 ComputerClassName = "Počítač"
 GenericMfg = "(Obecné počítače)"
 acpipic_up.DeviceDesc = "Jednoprocesorové PC s ACPI rozhraním"
 e_isa_up.DeviceDesc = "Standardní jednoprocesorové PC"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0a]
 ReactOS = "Equipo de ReactOS"
+
 ComputerClassName = "Equipo"
 
 GenericMfg = "(Equipos genéricos)"
 acpipic_up.DeviceDesc = "PC con uniprocesador ACPI"
 e_isa_up.DeviceDesc = "PC con uniprocesador estándar"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0415]
 ReactOS = "Zespół ReactOS"
+
 ComputerClassName = "Komputer"
+
 GenericMfg = "(Komputery standardowe)"
 acpipic_up.DeviceDesc = "Komputer PC z interfejsem ACPI"
 e_isa_up.DeviceDesc = "Standardowy komputer PC"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0418]
 ReactOS = "Echipa ReactOS"
+
 ComputerClassName = "Calculator"
+
 GenericMfg = "(calculatoare generice)"
 acpipic_up.DeviceDesc = "PC uniprocesor ACPI"
 e_isa_up.DeviceDesc = "PC uniprocesor standard"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0419]
 ReactOS = "Команда ReactOS"
@@ -82,7 +93,7 @@ ComputerClassName = "Компьютер"
 GenericMfg = "(Универсальный компьютер)"
 acpipic_up.DeviceDesc = "ACPI однопроцессорный ПК"
 e_isa_up.DeviceDesc = "Стандартный однопроцессорный ПК"
-
+xbox.DeviceDesc = "Оригинальный Xbox (на базе x86)"
 
 [Strings.041f]
 ReactOS = "ReactOS Takımı"
@@ -92,15 +103,20 @@ ComputerClassName = "Bilgisayar"
 GenericMfg = "(Umûmî Bilgisayarlar)"
 acpipic_up.DeviceDesc = "ACPI Tek İşlemcili PC"
 e_isa_up.DeviceDesc = "Ölçünlü Tek İşlemcili PC"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0422]
 ReactOS = "Команда ReactOS"
+
 ComputerClassName = "Комп'ютер"
+
 GenericMfg = "(Стандартний комп'ютер)"
 acpipic_up.DeviceDesc = "ACPI однопроцесорний ПК"
 e_isa_up.DeviceDesc = "Стандартний однопроцесорний ПК"
+xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0804]
 GenericMfg = "(通用计算机)"
 acpipic_up.DeviceDesc = "ACPI 单处理器 PC"
 e_isa_up.DeviceDesc = "标准单处理器 PC"
+xbox.DeviceDesc = "Original Xbox (x86 based)"