catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored libpad to new package

This commit is contained in:
georgemoralis 2023-10-31 09:01:20 +02:00
parent 93e75481c7
commit c488b7132d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -35,8 +35,8 @@ set(USERSERVICE_SOURCES src/Emulator/HLE/Libraries/LibUserService/user_service.c
src/Emulator/HLE/Libraries/LibUserService/user_service.h src/Emulator/HLE/Libraries/LibUserService/user_service.h
) )
set(PAD_SOURCES src/Emulator/HLE/Libraries/LibPad/pad.cpp set(PAD_SOURCES "src/core/hle/libraries/libpad/pad.cpp"
src/Emulator/HLE/Libraries/LibPad/pad.h "src/core/hle/libraries/libpad/pad.h"
) )
set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp

4
src/Core/PS4/HLE/Libs.cpp
View File

@ -5,7 +5,7 @@
#include "LibSceGnmDriver.h" #include "LibSceGnmDriver.h"
#include <core/PS4/HLE/Graphics/video_out.h> #include <core/PS4/HLE/Graphics/video_out.h>
#include "Emulator/HLE/Libraries/LibUserService/user_service.h" #include "Emulator/HLE/Libraries/LibUserService/user_service.h"
#include "Emulator/HLE/Libraries/LibPad/pad.h" #include "core/hle/libraries/libpad/pad.h"
#include <Emulator/HLE/Libraries/LibSystemService/system_service.h> #include <Emulator/HLE/Libraries/LibSystemService/system_service.h>
namespace HLE::Libs { namespace HLE::Libs {
@ -16,7 +16,7 @@ void Init_HLE_Libs(SymbolsResolver *sym) {
Graphics::VideoOut::videoOutRegisterLib(sym); Graphics::VideoOut::videoOutRegisterLib(sym);
LibSceGnmDriver::LibSceGnmDriver_Register(sym); LibSceGnmDriver::LibSceGnmDriver_Register(sym);
Emulator::HLE::Libraries::LibUserService::libUserService_Register(sym); Emulator::HLE::Libraries::LibUserService::libUserService_Register(sym);
Emulator::HLE::Libraries::LibPad::libPad_Register(sym); Core::Libraries::LibPad::libPad_Register(sym);
Emulator::HLE::Libraries::LibSystemService::libSystemService_Register(sym); Emulator::HLE::Libraries::LibSystemService::libSystemService_Register(sym);
} }
} // namespace HLE::Libs } // namespace HLE::Libs

2
src/Emulator/HLE/Libraries/LibPad/pad.cpp → src/core/hle/libraries/libpad/pad.cpp
View File

@ -8,7 +8,7 @@
#include <debug.h> #include <debug.h>
#include <Util/log.h> #include <Util/log.h>
namespace Emulator::HLE::Libraries::LibPad { namespace Core::Libraries::LibPad {
constexpr bool log_file_pad = true; // disable it to disable logging constexpr bool log_file_pad = true; // disable it to disable logging

2
src/Emulator/HLE/Libraries/LibPad/pad.h → src/core/hle/libraries/libpad/pad.h
View File

@ -4,7 +4,7 @@
#include "core/PS4/Loader/SymbolsResolver.h" #include "core/PS4/Loader/SymbolsResolver.h"
namespace Emulator::HLE::Libraries::LibPad { namespace Core::Libraries::LibPad {
typedef enum : u32 { typedef enum : u32 {
SCE_PAD_BUTTON_L3 = 0x00000002, SCE_PAD_BUTTON_L3 = 0x00000002,

4
src/emulator.cpp
View File

@ -7,7 +7,7 @@
#include <vulkan_util.h> #include <vulkan_util.h>
#include "core/PS4/HLE/Graphics/video_out.h" #include "core/PS4/HLE/Graphics/video_out.h"
#include "Emulator/HLE/Libraries/LibPad/pad.h" #include "core/hle/libraries/libpad/pad.h"
#include "Emulator/Util/singleton.h" #include "Emulator/Util/singleton.h"
#include "version.h" #include "version.h"
@ -302,7 +302,7 @@ void DrawBuffer(HLE::Libs::Graphics::VideoOutVulkanImage* image) {
} }
void keyboardEvent(SDL_Event* event) { void keyboardEvent(SDL_Event* event) {
using Emulator::HLE::Libraries::LibPad::ScePadButton; using Core::Libraries::LibPad::ScePadButton;
if (event->type == SDL_EVENT_KEY_DOWN || event->type == SDL_EVENT_KEY_UP) { if (event->type == SDL_EVENT_KEY_DOWN || event->type == SDL_EVENT_KEY_UP) {
u32 button = 0; u32 button = 0;