From e7ba16f0e1d3dab0db64d553a444d1e4c979b41e Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Thu, 23 Feb 2017 17:11:21 +0100 Subject: [PATCH] XAutoPowerDownResetTimer patch removed now we implement KeSetTimer --- src/CxbxKrnl/EmuXapi.cpp | 13 ------------- src/CxbxKrnl/EmuXapi.h | 4 +++- src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/CxbxKrnl/EmuXapi.cpp b/src/CxbxKrnl/EmuXapi.cpp index 121637581..3f0be7c72 100644 --- a/src/CxbxKrnl/EmuXapi.cpp +++ b/src/CxbxKrnl/EmuXapi.cpp @@ -1263,19 +1263,6 @@ DWORD WINAPI XTL::EMUPATCH(XInputGetDeviceDescription) RETURN(ERROR_NOT_SUPPORTED); // ERROR_DEVICE_NOT_CONNECTED; } -// ****************************************************************** -// * patch: XAutoPowerDownResetTimer -// ****************************************************************** -int WINAPI XTL::EMUPATCH(XAutoPowerDownResetTimer)() -{ - LOG_FUNC(); - - // Meh, that's what the 'X' is for! =] - LOG_UNIMPLEMENTED(); - - RETURN(TRUE); -} - // ****************************************************************** // * patch: XMountMURootA // ****************************************************************** diff --git a/src/CxbxKrnl/EmuXapi.h b/src/CxbxKrnl/EmuXapi.h index 80bec9b86..ac2eecc53 100644 --- a/src/CxbxKrnl/EmuXapi.h +++ b/src/CxbxKrnl/EmuXapi.h @@ -721,10 +721,12 @@ DWORD WINAPI EMUPATCH(XInputGetDeviceDescription) PVOID pDescription ); +#if 0 // Disabled, since it just calls KeSetTimer, which we support // ****************************************************************** // * patch: XAutoPowerDownResetTimer // ****************************************************************** -int WINAPI EMUPATCH(XAutoPowerDownResetTimer)(); +VOID WINAPI EMUPATCH(XAutoPowerDownResetTimer)(); +#endif // ****************************************************************** // * patch: ReadFileEx diff --git a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl index f6bfc42ce..cd9380a71 100644 --- a/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl @@ -1005,7 +1005,7 @@ OOVPATable XAPI_3911[] = { REGISTER_OOVPA(XMountMUA, 3911, PATCH), REGISTER_OOVPA(XLaunchNewImage, 3911, ALIAS, XLaunchNewImageA), REGISTER_OOVPA(XGetLaunchInfo, 3911, PATCH), - REGISTER_OOVPA(XAutoPowerDownResetTimer, 3911, PATCH), + REGISTER_OOVPA(XAutoPowerDownResetTimer, 3911, DISABLED), REGISTER_OOVPA(XMountMURootA, 3911, PATCH), REGISTER_OOVPA(XMountUtilityDrive, 3911, PATCH), // REGISTER_OOVPA(ReadFileEx, 3911, PATCH),