diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 55e5c529b..f1fc4c7c7 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -230,12 +230,12 @@ - - + + - + @@ -244,7 +244,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -377,7 +377,7 @@ %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -392,13 +392,13 @@ - + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -428,7 +428,7 @@ - + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index 38807040c..eda229144 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -103,7 +103,7 @@ Emulator - + Emulator @@ -115,13 +115,13 @@ core\HLE\DSOUND\DirectSound - + Emulator - + Emulator - + Emulator @@ -356,7 +356,7 @@ Shared - + Shared @@ -392,13 +392,13 @@ core\HLE\DSOUND\DirectSound - + Emulator - + Emulator - + Emulator @@ -419,7 +419,7 @@ core\HLE\XONLINE - + Emulator @@ -434,7 +434,7 @@ Emulator - + Shared diff --git a/src/common/EmuEEPROM.cpp b/src/common/EmuEEPROM.cpp index 3f2ebcfc3..6c21963a3 100644 --- a/src/common/EmuEEPROM.cpp +++ b/src/common/EmuEEPROM.cpp @@ -48,7 +48,7 @@ namespace xboxkrnl #include "Cxbx.h" // For DBG_PRINTF_EX #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos -#include "..\CxbxKrnl\Emu.h" // For EmuWarning +#include "core\kernel\support\Emu.h" // For EmuWarning #include "..\..\src\devices\LED.h" // For SetLEDSequence #include "..\core\kernel\init\CxbxKrnl.h" diff --git a/src/common/Settings.cpp b/src/common/Settings.cpp index 68e0a7711..1a1e97141 100644 --- a/src/common/Settings.cpp +++ b/src/common/Settings.cpp @@ -36,7 +36,7 @@ // ****************************************************************** #include "Settings.hpp" -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #include "EmuShared.h" #include diff --git a/src/common/crypto/EmuRsa.cpp b/src/common/crypto/EmuRsa.cpp index ffba2d2c6..5bfcbe5be 100644 --- a/src/common/crypto/EmuRsa.cpp +++ b/src/common/crypto/EmuRsa.cpp @@ -39,7 +39,7 @@ #define LOG_PREFIX CXBXR_MODULE::RSA #include "EmuRsa.h" -#include "CxbxKrnl\Emu.h" // For EmuLog +#include "core\kernel\support\Emu.h" // For EmuLog #include #include diff --git a/src/common/win32/DInputController.cpp b/src/common/win32/DInputController.cpp index cdf8d76ec..d0b43fdf3 100644 --- a/src/common/win32/DInputController.cpp +++ b/src/common/win32/DInputController.cpp @@ -40,7 +40,7 @@ #include "DInputController.h" #include "EmuShared.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" // This is ridiculous #define FIELD_OFFSET(type,field) ((ULONG)&(((type *)0)->field)) diff --git a/src/common/win32/DInputController.h b/src/common/win32/DInputController.h index 2ea794ae4..a2a60479b 100644 --- a/src/common/win32/DInputController.h +++ b/src/common/win32/DInputController.h @@ -42,7 +42,7 @@ #include #include -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "Common/Settings.hpp" /* // ****************************************************************** diff --git a/src/common/win32/EmuShared.cpp b/src/common/win32/EmuShared.cpp index 5e101cb96..508be8d3e 100644 --- a/src/common/win32/EmuShared.cpp +++ b/src/common/win32/EmuShared.cpp @@ -36,7 +36,7 @@ #define _XBOXKRNL_DEFEXTRN_ #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #include "EmuShared.h" #undef FIELD_OFFSET // prevent macro redefinition warnings diff --git a/src/common/xbe/Xbe.cpp b/src/common/xbe/Xbe.cpp index b171752dd..a3e0bf8cc 100644 --- a/src/common/xbe/Xbe.cpp +++ b/src/common/xbe/Xbe.cpp @@ -49,7 +49,7 @@ namespace xboxkrnl #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 +#include "core\kernel\support\EmuXTL.h" // For LDT_FROM_DASHBOARD and CxbxInitWindow namespace fs = std::experimental::filesystem; diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp index 4290d3128..76eadca8f 100644 --- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp @@ -48,13 +48,13 @@ namespace xboxkrnl #include "common\util\CxbxUtil.h" #include "CxbxVersion.h" #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" #include "EmuShared.h" #include "gui/DbgConsole.h" #include "CxbxKrnl/ResourceTracker.h" #include "core\kernel\memory-manager\VMManager.h" // for g_VMManager -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "Logging.h" #include "../XbD3D8Logging.h" #include "core/HLE/Intercept.hpp" // for bLLE_GPU diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h index c621b2fca..747ba9bca 100644 --- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h +++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h @@ -37,7 +37,7 @@ #include "../XbD3D8Types.h" #include "core\kernel\init\CxbxKrnl.h" #include "common\xbe\Xbe.h" -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #define DIRECTDRAW_VERSION 0x0700 #include diff --git a/src/core/HLE/D3D8/XbConvert.cpp b/src/core/HLE/D3D8/XbConvert.cpp index 50e6ae330..b1828d4ef 100644 --- a/src/core/HLE/D3D8/XbConvert.cpp +++ b/src/core/HLE/D3D8/XbConvert.cpp @@ -38,8 +38,8 @@ #define LOG_PREFIX CXBXR_MODULE::D3DCVT -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "XbConvert.h" // About format color components: diff --git a/src/core/HLE/D3D8/XbPixelShader.cpp b/src/core/HLE/D3D8/XbPixelShader.cpp index ccc07172a..f69ef25e9 100644 --- a/src/core/HLE/D3D8/XbPixelShader.cpp +++ b/src/core/HLE/D3D8/XbPixelShader.cpp @@ -73,9 +73,9 @@ #define LOG_PREFIX CXBXR_MODULE::PXSH -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" +#include "core\kernel\support\EmuXTL.h" //#include // X_PSH_COMBINECOUNT diff --git a/src/core/HLE/D3D8/XbPushBuffer.cpp b/src/core/HLE/D3D8/XbPushBuffer.cpp index a1ca5710c..21b738ec1 100644 --- a/src/core/HLE/D3D8/XbPushBuffer.cpp +++ b/src/core/HLE/D3D8/XbPushBuffer.cpp @@ -39,8 +39,8 @@ #include // For assert() -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "XbD3D8Types.h" // For X_D3DFORMAT #include "CxbxKrnl/ResourceTracker.h" #include "devices/video/nv2a.h" // For g_NV2A, PGRAPHState diff --git a/src/core/HLE/D3D8/XbState.cpp b/src/core/HLE/D3D8/XbState.cpp index 89cb0ab99..416a75cec 100644 --- a/src/core/HLE/D3D8/XbState.cpp +++ b/src/core/HLE/D3D8/XbState.cpp @@ -36,8 +36,8 @@ #define _XBOXKRNL_DEFEXTRN_ #define LOG_PREFIX CXBXR_MODULE::D3DST -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" // deferred state lookup tables DWORD *XTL::EmuD3DDeferredRenderState = nullptr; diff --git a/src/core/HLE/D3D8/XbVertexBuffer.cpp b/src/core/HLE/D3D8/XbVertexBuffer.cpp index 1d27e9498..ec0aadb79 100644 --- a/src/core/HLE/D3D8/XbVertexBuffer.cpp +++ b/src/core/HLE/D3D8/XbVertexBuffer.cpp @@ -39,8 +39,8 @@ #include "core\kernel\memory-manager\VMManager.h" #include "common\util\xxhash32.h" // For XXHash32::hash() -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "CxbxKrnl/ResourceTracker.h" #include diff --git a/src/core/HLE/D3D8/XbVertexShader.cpp b/src/core/HLE/D3D8/XbVertexShader.cpp index ef9c7d18b..a88b85c37 100644 --- a/src/core/HLE/D3D8/XbVertexShader.cpp +++ b/src/core/HLE/D3D8/XbVertexShader.cpp @@ -40,9 +40,9 @@ #define _DEBUG_TRACK_VS #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" +#include "core\kernel\support\EmuXTL.h" #include "XbD3D8Types.h" // For X_D3DVSDE_* #include #include diff --git a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp index 19eb224f2..548b6417d 100644 --- a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp +++ b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp @@ -46,10 +46,10 @@ namespace xboxkrnl { #include #include #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" #include "EmuShared.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "Common/Settings.hpp" diff --git a/src/core/HLE/Intercept.cpp b/src/core/HLE/Intercept.cpp index e0c9ce2da..b60f9b0f3 100644 --- a/src/core/HLE/Intercept.cpp +++ b/src/core/HLE/Intercept.cpp @@ -44,9 +44,9 @@ #include #include // For std::setfill and std::setw #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" +#include "core\kernel\support\EmuXTL.h" #include "EmuShared.h" #include "Common/CxbxDebugger.h" #include "Logging.h" diff --git a/src/core/HLE/Patches.cpp b/src/core/HLE/Patches.cpp index da53b9ac0..6220cb87b 100644 --- a/src/core/HLE/Patches.cpp +++ b/src/core/HLE/Patches.cpp @@ -36,8 +36,8 @@ // ****************************************************************** #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "Patches.hpp" #include "Intercept.hpp" diff --git a/src/core/HLE/XACTENG/XactEng.cpp b/src/core/HLE/XACTENG/XactEng.cpp index 083d6bd05..736598a5b 100644 --- a/src/core/HLE/XACTENG/XactEng.cpp +++ b/src/core/HLE/XACTENG/XactEng.cpp @@ -45,10 +45,10 @@ namespace xboxkrnl #include "core\kernel\init\/CxbxKrnl.h" #include "Common/Logging.h" -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" #include "EmuShared.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "core\kernel\memory-manager\VMManager.h" #include diff --git a/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp b/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp index 52379ee45..544b47331 100644 --- a/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp +++ b/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp @@ -37,8 +37,8 @@ #define LOG_PREFIX CXBXR_MODULE::DINP -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "EmuShared.h" #include "Common/Win32/DInputController.h" #include "Logging.h" diff --git a/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp b/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp index dd40c7109..648fde440 100644 --- a/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp +++ b/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp @@ -37,8 +37,8 @@ #define LOG_PREFIX CXBXR_MODULE::XINP -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuXTL.h" #include "EmuShared.h" #include "XInput.h" diff --git a/src/core/HLE/XAPI/Xapi.cpp b/src/core/HLE/XAPI/Xapi.cpp index ac4828899..39dc8fae3 100644 --- a/src/core/HLE/XAPI/Xapi.cpp +++ b/src/core/HLE/XAPI/Xapi.cpp @@ -47,11 +47,11 @@ namespace xboxkrnl #include #include "core\kernel\init\CxbxKrnl.h" #include "Logging.h" -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #include "core\kernel\exports\EmuKrnl.h" // For DefaultLaunchDataPage -#include "CxbxKrnl/EmuFile.h" -#include "CxbxKrnl/EmuFS.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuFile.h" +#include "core\kernel\support\EmuFS.h" +#include "core\kernel\support\EmuXTL.h" #include "EmuShared.h" #include "../Common/Win32/XBPortMapping.h" #include "core/HLE/Intercept.hpp" diff --git a/src/core/HLE/XGRAPHIC/XGraphic.cpp b/src/core/HLE/XGRAPHIC/XGraphic.cpp index f8b4541f0..bd35e4380 100644 --- a/src/core/HLE/XGRAPHIC/XGraphic.cpp +++ b/src/core/HLE/XGRAPHIC/XGraphic.cpp @@ -40,10 +40,10 @@ #undef FIELD_OFFSET // prevent macro redefinition warnings #include -#include "CxbxKrnl/Emu.h" -#include "CxbxKrnl/EmuFS.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" #include "Common/Logging.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "core/HLE/D3D8/XbD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc. // ****************************************************************** diff --git a/src/core/HLE/XONLINE/XOnline.cpp b/src/core/HLE/XONLINE/XOnline.cpp index 68ed34b8c..553c87add 100644 --- a/src/core/HLE/XONLINE/XOnline.cpp +++ b/src/core/HLE/XONLINE/XOnline.cpp @@ -37,10 +37,10 @@ #define LOG_PREFIX CXBXR_MODULE::XONLINE -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #include "Common/Logging.h" -#include "CxbxKrnl/EmuFS.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuFS.h" +#include "core\kernel\support\EmuXTL.h" /* // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnl.cpp b/src/core/kernel/exports/EmuKrnl.cpp index ab0adb534..66ed3de96 100644 --- a/src/core/kernel/exports/EmuKrnl.cpp +++ b/src/core/kernel/exports/EmuKrnl.cpp @@ -53,12 +53,12 @@ namespace xboxkrnl #include "EmuKrnl.h" // for HalSystemInterrupts #include "EmuKrnlKi.h" // for KiLockDispatcherDatabase #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl\EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" + #include "core\kernel\support\EmuNtDll.h" }; // See also : diff --git a/src/core/kernel/exports/EmuKrnl.h b/src/core/kernel/exports/EmuKrnl.h index b93ba05e3..9484eae17 100644 --- a/src/core/kernel/exports/EmuKrnl.h +++ b/src/core/kernel/exports/EmuKrnl.h @@ -35,7 +35,7 @@ #define EMUKRNL_H #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl\Emu.h" +#include "core\kernel\support\Emu.h" // CONTAINING_RECORD macro // Gets the value of structure member (field - num1),given the type(MYSTRUCT, in this code) and the List_Entry head(temp, in this code) diff --git a/src/core/kernel/exports/EmuKrnlAv.cpp b/src/core/kernel/exports/EmuKrnlAv.cpp index c5658bac7..036ebc6e7 100644 --- a/src/core/kernel/exports/EmuKrnlAv.cpp +++ b/src/core/kernel/exports/EmuKrnlAv.cpp @@ -50,11 +50,11 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { -#include "CxbxKrnl\EmuNtDll.h" +#include "core\kernel\support\EmuNtDll.h" }; -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) -#include "CxbxKrnl\EmuXTL.h" +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\EmuXTL.h" #include "devices\x86\EmuX86.h" #include "EmuKrnlAvModes.h" diff --git a/src/core/kernel/exports/EmuKrnlDbg.cpp b/src/core/kernel/exports/EmuKrnlDbg.cpp index 5524f5634..5416808ad 100644 --- a/src/core/kernel/exports/EmuKrnlDbg.cpp +++ b/src/core/kernel/exports/EmuKrnlDbg.cpp @@ -50,11 +50,11 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { -#include "CxbxKrnl\EmuNtDll.h" +#include "core\kernel\support\EmuNtDll.h" }; -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) // ****************************************************************** // * 0x0005 - DbgBreakPoint() diff --git a/src/core/kernel/exports/EmuKrnlEx.cpp b/src/core/kernel/exports/EmuKrnlEx.cpp index 370c49505..8203a49ba 100644 --- a/src/core/kernel/exports/EmuKrnlEx.cpp +++ b/src/core/kernel/exports/EmuKrnlEx.cpp @@ -52,11 +52,11 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" // For NtDelayExecution(), etc. + #include "core\kernel\support\EmuNtDll.h" // For NtDelayExecution(), etc. }; #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" // For InsertHeadList, InsertTailList, RemoveHeadList #include // for std::atomic diff --git a/src/core/kernel/exports/EmuKrnlFs.cpp b/src/core/kernel/exports/EmuKrnlFs.cpp index 4ff6d8563..29a626fe7 100644 --- a/src/core/kernel/exports/EmuKrnlFs.cpp +++ b/src/core/kernel/exports/EmuKrnlFs.cpp @@ -50,10 +50,10 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { -#include "CxbxKrnl\EmuNtDll.h" +#include "core\kernel\support\EmuNtDll.h" }; -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #define FSCACHE_MAXIMUM_NUMBER_OF_CACHE_PAGES 2048 diff --git a/src/core/kernel/exports/EmuKrnlHal.cpp b/src/core/kernel/exports/EmuKrnlHal.cpp index ed979bb52..6588463b6 100644 --- a/src/core/kernel/exports/EmuKrnlHal.cpp +++ b/src/core/kernel/exports/EmuKrnlHal.cpp @@ -49,11 +49,11 @@ namespace xboxkrnl #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup, CxbxConvertArgToString, and CxbxExec -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" #include "devices\x86\EmuX86.h" // HalReadWritePciSpace needs this #include "EmuShared.h" -#include "CxbxKrnl\EmuFile.h" // For FindNtSymbolicLinkObjectByDriveLetter +#include "core\kernel\support\EmuFile.h" // For FindNtSymbolicLinkObjectByDriveLetter #include "Common\EmuEEPROM.h" // For EEPROM #include "devices\Xbox.h" // For g_SMBus, SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER #include "devices\SMCDevice.h" // For SMC_COMMAND_SCRATCH diff --git a/src/core/kernel/exports/EmuKrnlIo.cpp b/src/core/kernel/exports/EmuKrnlIo.cpp index dd06bf661..c8bc77ec9 100644 --- a/src/core/kernel/exports/EmuKrnlIo.cpp +++ b/src/core/kernel/exports/EmuKrnlIo.cpp @@ -47,8 +47,8 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) -#include "CxbxKrnl\EmuFile.h" // For CxbxCreateSymbolicLink(), etc. +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\EmuFile.h" // For CxbxCreateSymbolicLink(), etc. #include "CxbxDebugger.h" // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlKe.cpp b/src/core/kernel/exports/EmuKrnlKe.cpp index 450c3e5f7..b01605cd9 100644 --- a/src/core/kernel/exports/EmuKrnlKe.cpp +++ b/src/core/kernel/exports/EmuKrnlKe.cpp @@ -50,14 +50,14 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" // For NtDelayExecution(), etc. + #include "core\kernel\support\EmuNtDll.h" // For NtDelayExecution(), etc. }; #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuKrnlKi.h" // For KiRemoveTreeTimer(), KiInsertTreeTimer() -#include "CxbxKrnl\EmuFile.h" // For IsEmuHandle(), NtStatusToString() +#include "core\kernel\support\EmuFile.h" // For IsEmuHandle(), NtStatusToString() #include #include diff --git a/src/core/kernel/exports/EmuKrnlMm.cpp b/src/core/kernel/exports/EmuKrnlMm.cpp index 7d056ed26..654ab365a 100644 --- a/src/core/kernel/exports/EmuKrnlMm.cpp +++ b/src/core/kernel/exports/EmuKrnlMm.cpp @@ -49,7 +49,7 @@ namespace xboxkrnl #include "EmuKrnl.h" // For DefaultLaunchDataPage #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "core\kernel\memory-manager\VMManager.h" #include "EmuShared.h" #include @@ -57,7 +57,7 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" // For NtAllocateVirtualMemory(), etc. + #include "core\kernel\support\EmuNtDll.h" // For NtAllocateVirtualMemory(), etc. }; // ****************************************************************** diff --git a/src/core/kernel/exports/EmuKrnlNt.cpp b/src/core/kernel/exports/EmuKrnlNt.cpp index bddf06d5b..6eef62bd2 100644 --- a/src/core/kernel/exports/EmuKrnlNt.cpp +++ b/src/core/kernel/exports/EmuKrnlNt.cpp @@ -50,12 +50,12 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { -#include "CxbxKrnl\EmuNtDll.h" +#include "core\kernel\support\EmuNtDll.h" }; #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) -#include "CxbxKrnl\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. #include "core\kernel\memory-manager\VMManager.h" // For g_VMManager #include "CxbxDebugger.h" diff --git a/src/core/kernel/exports/EmuKrnlOb.cpp b/src/core/kernel/exports/EmuKrnlOb.cpp index 325a02727..f7461711a 100644 --- a/src/core/kernel/exports/EmuKrnlOb.cpp +++ b/src/core/kernel/exports/EmuKrnlOb.cpp @@ -48,7 +48,7 @@ namespace xboxkrnl #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup #include "EmuKrnl.h" // For OBJECT_TO_OBJECT_HEADER() -#include "CxbxKrnl\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. +#include "core\kernel\support\EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. #include #pragma warning(disable:4005) // Ignore redefined status values diff --git a/src/core/kernel/exports/EmuKrnlPs.cpp b/src/core/kernel/exports/EmuKrnlPs.cpp index 9434d9782..5d515efd1 100644 --- a/src/core/kernel/exports/EmuKrnlPs.cpp +++ b/src/core/kernel/exports/EmuKrnlPs.cpp @@ -50,14 +50,14 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnl_TLS -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) -#include "CxbxKrnl\EmuFS.h" // For EmuGenerateFS -#include "CxbxKrnl\EmuXTL.h" +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\EmuFS.h" // For EmuGenerateFS +#include "core\kernel\support\EmuXTL.h" // prevent name collisions namespace NtDll { -#include "CxbxKrnl\EmuNtDll.h" +#include "core\kernel\support\EmuNtDll.h" }; #define PSP_MAX_CREATE_THREAD_NOTIFY 16 /* TODO : Should be 8 */ diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp index 05da0b867..4ef816e76 100644 --- a/src/core/kernel/exports/EmuKrnlRtl.cpp +++ b/src/core/kernel/exports/EmuKrnlRtl.cpp @@ -51,11 +51,11 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" + #include "core\kernel\support\EmuNtDll.h" }; #include "core\kernel\init\CxbxKrnl.h" // For CxbxKrnlCleanup() -#include "CxbxKrnl\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) +#include "core\kernel\support\Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include #ifdef _WIN32 diff --git a/src/core/kernel/exports/EmuKrnlXc.cpp b/src/core/kernel/exports/EmuKrnlXc.cpp index 8dbbe454b..58806eb43 100644 --- a/src/core/kernel/exports/EmuKrnlXc.cpp +++ b/src/core/kernel/exports/EmuKrnlXc.cpp @@ -52,7 +52,7 @@ namespace xboxkrnl // prevent name collisions namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" + #include "core\kernel\support\EmuNtDll.h" }; diff --git a/src/core/kernel/exports/KernelThunk.cpp b/src/core/kernel/exports/KernelThunk.cpp index 52e03e8b8..0acc9aa3a 100644 --- a/src/core/kernel/exports/KernelThunk.cpp +++ b/src/core/kernel/exports/KernelThunk.cpp @@ -439,7 +439,7 @@ uint32 CxbxKrnl_KernelThunkTable[379] = /* prevent name collisions */ namespace NtDll { - #include "CxbxKrnl\EmuNtDll.h" + #include "core\kernel\support\EmuNtDll.h" }; // Virtual memory location of KUSER_SHARED_DATA : diff --git a/src/core/kernel/init/CxbxKrnl.cpp b/src/core/kernel/init/CxbxKrnl.cpp index 923124e8c..2866ea737 100644 --- a/src/core/kernel/init/CxbxKrnl.cpp +++ b/src/core/kernel/init/CxbxKrnl.cpp @@ -48,14 +48,14 @@ namespace xboxkrnl #include "core\kernel\init\CxbxKrnl.h" #include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable #include "CxbxVersion.h" -#include "CxbxKrnl\Emu.h" +#include "core\kernel\support\Emu.h" #include "devices\x86\EmuX86.h" -#include "CxbxKrnl\EmuFile.h" -#include "CxbxKrnl\EmuFS.h" +#include "core\kernel\support\EmuFile.h" +#include "core\kernel\support\EmuFS.h" #include "EmuEEPROM.h" // For CxbxRestoreEEPROM, EEPROM, XboxFactoryGameRegion #include "core\kernel\exports\EmuKrnl.h" #include "EmuShared.h" -#include "CxbxKrnl\EmuXTL.h" +#include "core\kernel\support\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/core/kernel/memory-manager/PhysicalMemory.h b/src/core/kernel/memory-manager/PhysicalMemory.h index 08664c162..0e1aee53b 100644 --- a/src/core/kernel/memory-manager/PhysicalMemory.h +++ b/src/core/kernel/memory-manager/PhysicalMemory.h @@ -44,7 +44,7 @@ namespace xboxkrnl #include }; -#include "CxbxKrnl\Emu.h" +#include "core\kernel\support\Emu.h" #include "core\kernel\init\CxbxKrnl.h" #include #include diff --git a/src/CxbxKrnl/Emu.cpp b/src/core/kernel/support/Emu.cpp similarity index 100% rename from src/CxbxKrnl/Emu.cpp rename to src/core/kernel/support/Emu.cpp diff --git a/src/CxbxKrnl/Emu.h b/src/core/kernel/support/Emu.h similarity index 100% rename from src/CxbxKrnl/Emu.h rename to src/core/kernel/support/Emu.h diff --git a/src/CxbxKrnl/EmuFS.cpp b/src/core/kernel/support/EmuFS.cpp similarity index 100% rename from src/CxbxKrnl/EmuFS.cpp rename to src/core/kernel/support/EmuFS.cpp diff --git a/src/CxbxKrnl/EmuFS.h b/src/core/kernel/support/EmuFS.h similarity index 100% rename from src/CxbxKrnl/EmuFS.h rename to src/core/kernel/support/EmuFS.h diff --git a/src/CxbxKrnl/EmuFile.cpp b/src/core/kernel/support/EmuFile.cpp similarity index 100% rename from src/CxbxKrnl/EmuFile.cpp rename to src/core/kernel/support/EmuFile.cpp diff --git a/src/CxbxKrnl/EmuFile.h b/src/core/kernel/support/EmuFile.h similarity index 100% rename from src/CxbxKrnl/EmuFile.h rename to src/core/kernel/support/EmuFile.h diff --git a/src/CxbxKrnl/EmuNtDll.cpp b/src/core/kernel/support/EmuNtDll.cpp similarity index 100% rename from src/CxbxKrnl/EmuNtDll.cpp rename to src/core/kernel/support/EmuNtDll.cpp diff --git a/src/CxbxKrnl/EmuNtDll.h b/src/core/kernel/support/EmuNtDll.h similarity index 100% rename from src/CxbxKrnl/EmuNtDll.h rename to src/core/kernel/support/EmuNtDll.h diff --git a/src/CxbxKrnl/EmuXTL.h b/src/core/kernel/support/EmuXTL.h similarity index 100% rename from src/CxbxKrnl/EmuXTL.h rename to src/core/kernel/support/EmuXTL.h diff --git a/src/devices/ADM1032Device.cpp b/src/devices/ADM1032Device.cpp index 1eccb122a..d34caf56b 100644 --- a/src/devices/ADM1032Device.cpp +++ b/src/devices/ADM1032Device.cpp @@ -37,7 +37,7 @@ #define LOG_PREFIX CXBXR_MODULE::ADM #include "ADM1032Device.h" -#include "..\CxbxKrnl\Emu.h" // For EmuLog +#include "core\kernel\support\Emu.h" // For EmuLog void ADM1032Device::Init() { diff --git a/src/devices/EmuNVNet.cpp b/src/devices/EmuNVNet.cpp index 51438e112..b36c6cdcb 100644 --- a/src/devices/EmuNVNet.cpp +++ b/src/devices/EmuNVNet.cpp @@ -50,7 +50,7 @@ namespace xboxkrnl }; #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl\Emu.h" +#include "core\kernel\support\Emu.h" #include "core\kernel\exports\EmuKrnl.h" #include "EmuNVNet.h" diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp index 7c164a6e7..c3b008538 100644 --- a/src/devices/video/nv2a.cpp +++ b/src/devices/video/nv2a.cpp @@ -64,8 +64,8 @@ namespace xboxkrnl #include // For __beginthreadex(), etc. #include "core\kernel\init\CxbxKrnl.h" // For XBOX_MEMORY_SIZE, DWORD, etc -#include "CxbxKrnl\Emu.h" -#include "CxbxKrnl\EmuFS.h" +#include "core\kernel\support\Emu.h" +#include "core\kernel\support\EmuFS.h" #include "core\kernel\exports\EmuKrnl.h" #include "core/HLE/Intercept.hpp" #include "Logging.h" diff --git a/src/devices/x86/EmuX86.cpp b/src/devices/x86/EmuX86.cpp index 2198f9060..a66d771eb 100644 --- a/src/devices/x86/EmuX86.cpp +++ b/src/devices/x86/EmuX86.cpp @@ -48,7 +48,7 @@ #include "mnemonics.h" #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl\Emu.h" // For EmuLog +#include "core\kernel\support\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 788d69542..e75e81c92 100644 --- a/src/gui/DbgConsole.cpp +++ b/src/gui/DbgConsole.cpp @@ -37,10 +37,10 @@ #define _XBOXKRNL_DEFEXTRN_ #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl\Emu.h" +#include "core\kernel\support\Emu.h" #include "DbgConsole.h" #include "CxbxKrnl\ResourceTracker.h" -#include "CxbxKrnl\EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include diff --git a/src/gui/DlgVideoConfig.cpp b/src/gui/DlgVideoConfig.cpp index 9ddacde9f..358f3964d 100644 --- a/src/gui/DlgVideoConfig.cpp +++ b/src/gui/DlgVideoConfig.cpp @@ -42,7 +42,7 @@ #include "DlgVideoConfig.h" #include "ResCxbx.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" /*! windows dialog procedure */ static INT_PTR CALLBACK DlgVideoConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/src/gui/DlgXboxControllerPortMapping.cpp b/src/gui/DlgXboxControllerPortMapping.cpp index d2c8c7f7d..77ca5f1fd 100644 --- a/src/gui/DlgXboxControllerPortMapping.cpp +++ b/src/gui/DlgXboxControllerPortMapping.cpp @@ -43,7 +43,7 @@ #include "../Common/Win32/XBPortMapping.h" #include "Windowsx.h" #include "ResCxbx.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" /*! windows dialog procedure */ diff --git a/src/gui/WinMain.cpp b/src/gui/WinMain.cpp index 205f05d0c..df2a28285 100644 --- a/src/gui/WinMain.cpp +++ b/src/gui/WinMain.cpp @@ -37,7 +37,7 @@ #include "WndMain.h" #include "core\kernel\init\CxbxKrnl.h" -#include "CxbxKrnl/Emu.h" +#include "core\kernel\support\Emu.h" #include "EmuShared.h" #include "Common/Settings.hpp" #include diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp index ee7e976ad..a2f481d9c 100644 --- a/src/gui/WndMain.cpp +++ b/src/gui/WndMain.cpp @@ -49,7 +49,7 @@ #include "DlgXboxControllerPortMapping.h" #include "common\xbe\XbePrinter.h" // For DumpInformation #include "EmuShared.h" -#include "CxbxKrnl/EmuXTL.h" +#include "core\kernel\support\EmuXTL.h" #include "Common/Settings.hpp" #include "core\kernel\init\CxbxKrnl.h" // For CxbxConvertArgToString and CxbxExec