From 38df9e96dd39604273a7a3508abb5e2b302b79cd Mon Sep 17 00:00:00 2001 From: Gareth Poole Date: Tue, 28 Oct 2014 23:08:37 -0400 Subject: [PATCH] Renamed souce files of services to match port names --- src/common/key_map.h | 2 +- src/core/CMakeLists.txt | 20 +++++++++---------- src/core/hle/service/{apt.cpp => apt_u.cpp} | 2 +- src/core/hle/service/{apt.h => apt_u.h} | 0 src/core/hle/service/{fs.cpp => fs_user.cpp} | 2 +- src/core/hle/service/{fs.h => fs_user.h} | 0 src/core/hle/service/{gsp.cpp => gsp_gpu.cpp} | 2 +- src/core/hle/service/{gsp.h => gsp_gpu.h} | 0 .../hle/service/{hid.cpp => hid_user.cpp} | 2 +- src/core/hle/service/{hid.h => hid_user.h} | 0 src/core/hle/service/{ndm.cpp => ndm_u.cpp} | 2 +- src/core/hle/service/{ndm.h => ndm_u.h} | 0 src/core/hle/service/service.cpp | 10 +++++----- src/core/hw/gpu.cpp | 2 +- src/video_core/gpu_debugger.h | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) rename src/core/hle/service/{apt.cpp => apt_u.cpp} (99%) rename src/core/hle/service/{apt.h => apt_u.h} (100%) rename src/core/hle/service/{fs.cpp => fs_user.cpp} (99%) rename src/core/hle/service/{fs.h => fs_user.h} (100%) rename src/core/hle/service/{gsp.cpp => gsp_gpu.cpp} (99%) rename src/core/hle/service/{gsp.h => gsp_gpu.h} (100%) rename src/core/hle/service/{hid.cpp => hid_user.cpp} (99%) rename src/core/hle/service/{hid.h => hid_user.h} (100%) rename src/core/hle/service/{ndm.cpp => ndm_u.cpp} (95%) rename src/core/hle/service/{ndm.h => ndm_u.h} (100%) 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 similarity index 99% rename from src/core/hle/service/apt.cpp rename to 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 similarity index 100% rename from src/core/hle/service/apt.h rename to src/core/hle/service/apt_u.h diff --git a/src/core/hle/service/fs.cpp b/src/core/hle/service/fs_user.cpp similarity index 99% rename from src/core/hle/service/fs.cpp rename to src/core/hle/service/fs_user.cpp index 662c4f247..012174321 100644 --- a/src/core/hle/service/fs.cpp +++ b/src/core/hle/service/fs_user.cpp @@ -4,7 +4,7 @@ #include "common/common.h" -#include "core/hle/service/fs.h" +#include "fs_user.h" #include "core/hle/kernel/archive.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/hle/service/fs.h b/src/core/hle/service/fs_user.h similarity index 100% rename from src/core/hle/service/fs.h rename to src/core/hle/service/fs_user.h diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp_gpu.cpp similarity index 99% rename from src/core/hle/service/gsp.cpp rename to 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 similarity index 100% rename from src/core/hle/service/gsp.h rename to src/core/hle/service/gsp_gpu.h diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid_user.cpp similarity index 99% rename from src/core/hle/service/hid.cpp rename to 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 similarity index 100% rename from src/core/hle/service/hid.h rename to src/core/hle/service/hid_user.h diff --git a/src/core/hle/service/ndm.cpp b/src/core/hle/service/ndm_u.cpp similarity index 95% rename from src/core/hle/service/ndm.cpp rename to 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 similarity index 100% rename from src/core/hle/service/ndm.h rename to 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 76dbe3fdc..6d05dabb0 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"