ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: Cleanup remaining pad stuff from merge. (#4014)

This commit is contained in:
lightningterror 2020-12-18 00:48:33 +01:00 committed by GitHub
parent ee890c508e
commit 6a7648d2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux-workflow.yml vendored
View File

@ -12,7 +12,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/LilyPad/**" - "pcsx2/PAD/Windows/**"
pull_request: pull_request:
branches: branches:
- master - master
@ -22,7 +22,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/LilyPad/**" - "pcsx2/PAD/Windows/**"
jobs: jobs:
build: build:

4
.github/workflows/macos-workflow.yml vendored
View File

@ -12,7 +12,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/LilyPad/**" - "pcsx2/PAD/Windows/**"
pull_request: pull_request:
branches: branches:
- master - master
@ -22,7 +22,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/LilyPad/**" - "pcsx2/PAD/Windows/**"
jobs: jobs:
build: build:

6
.github/workflows/windows-workflow.yml vendored
View File

@ -12,8 +12,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/onepad/**" - "pcsx2/PAD/Linux/**"
- "plugins/onepad_legacy/**"
pull_request: pull_request:
branches: branches:
- master - master
@ -23,8 +22,7 @@ on:
- .clang-format - .clang-format
- debian-packager/ - debian-packager/
- bin/PCSX2_keys.ini.default - bin/PCSX2_keys.ini.default
- "plugins/onepad/**" - "pcsx2/PAD/Linux/**"
- "plugins/onepad_legacy/**"
jobs: jobs:
build: build:

4
bin/PCSX2_keys.ini.default
View File

@ -2,14 +2,12 @@
# You should first copy PCSX2_keys.ini.default to the inis folder, then # You should first copy PCSX2_keys.ini.default to the inis folder, then
# rename it to PCSX2_keys.ini, and then edit it. # rename it to PCSX2_keys.ini, and then edit it.
# Important: keys which are defined at the input plugin (LilyPad) will override # Important: PAD bindings will override shortcuts at this file.
# shortcuts at this file.
# IMPORTANT: GSdx has fixed shortcuts. Make sure your shortcuts don't conflict. # IMPORTANT: GSdx has fixed shortcuts. Make sure your shortcuts don't conflict.
# Also, they will affect GSdx also when alt/ctrl/shift are pressed, so it's # Also, they will affect GSdx also when alt/ctrl/shift are pressed, so it's
# best to completely avoid them at this file. GSdx uses: # best to completely avoid them at this file. GSdx uses:
# F5 - Deinterlace modes # F5 - Deinterlace modes
# F7 - Internal "TV-like" shaders
# PAGE_UP - FXAA antialiasing (HW and SW) # PAGE_UP - FXAA antialiasing (HW and SW)
# PAGE_DOWN - Cycles through dither modes (HW) # PAGE_DOWN - Cycles through dither modes (HW)
# DELETE - Software Antialiasing (AA1) # DELETE - Software Antialiasing (AA1)

2
build.sh
View File

@ -107,7 +107,7 @@ run_cppcheck()
check="--enable=warning,style,missingInclude" check="--enable=warning,style,missingInclude"
for d in pcsx2 common plugins/GSdx plugins/onepad for d in pcsx2 common plugins/GSdx
do do
flat_d=$(echo $d | sed -e 's@/@_@') flat_d=$(echo $d | sed -e 's@/@_@')
log=cpp_check__${flat_d}.log log=cpp_check__${flat_d}.log

2
cmake/BuildParameters.cmake
View File

@ -47,7 +47,7 @@ option(DISABLE_SETCAP "Do not set files capabilities")
option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path") option(XDG_STD "Use XDG standard path instead of the standard PCSX2 path")
option(EXTRA_PLUGINS "Build various 'extra' plugins") option(EXTRA_PLUGINS "Build various 'extra' plugins")
option(PORTAUDIO_API "Build portaudio support on spu2x" ON) option(PORTAUDIO_API "Build portaudio support on spu2x" ON)
option(SDL2_API "Use SDL2 on spu2x and onepad (wxWidget mustn't be built with SDL1.2 support" ON) option(SDL2_API "Use SDL2 on SPU2 and PAD Linux (wxWidget mustn't be built with SDL1.2 support" ON)
option(GTK2_API "Use GTK2 api (legacy)") option(GTK2_API "Use GTK2 api (legacy)")
if(PACKAGE_MODE) if(PACKAGE_MODE)

4
debian-packager/copyright
View File

@ -8,11 +8,11 @@ Copyright:
2010-2012 Miguel Colon <debian.micove@gmail.com> 2010-2012 Miguel Colon <debian.micove@gmail.com>
License: LGPL-3 License: LGPL-3
Files: pcsx2/* common/* plugins/PadNull/Pad* plugins/GSnull/* Files: pcsx2/* common/* plugins/GSnull/*
Copyright: 2002-2012 PCSX2 Dev Team Copyright: 2002-2012 PCSX2 Dev Team
License: LGPL-3+ License: LGPL-3+
Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* plugins/onepad/* plugins/PadNull/Linux/* plugins/SPU2null/* plugins/GSnull/Registers.h plugins/GSnull/Linux/Linux* plugins/GSnull/Linux/Config* Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* plugins/GSnull/Registers.h plugins/GSnull/Linux/Linux* plugins/GSnull/Linux/Config*
Copyright: 2002-2012 PCSX2 Dev Team Copyright: 2002-2012 PCSX2 Dev Team
License: GPL-2+ License: GPL-2+

2
linux_various/pre-commit
View File

@ -28,7 +28,7 @@ PARSE_EXTS=true
# file types to parse. Only effective when PARSE_EXTS is true. # file types to parse. Only effective when PARSE_EXTS is true.
FILE_EXTS=".c .h .cpp .hpp .inl" FILE_EXTS=".c .h .cpp .hpp .inl"
ALLOWED_ROOT_DIR="./plugins/GSnull ./plugins/PadNull ./plugins/LilyPad/ ./plugins/onepad/ ./common" ALLOWED_ROOT_DIR="./plugins/GSnull ./common"
################################################################## ##################################################################
# There should be no need to change anything below this line. # There should be no need to change anything below this line.

1
nsis/pcsx2_shared_init.nsi
View File

@ -87,7 +87,6 @@ Function TempFilesOut
File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll
File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll
File /nonfatal ..\bin\Plugins\lilypad.dll
SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs" SetOutPath "$TEMP\PCSX2 ${APP_VERSION}\Langs"
File /nonfatal /r ..\bin\Langs\*.mo File /nonfatal /r ..\bin\Langs\*.mo

4
pcsx2/Recording/InputRecording.h
View File

@ -102,10 +102,10 @@ private:
static const int CONTROLLER_PORT_TWO = 1; static const int CONTROLLER_PORT_TWO = 1;
// 0x42 is the magic number to indicate the default controller read query // 0x42 is the magic number to indicate the default controller read query
// See - Lilypad.cpp::PADpoll - https://github.com/PCSX2/pcsx2/blob/v1.5.0-dev/plugins/LilyPad/LilyPad.cpp#L1193 // See - PAD.cpp::PADpoll - https://github.com/PCSX2/pcsx2/blob/master/pcsx2/PAD/Windows/PAD.cpp#L1255
static const u8 READ_DATA_AND_VIBRATE_FIRST_BYTE = 0x42; static const u8 READ_DATA_AND_VIBRATE_FIRST_BYTE = 0x42;
// 0x5A is always the second byte in the buffer when the normal READ_DATA_AND_VIBRATE (0x42) query is executed. // 0x5A is always the second byte in the buffer when the normal READ_DATA_AND_VIBRATE (0x42) query is executed.
// See - LilyPad.cpp::PADpoll - https://github.com/PCSX2/pcsx2/blob/v1.5.0-dev/plugins/LilyPad/LilyPad.cpp#L1194 // See - PAD.cpp::PADpoll - https://github.com/PCSX2/pcsx2/blob/master/pcsx2/PAD/Windows/PAD.cpp#L1256
static const u8 READ_DATA_AND_VIBRATE_SECOND_BYTE = 0x5A; static const u8 READ_DATA_AND_VIBRATE_SECOND_BYTE = 0x5A;
// DEPRECATED: Slated for removal // DEPRECATED: Slated for removal

2
pcsx2/USB/usb-pad/raw/raw-config.cpp
View File

@ -515,7 +515,7 @@ namespace usb_pad
mapping->devName = devName; mapping->devName = devName;
mapping->hidPath = devName; mapping->hidPath = devName;
} }
//TODO get real dev name, probably from registry (see lilypad) //TODO get real dev name, probably from registry (see PAD Windows)
if (!mapping->devName.length()) if (!mapping->devName.length())
mapping->devName = devName; mapping->devName = devName;

6
pcsx2/gui/AppInit.cpp
View File

@ -649,12 +649,6 @@ void Pcsx2App::CleanupOnExit()
Console.Indent().Error(ex.FormatDiagnosticMessage()); Console.Indent().Error(ex.FormatDiagnosticMessage());
} }
// Notice: deleting the plugin manager (unloading plugins) here causes Lilypad to crash,
// likely due to some pending message in the queue that references lilypad procs.
// We don't need to unload plugins anyway tho -- shutdown is plenty safe enough for
// closing out all the windows. So just leave it be and let the plugins get unloaded
// during the wxApp destructor. -- air
// FIXME: performing a wxYield() here may fix that problem. -- air // FIXME: performing a wxYield() here may fix that problem. -- air
pxDoAssert = pxAssertImpl_LogIt; pxDoAssert = pxAssertImpl_LogIt;

11
pcsx2/gui/GlobalCommands.cpp
View File

@ -321,8 +321,6 @@ namespace Implementations
// the content stays on screen. Try to prevent that by first exiting fullscreen, // the content stays on screen. Try to prevent that by first exiting fullscreen,
// but don't update the internal PCSX2 state/config, and PCSX2 will restore // but don't update the internal PCSX2 state/config, and PCSX2 will restore
// fullscreen correctly when emulation resumes according to its state/config. // fullscreen correctly when emulation resumes according to its state/config.
// This is similar to what LilyPad's "Safe fullscreen exit on escape" hack does,
// and thus hopefully makes LilyPad's hack redundant.
gsframe->ShowFullScreen(false, false); gsframe->ShowFullScreen(false, false);
} }
@ -352,11 +350,10 @@ namespace Implementations
{ {
// aborting suspend request // aborting suspend request
// Note: if we didn't want to suspend emulation for this confirmation dialog, // Note: if we didn't want to suspend emulation for this confirmation dialog,
// and if LilyPad has "Safe fullscreen exit on ESC", then pressing ESC would // then pressing ESC would have exited fullscreen without PCSX2 knowing about it,
// have exited fullscreen without PCSX2 knowing about it, and since it's not // and since it's not suspended it would not re-init the fullscreen state if the
// suspended it would not re-init the fullscreen state if the confirmation is // confirmation is aborted. On such case we'd have needed to set the gsframe
// aborted. On such case we'd have needed to set the gsframe fullscreen mode // fullscreen mode here according to g_Conf->GSWindow.IsFullscreen
// here according to g_Conf->GSWindow.IsFullscreen
CoreThread.Resume(); CoreThread.Resume();
return; return;
} }