summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/common/key_map.h2
-rw-r--r--src/core/CMakeLists.txt20
-rw-r--r--src/core/hle/service/apt_u.cpp (renamed from src/core/hle/service/apt.cpp)2
-rw-r--r--src/core/hle/service/apt_u.h (renamed from src/core/hle/service/apt.h)0
-rw-r--r--src/core/hle/service/fs_user.cpp (renamed from src/core/hle/service/fs.cpp)20
-rw-r--r--src/core/hle/service/fs_user.h (renamed from src/core/hle/service/fs.h)0
-rw-r--r--src/core/hle/service/gsp_gpu.cpp (renamed from src/core/hle/service/gsp.cpp)2
-rw-r--r--src/core/hle/service/gsp_gpu.h (renamed from src/core/hle/service/gsp.h)0
-rw-r--r--src/core/hle/service/hid_user.cpp (renamed from src/core/hle/service/hid.cpp)2
-rw-r--r--src/core/hle/service/hid_user.h (renamed from src/core/hle/service/hid.h)0
-rw-r--r--src/core/hle/service/ndm_u.cpp (renamed from src/core/hle/service/ndm.cpp)2
-rw-r--r--src/core/hle/service/ndm_u.h (renamed from src/core/hle/service/ndm.h)0
-rw-r--r--src/core/hle/service/service.cpp10
-rw-r--r--src/core/hw/gpu.cpp2
-rw-r--r--src/video_core/gpu_debugger.h2
15 files changed, 40 insertions, 24 deletions
diff --git a/src/common/key_map.h b/src/common/key_map.h
index b5acfbab0..bf72362c0 100644
--- a/src/common/key_map.h
+++ b/src/common/key_map.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/hid.h"
+#include "core/hle/service/hid_user.h"
namespace KeyMap {
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index aefbe3375..947ccd788 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -30,11 +30,11 @@ set(SRCS
hle/kernel/mutex.cpp
hle/kernel/shared_memory.cpp
hle/kernel/thread.cpp
- hle/service/apt.cpp
- hle/service/fs.cpp
- hle/service/gsp.cpp
- hle/service/hid.cpp
- hle/service/ndm.cpp
+ hle/service/apt_u.cpp
+ hle/service/fs_user.cpp
+ hle/service/gsp_gpu.cpp
+ hle/service/hid_user.cpp
+ hle/service/ndm_u.cpp
hle/service/service.cpp
hle/service/srv.cpp
hle/config_mem.cpp
@@ -91,11 +91,11 @@ set(HEADERS
hle/kernel/mutex.h
hle/kernel/shared_memory.h
hle/kernel/thread.h
- hle/service/apt.h
- hle/service/fs.h
- hle/service/gsp.h
- hle/service/hid.h
- hle/service/ndm.h
+ hle/service/apt_u.h
+ hle/service/fs_user.h
+ hle/service/gsp_gpu.h
+ hle/service/hid_user.h
+ hle/service/ndm_u.h
hle/service/service.h
hle/service/srv.h
hle/config_mem.h
diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt_u.cpp
index 3753f1107..617b6add4 100644
--- a/src/core/hle/service/apt.cpp
+++ b/src/core/hle/service/apt_u.cpp
@@ -8,7 +8,7 @@
#include "core/hle/hle.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/mutex.h"
-#include "core/hle/service/apt.h"
+#include "apt_u.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace APT_U
diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt_u.h
index 5af39e085..5af39e085 100644
--- a/src/core/hle/service/apt.h
+++ b/src/core/hle/service/apt_u.h
diff --git a/src/core/hle/service/fs.cpp b/src/core/hle/service/fs_user.cpp
index 662c4f247..845c94103 100644
--- a/src/core/hle/service/fs.cpp
+++ b/src/core/hle/service/fs_user.cpp
@@ -4,7 +4,8 @@
#include "common/common.h"
-#include "core/hle/service/fs.h"
+#include "fs_user.h"
+#include "core/settings.h"
#include "core/hle/kernel/archive.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -200,6 +201,21 @@ void OpenArchive(Service::Interface* self) {
DEBUG_LOG(KERNEL, "called");
}
+/*
+* FS_User::IsSdmcDetected service function
+* Outputs:
+* 1 : Result of function, 0 on success, otherwise error code
+* 2 : Whether the Sdmc could be detected
+*/
+void IsSdmcDetected(Service::Interface* self) {
+ u32* cmd_buff = Service::GetCommandBuffer();
+
+ cmd_buff[1] = 0;
+ cmd_buff[2] = Settings::values.use_virtual_sd ? 1 : 0;
+
+ DEBUG_LOG(KERNEL, "called");
+}
+
const Interface::FunctionInfo FunctionTable[] = {
{0x000100C6, nullptr, "Dummy1"},
{0x040100C4, nullptr, "Control"},
@@ -225,7 +241,7 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x08140000, nullptr, "GetSdmcArchiveResource"},
{0x08150000, nullptr, "GetNandArchiveResource"},
{0x08160000, nullptr, "GetSdmcFatfsErro"},
- {0x08170000, nullptr, "IsSdmcDetected"},
+ {0x08170000, IsSdmcDetected, "IsSdmcDetected"},
{0x08180000, nullptr, "IsSdmcWritable"},
{0x08190042, nullptr, "GetSdmcCid"},
{0x081A0042, nullptr, "GetNandCid"},
diff --git a/src/core/hle/service/fs.h b/src/core/hle/service/fs_user.h
index 005382540..005382540 100644
--- a/src/core/hle/service/fs.h
+++ b/src/core/hle/service/fs_user.h
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp_gpu.cpp
index 614d9584d..6119e6300 100644
--- a/src/core/hle/service/gsp.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -9,7 +9,7 @@
#include "core/mem_map.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/service/gsp.h"
+#include "gsp_gpu.h"
#include "core/hw/gpu.h"
#include "video_core/gpu_debugger.h"
diff --git a/src/core/hle/service/gsp.h b/src/core/hle/service/gsp_gpu.h
index 177ce8da6..177ce8da6 100644
--- a/src/core/hle/service/gsp.h
+++ b/src/core/hle/service/gsp_gpu.h
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid_user.cpp
index ef38a5603..0eb32ba4a 100644
--- a/src/core/hle/service/hid.cpp
+++ b/src/core/hle/service/hid_user.cpp
@@ -7,7 +7,7 @@
#include "core/hle/hle.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/shared_memory.h"
-#include "core/hle/service/hid.h"
+#include "hid_user.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace HID_User
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid_user.h
index 9f6c4d5ed..9f6c4d5ed 100644
--- a/src/core/hle/service/hid.h
+++ b/src/core/hle/service/hid_user.h
diff --git a/src/core/hle/service/ndm.cpp b/src/core/hle/service/ndm_u.cpp
index f6af0a153..37c0661bf 100644
--- a/src/core/hle/service/ndm.cpp
+++ b/src/core/hle/service/ndm_u.cpp
@@ -3,7 +3,7 @@
// Refer to the license.txt file included.
#include "core/hle/hle.h"
-#include "core/hle/service/ndm.h"
+#include "ndm_u.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace NDM_U
diff --git a/src/core/hle/service/ndm.h b/src/core/hle/service/ndm_u.h
index 2ca9fcf22..2ca9fcf22 100644
--- a/src/core/hle/service/ndm.h
+++ b/src/core/hle/service/ndm_u.h
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 9eb1726aa..e9af6fdaa 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -6,11 +6,11 @@
#include "common/string_util.h"
#include "core/hle/service/service.h"
-#include "core/hle/service/apt.h"
-#include "core/hle/service/fs.h"
-#include "core/hle/service/gsp.h"
-#include "core/hle/service/hid.h"
-#include "core/hle/service/ndm.h"
+#include "core/hle/service/apt_u.h"
+#include "core/hle/service/fs_user.h"
+#include "core/hle/service/gsp_gpu.h"
+#include "core/hle/service/hid_user.h"
+#include "core/hle/service/ndm_u.h"
#include "core/hle/service/srv.h"
namespace Service {
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 14d3ee828..3ad801c63 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -9,7 +9,7 @@
#include "core/mem_map.h"
#include "core/hle/hle.h"
-#include "core/hle/service/gsp.h"
+#include "core/hle/service/gsp_gpu.h"
#include "core/hw/gpu.h"
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index 5a81fcfcb..1242eb58f 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -10,7 +10,7 @@
#include "common/log.h"
-#include "core/hle/service/gsp.h"
+#include "core/hle/service/gsp_gpu.h"
#include "command_processor.h"
#include "pica.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:14:43 +0100