From e9d2d37aaeda9e04e5f34ea4e09d6bf54382c5a1 Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Fri, 20 Oct 2023 07:25:52 +0300
Subject: [PATCH] moved controller to host

---
 CMakeLists.txt                                        | 11 +++++------
 src/Emulator/HLE/Libraries/LibPad/pad.cpp             |  2 +-
 .../{HLE/Libraries/LibPad => Host}/controller.cpp     |  0
 .../{HLE/Libraries/LibPad => Host}/controller.h       |  0
 src/emulator.cpp                                      |  2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename src/Emulator/{HLE/Libraries/LibPad => Host}/controller.cpp (100%)
 rename src/Emulator/{HLE/Libraries/LibPad => Host}/controller.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e14d6a5d..94f9fe71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,6 @@ set(USERSERVICE_SOURCES src/Emulator/HLE/Libraries/LibUserService/user_service.c
 
 set(PAD_SOURCES src/Emulator/HLE/Libraries/LibPad/pad.cpp
                 src/Emulator/HLE/Libraries/LibPad/pad.h
-                src/Emulator/HLE/Libraries/LibPad/controller.cpp
-                src/Emulator/HLE/Libraries/LibPad/controller.h
-
 )
 
 set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp
@@ -50,9 +47,10 @@ set(FILESYSTEM_SOURCES src/Emulator/HLE/Libraries/LibKernel/FileSystem/file_syst
                        src/Emulator/HLE/Libraries/LibKernel/FileSystem/file_system.h
                        src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.cpp
                        src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.h
-                       src/Emulator/HLE/Libraries/LibKernel/FileSystem/generic_file_system.h
-                       src/Emulator/HLE/Libraries/LibKernel/FileSystem/meta_file_system.h
-                       src/Emulator/HLE/Libraries/LibKernel/FileSystem/meta_file_system.cpp
+)
+
+set(HOST_SOURCES src/Emulator/Host/controller.cpp
+                 src/Emulator/Host/controller.h
 )
 
 set(UTIL_SOURCES src/Emulator/Util/singleton.h
@@ -64,6 +62,7 @@ add_executable(shadps4
     ${PAD_SOURCES}
     ${SYSTEMSERVICE_SOURCES}
     ${FILESYSTEM_SOURCES}
+    ${HOST_SOURCES}
     ${UTIL_SOURCES}
     src/main.cpp
     src/types.h
diff --git a/src/Emulator/HLE/Libraries/LibPad/pad.cpp b/src/Emulator/HLE/Libraries/LibPad/pad.cpp
index 132c0269..d09944c4 100644
--- a/src/Emulator/HLE/Libraries/LibPad/pad.cpp
+++ b/src/Emulator/HLE/Libraries/LibPad/pad.cpp
@@ -4,7 +4,7 @@
 #include <Core/PS4/HLE/Libs.h>
 
 #include "Emulator/Util/singleton.h"
-#include "controller.h"
+#include "Emulator/Host/controller.h"
 #include <debug.h>
 #include <Util/log.h>
 
diff --git a/src/Emulator/HLE/Libraries/LibPad/controller.cpp b/src/Emulator/Host/controller.cpp
similarity index 100%
rename from src/Emulator/HLE/Libraries/LibPad/controller.cpp
rename to src/Emulator/Host/controller.cpp
diff --git a/src/Emulator/HLE/Libraries/LibPad/controller.h b/src/Emulator/Host/controller.h
similarity index 100%
rename from src/Emulator/HLE/Libraries/LibPad/controller.h
rename to src/Emulator/Host/controller.h
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 8c9998d7..41925f6a 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -1,7 +1,7 @@
 #include "emulator.h"
 
 #include <Core/PS4/HLE/Graphics/graphics_render.h>
-#include <Emulator/HLE/Libraries/LibPad/controller.h>
+#include <Emulator/Host/controller.h>
 #include "Emulator/Util/singleton.h"
 #include <vulkan_util.h>