From c6c0791bf0fd59bc72e2b611da529922bf24372b Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Sat, 15 Dec 2018 18:05:57 +0100 Subject: [PATCH] Created init folder --- build/win32/Cxbx.vcxproj | 4 ++-- build/win32/Cxbx.vcxproj.filters | 4 ++-- src/CxbxKrnl/Emu.cpp | 2 +- src/CxbxKrnl/EmuFS.cpp | 2 +- src/CxbxKrnl/EmuFile.cpp | 2 +- src/CxbxKrnl/EmuKrnl.cpp | 2 +- src/CxbxKrnl/EmuKrnl.h | 2 +- src/CxbxKrnl/EmuKrnlEx.cpp | 2 +- src/CxbxKrnl/EmuKrnlHal.cpp | 2 +- src/CxbxKrnl/EmuKrnlIo.cpp | 2 +- src/CxbxKrnl/EmuKrnlKe.cpp | 2 +- src/CxbxKrnl/EmuKrnlLogging.cpp | 2 +- src/CxbxKrnl/EmuKrnlMm.cpp | 2 +- src/CxbxKrnl/EmuKrnlNt.cpp | 2 +- src/CxbxKrnl/EmuKrnlOb.cpp | 2 +- src/CxbxKrnl/EmuKrnlPs.cpp | 2 +- src/CxbxKrnl/EmuKrnlRtl.cpp | 2 +- src/CxbxKrnl/EmuKrnlXe.cpp | 2 +- src/CxbxKrnl/KernelThunk.cpp | 2 +- src/common/EmuEEPROM.cpp | 2 +- src/common/util/CxbxCommon.cpp | 2 +- src/common/win32/EmuShared.cpp | 2 +- src/common/win32/IPCWindows.cpp | 2 +- src/common/win32/InlineFunc.cpp | 2 +- src/common/xbe/Xbe.cpp | 2 +- src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp | 2 +- src/core/HLE/D3D8/Direct3D9/Direct3D9.h | 2 +- src/core/HLE/D3D8/XbConvert.h | 2 +- src/core/HLE/D3D8/XbPixelShader.cpp | 2 +- src/core/HLE/D3D8/XbVertexShader.cpp | 2 +- src/core/HLE/DSOUND/DirectSound/DirectSound.cpp | 2 +- src/core/HLE/DSOUND/DirectSound/DirectSound.hpp | 2 +- src/core/HLE/Intercept.cpp | 2 +- src/core/HLE/Patches.cpp | 2 +- src/core/HLE/XACTENG/XactEng.cpp | 2 +- src/core/HLE/XAPI/Xapi.cpp | 2 +- src/{CxbxKrnl => core/kernel/init}/CxbxKrnl.cpp | 12 ++++++------ src/{CxbxKrnl => core/kernel/init}/CxbxKrnl.h | 0 src/core/kernel/memory-manager/PhysicalMemory.h | 2 +- src/devices/EmuNVNet.cpp | 2 +- src/devices/SMCDevice.cpp | 2 +- src/devices/video/nv2a.cpp | 2 +- src/devices/x86/EmuX86.cpp | 2 +- src/gui/DbgConsole.cpp | 2 +- src/gui/DlgEepromConfig.cpp | 2 +- src/gui/WinMain.cpp | 2 +- src/gui/WndMain.cpp | 2 +- 47 files changed, 53 insertions(+), 53 deletions(-) rename src/{CxbxKrnl => core/kernel/init}/CxbxKrnl.cpp (96%) rename src/{CxbxKrnl => core/kernel/init}/CxbxKrnl.h (100%) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index fc1ef028f..158aefe51 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -217,7 +217,7 @@ - + @@ -364,7 +364,7 @@ - + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index 255284fb6..eb64713fa 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -97,7 +97,7 @@ Shared - + Emulator @@ -374,7 +374,7 @@ Shared - + Emulator diff --git a/src/CxbxKrnl/Emu.cpp b/src/CxbxKrnl/Emu.cpp index af175e552..7a80d2461 100644 --- a/src/CxbxKrnl/Emu.cpp +++ b/src/CxbxKrnl/Emu.cpp @@ -41,7 +41,7 @@ namespace xboxkrnl #include }; -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "Emu.h" #include "devices\x86\EmuX86.h" #include "EmuFS.h" diff --git a/src/CxbxKrnl/EmuFS.cpp b/src/CxbxKrnl/EmuFS.cpp index 3ed980c71..aae3df73d 100644 --- a/src/CxbxKrnl/EmuFS.cpp +++ b/src/CxbxKrnl/EmuFS.cpp @@ -45,7 +45,7 @@ namespace xboxkrnl #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuFS.h" -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "core\kernel\memory-manager\VMManager.h" #include "Logging.h" diff --git a/src/CxbxKrnl/EmuFile.cpp b/src/CxbxKrnl/EmuFile.cpp index 3e99c70ff..f067b1335 100644 --- a/src/CxbxKrnl/EmuFile.cpp +++ b/src/CxbxKrnl/EmuFile.cpp @@ -47,7 +47,7 @@ #pragma warning(disable:4005) // Ignore redefined status values #include #pragma warning(default:4005) -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "core\kernel\memory-manager\VMManager.h" #include "Logging.h" diff --git a/src/CxbxKrnl/EmuKrnl.cpp b/src/CxbxKrnl/EmuKrnl.cpp index 7e8bc0e93..5fec6a9e3 100644 --- a/src/CxbxKrnl/EmuKrnl.cpp +++ b/src/CxbxKrnl/EmuKrnl.cpp @@ -52,7 +52,7 @@ namespace xboxkrnl #include "EmuKrnlLogging.h" #include "EmuKrnl.h" // for HalSystemInterrupts #include "EmuKrnlKi.h" // for KiLockDispatcherDatabase -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "EmuXTL.h" // prevent name collisions diff --git a/src/CxbxKrnl/EmuKrnl.h b/src/CxbxKrnl/EmuKrnl.h index 4074c71c4..328ff7487 100644 --- a/src/CxbxKrnl/EmuKrnl.h +++ b/src/CxbxKrnl/EmuKrnl.h @@ -34,7 +34,7 @@ #ifndef EMUKRNL_H #define EMUKRNL_H -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "Emu.h" // CONTAINING_RECORD macro diff --git a/src/CxbxKrnl/EmuKrnlEx.cpp b/src/CxbxKrnl/EmuKrnlEx.cpp index 67a6426a5..37f447179 100644 --- a/src/CxbxKrnl/EmuKrnlEx.cpp +++ b/src/CxbxKrnl/EmuKrnlEx.cpp @@ -55,7 +55,7 @@ namespace NtDll #include "EmuNtDll.h" // For NtDelayExecution(), etc. }; -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" // For InsertHeadList, InsertTailList, RemoveHeadList diff --git a/src/CxbxKrnl/EmuKrnlHal.cpp b/src/CxbxKrnl/EmuKrnlHal.cpp index 24efdf2af..1e518aa6b 100644 --- a/src/CxbxKrnl/EmuKrnlHal.cpp +++ b/src/CxbxKrnl/EmuKrnlHal.cpp @@ -48,7 +48,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" // For CxbxKrnlCleanup, CxbxConvertArgToString, and CxbxExec +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup, CxbxConvertArgToString, and CxbxExec #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" #include "devices\x86\EmuX86.h" // HalReadWritePciSpace needs this diff --git a/src/CxbxKrnl/EmuKrnlIo.cpp b/src/CxbxKrnl/EmuKrnlIo.cpp index d95925bdd..945886f8d 100644 --- a/src/CxbxKrnl/EmuKrnlIo.cpp +++ b/src/CxbxKrnl/EmuKrnlIo.cpp @@ -46,7 +46,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuFile.h" // For CxbxCreateSymbolicLink(), etc. #include "CxbxDebugger.h" diff --git a/src/CxbxKrnl/EmuKrnlKe.cpp b/src/CxbxKrnl/EmuKrnlKe.cpp index 9ddd1e269..257d0762f 100644 --- a/src/CxbxKrnl/EmuKrnlKe.cpp +++ b/src/CxbxKrnl/EmuKrnlKe.cpp @@ -53,7 +53,7 @@ namespace NtDll #include "EmuNtDll.h" // For NtDelayExecution(), etc. }; -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuKrnlKi.h" // For KiRemoveTreeTimer(), KiInsertTreeTimer() diff --git a/src/CxbxKrnl/EmuKrnlLogging.cpp b/src/CxbxKrnl/EmuKrnlLogging.cpp index 558f1aabd..941b2290a 100644 --- a/src/CxbxKrnl/EmuKrnlLogging.cpp +++ b/src/CxbxKrnl/EmuKrnlLogging.cpp @@ -55,7 +55,7 @@ namespace xboxkrnl #include "Logging.h" #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" // prevent name collisions namespace xboxkrnl diff --git a/src/CxbxKrnl/EmuKrnlMm.cpp b/src/CxbxKrnl/EmuKrnlMm.cpp index f242cc557..bd6eb2055 100644 --- a/src/CxbxKrnl/EmuKrnlMm.cpp +++ b/src/CxbxKrnl/EmuKrnlMm.cpp @@ -48,7 +48,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnl.h" // For DefaultLaunchDataPage #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "core\kernel\memory-manager\VMManager.h" #include "EmuShared.h" diff --git a/src/CxbxKrnl/EmuKrnlNt.cpp b/src/CxbxKrnl/EmuKrnlNt.cpp index 81b00da60..2dbc49109 100644 --- a/src/CxbxKrnl/EmuKrnlNt.cpp +++ b/src/CxbxKrnl/EmuKrnlNt.cpp @@ -53,7 +53,7 @@ namespace NtDll #include "EmuNtDll.h" }; -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. #include "core\kernel\memory-manager\VMManager.h" // For g_VMManager diff --git a/src/CxbxKrnl/EmuKrnlOb.cpp b/src/CxbxKrnl/EmuKrnlOb.cpp index 81cc6b1a5..08f90e70d 100644 --- a/src/CxbxKrnl/EmuKrnlOb.cpp +++ b/src/CxbxKrnl/EmuKrnlOb.cpp @@ -46,7 +46,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" // For CxbxKrnlCleanup +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "EmuKrnl.h" // For OBJECT_TO_OBJECT_HEADER() #include "EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. #include diff --git a/src/CxbxKrnl/EmuKrnlPs.cpp b/src/CxbxKrnl/EmuKrnlPs.cpp index 4db0f6648..753cc4e46 100644 --- a/src/CxbxKrnl/EmuKrnlPs.cpp +++ b/src/CxbxKrnl/EmuKrnlPs.cpp @@ -49,7 +49,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" -#include "CxbxKrnl.h" // For CxbxKrnl_TLS +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_TLS #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuFS.h" // For EmuGenerateFS #include "EmuXTL.h" diff --git a/src/CxbxKrnl/EmuKrnlRtl.cpp b/src/CxbxKrnl/EmuKrnlRtl.cpp index d2d0e1ae9..be2d9a6f2 100644 --- a/src/CxbxKrnl/EmuKrnlRtl.cpp +++ b/src/CxbxKrnl/EmuKrnlRtl.cpp @@ -54,7 +54,7 @@ namespace NtDll #include "EmuNtDll.h" }; -#include "CxbxKrnl.h" // For CxbxKrnlCleanup() +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup() #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include diff --git a/src/CxbxKrnl/EmuKrnlXe.cpp b/src/CxbxKrnl/EmuKrnlXe.cpp index a9c7af5c4..218adc611 100644 --- a/src/CxbxKrnl/EmuKrnlXe.cpp +++ b/src/CxbxKrnl/EmuKrnlXe.cpp @@ -44,7 +44,7 @@ namespace xboxkrnl #include // For XeImageFileName, etc. }; -#include "CxbxKrnl.h" // For CxbxKrnl_Xbe +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_Xbe #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "core\kernel\memory-manager\VMManager.h" diff --git a/src/CxbxKrnl/KernelThunk.cpp b/src/CxbxKrnl/KernelThunk.cpp index 644003f92..521f75d0d 100644 --- a/src/CxbxKrnl/KernelThunk.cpp +++ b/src/CxbxKrnl/KernelThunk.cpp @@ -42,7 +42,7 @@ namespace xboxkrnl }; #include "Cxbx.h" // For CxbxKrnl_KernelThunkTable -#include "CxbxKrnl.h" // For UINT +#include "core\kernel\init\CxbxKrnl.h" // For UINT #define FUNC(f) f #define VARIABLE(v) v diff --git a/src/common/EmuEEPROM.cpp b/src/common/EmuEEPROM.cpp index 4e5f230bf..3f2ebcfc3 100644 --- a/src/common/EmuEEPROM.cpp +++ b/src/common/EmuEEPROM.cpp @@ -50,7 +50,7 @@ namespace xboxkrnl #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos #include "..\CxbxKrnl\Emu.h" // For EmuWarning #include "..\..\src\devices\LED.h" // For SetLEDSequence -#include "..\CxbxKrnl\CxbxKrnl.h" +#include "..\core\kernel\init\CxbxKrnl.h" xboxkrnl::XBOX_EEPROM *EEPROM = nullptr; // Set using CxbxRestoreEEPROM() diff --git a/src/common/util/CxbxCommon.cpp b/src/common/util/CxbxCommon.cpp index 9a50d370a..b773499f4 100644 --- a/src/common/util/CxbxCommon.cpp +++ b/src/common/util/CxbxCommon.cpp @@ -40,7 +40,7 @@ // The intent of this file is to add general functions which are not kernel specific (for those CxbxKrnl.h should be used instead) #include "common\util\CxbxCommon.h" -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/src/common/win32/EmuShared.cpp b/src/common/win32/EmuShared.cpp index a02983561..5e101cb96 100644 --- a/src/common/win32/EmuShared.cpp +++ b/src/common/win32/EmuShared.cpp @@ -35,7 +35,7 @@ // ****************************************************************** #define _XBOXKRNL_DEFEXTRN_ -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "EmuShared.h" diff --git a/src/common/win32/IPCWindows.cpp b/src/common/win32/IPCWindows.cpp index 93b5d63a6..6a172aa69 100644 --- a/src/common/win32/IPCWindows.cpp +++ b/src/common/win32/IPCWindows.cpp @@ -39,7 +39,7 @@ #include #include "Cxbx.h" -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "gui/ResCxbx.h" #include "Common/IPCHybrid.hpp" diff --git a/src/common/win32/InlineFunc.cpp b/src/common/win32/InlineFunc.cpp index 54f4add28..34ee06e93 100644 --- a/src/common/win32/InlineFunc.cpp +++ b/src/common/win32/InlineFunc.cpp @@ -36,7 +36,7 @@ #if defined(_WIN32) || defined(WIN32) -#include "..\..\CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" // Source: https://stackoverflow.com/questions/8046097/how-to-check-if-a-process-has-the-administrative-rights bool CxbxIsElevated() { diff --git a/src/common/xbe/Xbe.cpp b/src/common/xbe/Xbe.cpp index 0e4da392d..b171752dd 100644 --- a/src/common/xbe/Xbe.cpp +++ b/src/common/xbe/Xbe.cpp @@ -46,7 +46,7 @@ namespace xboxkrnl #include // filesystem related functions available on C++ 17 #include // For ctime #include "devices\LED.h" // For LED::Sequence -#include "CxbxKrnl/CxbxKrnl.h" // For CxbxKrnlPrintUEM +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlPrintUEM #include "common\crypto\EmuSha.h" // For the SHA functions #include "common\crypto\EmuRsa.h" // For the RSA functions #include "CxbxKrnl/EmuXTL.h" // For LDT_FROM_DASHBOARD and CxbxInitWindow diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp index 85bef0c3d..4290d3128 100644 --- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp @@ -47,7 +47,7 @@ namespace xboxkrnl #include "common\util\CxbxUtil.h" #include "CxbxVersion.h" -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuFS.h" #include "EmuShared.h" diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h index c9d1a2afb..c621b2fca 100644 --- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h +++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h @@ -35,7 +35,7 @@ #define DIRECT3D9_H #include "../XbD3D8Types.h" -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "common\xbe\Xbe.h" #include "CxbxKrnl/Emu.h" diff --git a/src/core/HLE/D3D8/XbConvert.h b/src/core/HLE/D3D8/XbConvert.h index 0f6751ec2..f61cba84f 100644 --- a/src/core/HLE/D3D8/XbConvert.h +++ b/src/core/HLE/D3D8/XbConvert.h @@ -34,7 +34,7 @@ #ifndef XBCONVERT_H #define XBCONVERT_H -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #define VERTICES_PER_TRIANGLE 3 #define VERTICES_PER_QUAD 4 diff --git a/src/core/HLE/D3D8/XbPixelShader.cpp b/src/core/HLE/D3D8/XbPixelShader.cpp index 5ddf522af..ccc07172a 100644 --- a/src/core/HLE/D3D8/XbPixelShader.cpp +++ b/src/core/HLE/D3D8/XbPixelShader.cpp @@ -79,7 +79,7 @@ //#include // X_PSH_COMBINECOUNT -#include "CxbxKrnl/CxbxKrnl.h" // For CxbxKrnlCleanup() +#include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup() typedef uint8_t uint8; // TODO : Remove diff --git a/src/core/HLE/D3D8/XbVertexShader.cpp b/src/core/HLE/D3D8/XbVertexShader.cpp index 2b4dbe6f8..ef9c7d18b 100644 --- a/src/core/HLE/D3D8/XbVertexShader.cpp +++ b/src/core/HLE/D3D8/XbVertexShader.cpp @@ -39,7 +39,7 @@ #define _DEBUG_TRACK_VS -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuFS.h" #include "CxbxKrnl/EmuXTL.h" diff --git a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp index 4e2ca4ecf..19eb224f2 100644 --- a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp +++ b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp @@ -45,7 +45,7 @@ namespace xboxkrnl { #include #include -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuFS.h" #include "EmuShared.h" diff --git a/src/core/HLE/DSOUND/DirectSound/DirectSound.hpp b/src/core/HLE/DSOUND/DirectSound/DirectSound.hpp index 1d4b8d17a..aa6f3c4ec 100644 --- a/src/core/HLE/DSOUND/DirectSound/DirectSound.hpp +++ b/src/core/HLE/DSOUND/DirectSound/DirectSound.hpp @@ -38,7 +38,7 @@ #undef FIELD_OFFSET // prevent macro redefinition warnings #include -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "Emu.h" #ifdef __cplusplus diff --git a/src/core/HLE/Intercept.cpp b/src/core/HLE/Intercept.cpp index 929cc5120..e0c9ce2da 100644 --- a/src/core/HLE/Intercept.cpp +++ b/src/core/HLE/Intercept.cpp @@ -43,7 +43,7 @@ #include #include // For std::setfill and std::setw -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuFS.h" #include "CxbxKrnl/EmuXTL.h" diff --git a/src/core/HLE/Patches.cpp b/src/core/HLE/Patches.cpp index e83160996..da53b9ac0 100644 --- a/src/core/HLE/Patches.cpp +++ b/src/core/HLE/Patches.cpp @@ -35,7 +35,7 @@ // * // ****************************************************************** -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuXTL.h" #include "Patches.hpp" diff --git a/src/core/HLE/XACTENG/XactEng.cpp b/src/core/HLE/XACTENG/XactEng.cpp index 7faf8ba9e..083d6bd05 100644 --- a/src/core/HLE/XACTENG/XactEng.cpp +++ b/src/core/HLE/XACTENG/XactEng.cpp @@ -43,7 +43,7 @@ namespace xboxkrnl #include }; -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\/CxbxKrnl.h" #include "Common/Logging.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuFS.h" diff --git a/src/core/HLE/XAPI/Xapi.cpp b/src/core/HLE/XAPI/Xapi.cpp index b0b161f55..e09c931ce 100644 --- a/src/core/HLE/XAPI/Xapi.cpp +++ b/src/core/HLE/XAPI/Xapi.cpp @@ -45,7 +45,7 @@ namespace xboxkrnl }; #include -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "Logging.h" #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuKrnl.h" // For DefaultLaunchDataPage diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp similarity index 96% rename from src/CxbxKrnl/CxbxKrnl.cpp rename to src/core/kernel/init/CxbxKrnl.cpp index 8f5907bfa..1e065667b 100644 --- a/src/CxbxKrnl/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -45,17 +45,17 @@ namespace xboxkrnl }; #include "gui\ResCxbx.h" -#include "CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable #include "CxbxVersion.h" -#include "Emu.h" +#include "CxbxKrnl\Emu.h" #include "devices\x86\EmuX86.h" -#include "EmuFile.h" -#include "EmuFS.h" +#include "CxbxKrnl\EmuFile.h" +#include "CxbxKrnl\EmuFS.h" #include "EmuEEPROM.h" // For CxbxRestoreEEPROM, EEPROM, XboxFactoryGameRegion -#include "EmuKrnl.h" +#include "CxbxKrnl\EmuKrnl.h" #include "EmuShared.h" -#include "EmuXTL.h" +#include "CxbxKrnl\EmuXTL.h" #include "core/HLE/Intercept.hpp" #include "ReservedMemory.h" // For virtual_memory_placeholder #include "core\kernel\memory-manager\VMManager.h" diff --git a/src/CxbxKrnl/CxbxKrnl.h b/src/core/kernel/init/CxbxKrnl.h similarity index 100% rename from src/CxbxKrnl/CxbxKrnl.h rename to src/core/kernel/init/CxbxKrnl.h diff --git a/src/core/kernel/memory-manager/PhysicalMemory.h b/src/core/kernel/memory-manager/PhysicalMemory.h index fa574a4af..08664c162 100644 --- a/src/core/kernel/memory-manager/PhysicalMemory.h +++ b/src/core/kernel/memory-manager/PhysicalMemory.h @@ -45,7 +45,7 @@ namespace xboxkrnl }; #include "CxbxKrnl\Emu.h" -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include #include diff --git a/src/devices/EmuNVNet.cpp b/src/devices/EmuNVNet.cpp index eb2cdc325..1e3a0acd8 100644 --- a/src/devices/EmuNVNet.cpp +++ b/src/devices/EmuNVNet.cpp @@ -49,7 +49,7 @@ namespace xboxkrnl #include // For PKINTERRUPT, etc. }; -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl\Emu.h" #include "CxbxKrnl\EmuKrnl.h" diff --git a/src/devices/SMCDevice.cpp b/src/devices/SMCDevice.cpp index 85e33518e..351529905 100644 --- a/src/devices/SMCDevice.cpp +++ b/src/devices/SMCDevice.cpp @@ -43,7 +43,7 @@ namespace xboxkrnl #include // For xbox.h:AV_PACK_HDTV }; -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "EmuShared.h" #include "SMCDevice.h" // For SMCDevice diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp index d5906d6d5..1aea7e0df 100644 --- a/src/devices/video/nv2a.cpp +++ b/src/devices/video/nv2a.cpp @@ -63,7 +63,7 @@ namespace xboxkrnl #include // For uint32_t #include // For __beginthreadex(), etc. -#include "CxbxKrnl\CxbxKrnl.h" // For XBOX_MEMORY_SIZE, DWORD, etc +#include "core\kernel\init\CxbxKrnl.h" // For XBOX_MEMORY_SIZE, DWORD, etc #include "CxbxKrnl\Emu.h" #include "CxbxKrnl\EmuFS.h" #include "CxbxKrnl\EmuKrnl.h" diff --git a/src/devices/x86/EmuX86.cpp b/src/devices/x86/EmuX86.cpp index cf5b82bc1..2198f9060 100644 --- a/src/devices/x86/EmuX86.cpp +++ b/src/devices/x86/EmuX86.cpp @@ -47,7 +47,7 @@ #include "distorm.h" #include "mnemonics.h" -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl\Emu.h" // For EmuLog #include "devices\x86\EmuX86.h" #include "core/HLE/Intercept.hpp" // for bLLE_GPU diff --git a/src/gui/DbgConsole.cpp b/src/gui/DbgConsole.cpp index 96d44255a..788d69542 100644 --- a/src/gui/DbgConsole.cpp +++ b/src/gui/DbgConsole.cpp @@ -36,7 +36,7 @@ // ****************************************************************** #define _XBOXKRNL_DEFEXTRN_ -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl\Emu.h" #include "DbgConsole.h" #include "CxbxKrnl\ResourceTracker.h" diff --git a/src/gui/DlgEepromConfig.cpp b/src/gui/DlgEepromConfig.cpp index 292d68cf1..f6196910b 100644 --- a/src/gui/DlgEepromConfig.cpp +++ b/src/gui/DlgEepromConfig.cpp @@ -44,7 +44,7 @@ namespace xboxkrnl #include #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos -#include "CxbxKrnl\CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "DlgEepromConfig.h" #include "ResCxbx.h" #include diff --git a/src/gui/WinMain.cpp b/src/gui/WinMain.cpp index f7cb9bb7a..205f05d0c 100644 --- a/src/gui/WinMain.cpp +++ b/src/gui/WinMain.cpp @@ -36,7 +36,7 @@ #include "WndMain.h" -#include "CxbxKrnl/CxbxKrnl.h" +#include "core\kernel\init\CxbxKrnl.h" #include "CxbxKrnl/Emu.h" #include "EmuShared.h" #include "Common/Settings.hpp" diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp index 9bfafe3ce..ee7e976ad 100644 --- a/src/gui/WndMain.cpp +++ b/src/gui/WndMain.cpp @@ -52,7 +52,7 @@ #include "CxbxKrnl/EmuXTL.h" #include "Common/Settings.hpp" -#include "..\CxbxKrnl\CxbxKrnl.h" // For CxbxConvertArgToString and CxbxExec +#include "core\kernel\init\CxbxKrnl.h" // For CxbxConvertArgToString and CxbxExec #include "ResCxbx.h" #include "CxbxVersion.h" #include "Shlwapi.h"