Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 20:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] Separate PC and Xbox platform-specific code (#2185)

Browse source 
CORE-16216
This commit is contained in:
Stanislav Motylkov 2019-12-27 23:02:38 +03:00 committed by Hermès BÉLUSCA - MAÏTO
parent 6c4e591ea9
commit 571407c7d2
7 changed files with 58 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
boot/freeldr/freeldr/CMakeLists.txt
View file

@ -113,7 +113,6 @@ if(ARCH STREQUAL "i386")
lib/fs/pxe.c
arch/i386/halstub.c
arch/i386/ntoskrnl.c
arch/i386/archmach.c
arch/i386/drivemap.c
arch/i386/hardware.c
arch/i386/hwacpi.c
@ -124,22 +123,32 @@ if(ARCH STREQUAL "i386")
arch/i386/i386idt.c
arch/i386/i386rtl.c
arch/i386/i386vid.c
arch/i386/pc/machpc.c
arch/i386/pc/pccons.c
arch/i386/pc/pcdisk.c
arch/i386/pc/pcmem.c
arch/i386/pc/pcrtc.c
arch/i386/pc/pcvideo.c
arch/i386/xbox/machxbox.c
arch/i386/xbox/xboxcons.c
arch/i386/xbox/xboxdisk.c
arch/i386/xbox/xboxfont.c
arch/i386/xbox/xboxi2c.c
arch/i386/xbox/xboxmem.c
arch/i386/xbox/xboxrtc.c
arch/i386/xbox/xboxvideo.c
disk/scsiport.c)
if(SARCH STREQUAL "xbox")
list(APPEND FREELDR_ARC_SOURCE
# FIXME: Abstract things better so we don't need to include /pc/* here
arch/i386/pc/machpc.c # machxbox.c depends on it
arch/i386/pc/pcdisk.c # hwdisk.c depends on it
arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it
arch/i386/xbox/machxbox.c
arch/i386/xbox/xboxcons.c
arch/i386/xbox/xboxdisk.c
arch/i386/xbox/xboxfont.c
arch/i386/xbox/xboxi2c.c
arch/i386/xbox/xboxmem.c
arch/i386/xbox/xboxrtc.c
arch/i386/xbox/xboxvideo.c)
else()
list(APPEND FREELDR_ARC_SOURCE
arch/i386/pc/machpc.c
arch/i386/pc/pccons.c
arch/i386/pc/pcdisk.c
arch/i386/pc/pcmem.c
arch/i386/pc/pcrtc.c
arch/i386/pc/pcvideo.c)
endif()
elseif(ARCH STREQUAL "amd64")
list(APPEND FREELDR_COMMON_ASM_SOURCE
arch/amd64/entry.S
@ -196,7 +205,7 @@ if(USE_CLANG_CL)
# We need to reduce the binary size
add_target_compile_flags(freeldr_common "/Os")
endif()
if(NOT MSVC AND ARCH STREQUAL "i386")
if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox")
# Prevent a warning when doing a memcmp with address 0
set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull")
endif()

44
boot/freeldr/freeldr/arch/i386/archmach.c
View file

@ -1,44 +0,0 @@
/*
* FreeLoader
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <freeldr.h>
VOID
MachInit(const char *CmdLine)
{
ULONG PciId;
memset(&MachVtbl, 0, sizeof(MACHVTBL));
/* Check for Xbox by identifying device at PCI 0:0:0, if it's
* 0x10de/0x02a5 then we're running on an Xbox */
WRITE_PORT_ULONG((ULONG*)0xcf8, CONFIG_CMD(0, 0, 0));
PciId = READ_PORT_ULONG((ULONG*)0xcfc);
if (PciId == 0x02a510de)
{
XboxMachInit(CmdLine);
}
else
{
PcMachInit(CmdLine);
}
HalpCalibrateStallExecution();
}
/* EOF */

12
boot/freeldr/freeldr/arch/i386/pc/machpc.c
View file

@ -1348,6 +1348,8 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
/* FIXME: Detect more ISA devices */
}
/* FIXME: Abstract things better so we don't need to place define here */
#if !defined(SARCH_XBOX)
static
UCHAR
PcGetFloppyCount(VOID)
@ -1359,6 +1361,7 @@ PcGetFloppyCount(VOID)
return ((Data & 0xF0) ? 1 : 0) + ((Data & 0x0F) ? 1 : 0);
}
#endif
PCONFIGURATION_COMPONENT_DATA
PcHwDetect(VOID)
@ -1416,9 +1419,13 @@ PcHwIdle(VOID)
/******************************************************************************/
/* FIXME: Abstract things better so we don't need to place define here */
#if !defined(SARCH_XBOX)
VOID
PcMachInit(const char *CmdLine)
MachInit(const char *CmdLine)
{
memset(&MachVtbl, 0, sizeof(MACHVTBL));
/* Setup vtbl */
MachVtbl.ConsPutChar = PcConsPutChar;
MachVtbl.ConsKbHit = PcConsKbHit;
@ -1448,6 +1455,8 @@ PcMachInit(const char *CmdLine)
MachVtbl.InitializeBootDevices = PcInitializeBootDevices;
MachVtbl.HwDetect = PcHwDetect;
MachVtbl.HwIdle = PcHwIdle;
HalpCalibrateStallExecution();
}
VOID
@ -1457,5 +1466,6 @@ PcPrepareForReactOS(VOID)
PcVideoPrepareForReactOS();
DiskStopFloppyMotor();
}
#endif
/* EOF */

23
boot/freeldr/freeldr/arch/i386/xbox/machxbox.c
View file

@ -253,8 +253,27 @@ VOID XboxHwIdle(VOID)
/******************************************************************************/
VOID
XboxMachInit(const char *CmdLine)
MachInit(const char *CmdLine)
{
ULONG PciId;
memset(&MachVtbl, 0, sizeof(MACHVTBL));
/* Check for Xbox by identifying device at PCI 0:0:0, if it's
* 0x10DE/0x02A5 then we're running on an Xbox */
WRITE_PORT_ULONG((ULONG *)0xCF8, CONFIG_CMD(0, 0, 0));
PciId = READ_PORT_ULONG((ULONG *)0xCFC);
if (PciId != 0x02A510DE)
{
ERR("This is not original Xbox!\n");
/* Disable and halt the CPU */
_disable();
__halt();
while (TRUE);
}
/* Set LEDs to red before anything is initialized */
XboxSetLED("rrrr");
@ -294,6 +313,8 @@ XboxMachInit(const char *CmdLine)
/* Set LEDs to orange after init */
XboxSetLED("oooo");
HalpCalibrateStallExecution();
}
VOID

1
boot/freeldr/freeldr/include/arch/amd64/amd64.h
View file

@ -39,7 +39,6 @@
#ifndef ASM
VOID FrLdrSetupGdtIdt(VOID);
#define MachInit PcMachInit
#endif
/* EOF */

2
boot/freeldr/freeldr/include/arch/i386/machxbox.h
View file

@ -48,8 +48,6 @@
extern UCHAR XboxFont8x16[256 * 16];
VOID XboxMachInit(const char *CmdLine);
VOID XboxConsPutChar(int Ch);
BOOLEAN XboxConsKbHit(VOID);
int XboxConsGetCh(VOID);

2
boot/freeldr/freeldr/include/arch/pc/machpc.h
View file

@ -24,8 +24,6 @@
#include "mm.h"
#endif
VOID PcMachInit(const char *CmdLine);
VOID PcBeep(VOID);
VOID PcConsPutChar(int Ch);