From c72ccfa6db41039ef2eb0ce118fabe1b38da841e Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 14 Dec 2014 04:32:45 -0200
Subject: [PATCH] HLE: Move kernel/archive.* to service/fs/
---
src/core/CMakeLists.txt | 8 ++++----
src/core/hle/kernel/kernel.cpp | 2 +-
src/core/hle/{kernel => service/fs}/archive.cpp | 2 +-
src/core/hle/{kernel => service/fs}/archive.h | 0
src/core/hle/service/{ => fs}/fs_user.cpp | 5 ++---
src/core/hle/service/{ => fs}/fs_user.h | 0
src/core/hle/service/service.cpp | 2 +-
src/core/loader/3dsx.cpp | 2 +-
src/core/loader/loader.cpp | 2 +-
9 files changed, 11 insertions(+), 12 deletions(-)
rename src/core/hle/{kernel => service/fs}/archive.cpp (99%)
rename src/core/hle/{kernel => service/fs}/archive.h (100%)
rename src/core/hle/service/{ => fs}/fs_user.cpp (99%)
rename src/core/hle/service/{ => fs}/fs_user.h (100%)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ab63f54dee..18a417475b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,7 +24,6 @@ set(SRCS
file_sys/directory_romfs.cpp
file_sys/directory_sdmc.cpp
hle/kernel/address_arbiter.cpp
- hle/kernel/archive.cpp
hle/kernel/event.cpp
hle/kernel/kernel.cpp
hle/kernel/mutex.cpp
@@ -40,7 +39,8 @@ set(SRCS
hle/service/csnd_snd.cpp
hle/service/dsp_dsp.cpp
hle/service/err_f.cpp
- hle/service/fs_user.cpp
+ hle/service/fs/archive.cpp
+ hle/service/fs/fs_user.cpp
hle/service/frd_u.cpp
hle/service/gsp_gpu.cpp
hle/service/hid_user.cpp
@@ -103,7 +103,6 @@ set(HEADERS
file_sys/directory_romfs.h
file_sys/directory_sdmc.h
hle/kernel/address_arbiter.h
- hle/kernel/archive.h
hle/kernel/event.h
hle/kernel/kernel.h
hle/kernel/mutex.h
@@ -120,7 +119,8 @@ set(HEADERS
hle/service/csnd_snd.h
hle/service/dsp_dsp.h
hle/service/err_f.h
- hle/service/fs_user.h
+ hle/service/fs/archive.h
+ hle/service/fs/fs_user.h
hle/service/frd_u.h
hle/service/gsp_gpu.h
hle/service/hid_user.h
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b38be0a497..95b4dfd686 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -9,7 +9,7 @@
#include "core/core.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h"
-#include "core/hle/kernel/archive.h"
+#include "core/hle/service/fs/archive.h"
namespace Kernel {
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/service/fs/archive.cpp
similarity index 99%
rename from src/core/hle/kernel/archive.cpp
rename to src/core/hle/service/fs/archive.cpp
index 0e3eb4564b..8889c63390 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -11,7 +11,7 @@
#include "core/file_sys/archive.h"
#include "core/file_sys/archive_sdmc.h"
#include "core/file_sys/directory.h"
-#include "core/hle/kernel/archive.h"
+#include "core/hle/service/fs/archive.h"
#include "core/hle/kernel/session.h"
#include "core/hle/result.h"
diff --git a/src/core/hle/kernel/archive.h b/src/core/hle/service/fs/archive.h
similarity index 100%
rename from src/core/hle/kernel/archive.h
rename to src/core/hle/service/fs/archive.h
diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
similarity index 99%
rename from src/core/hle/service/fs_user.cpp
rename to src/core/hle/service/fs/fs_user.cpp
index 672ba2475e..c61b283c92 100644
--- a/src/core/hle/service/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -5,10 +5,9 @@
#include "common/common.h"
#include "common/string_util.h"
-#include "core/hle/kernel/archive.h"
-#include "core/hle/kernel/archive.h"
+#include "core/hle/service/fs/archive.h"
#include "core/hle/result.h"
-#include "core/hle/service/fs_user.h"
+#include "core/hle/service/fs/fs_user.h"
#include "core/settings.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/fs_user.h b/src/core/hle/service/fs/fs_user.h
similarity index 100%
rename from src/core/hle/service/fs_user.h
rename to src/core/hle/service/fs/fs_user.h
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index e6973572b9..68d199accd 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -15,7 +15,7 @@
#include "core/hle/service/csnd_snd.h"
#include "core/hle/service/dsp_dsp.h"
#include "core/hle/service/err_f.h"
-#include "core/hle/service/fs_user.h"
+#include "core/hle/service/fs/fs_user.h"
#include "core/hle/service/frd_u.h"
#include "core/hle/service/gsp_gpu.h"
#include "core/hle/service/hid_user.h"
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index f48d13530a..0437e53749 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -8,7 +8,7 @@
#include "core/file_sys/archive_romfs.h"
#include "core/loader/elf.h"
#include "core/loader/ncch.h"
-#include "core/hle/kernel/archive.h"
+#include "core/hle/service/fs/archive.h"
#include "core/mem_map.h"
#include "3dsx.h"
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 3883e13071..d7786f1b2e 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -8,7 +8,7 @@
#include "core/loader/3dsx.h"
#include "core/loader/elf.h"
#include "core/loader/ncch.h"
-#include "core/hle/kernel/archive.h"
+#include "core/hle/service/fs/archive.h"
#include "core/mem_map.h"
////////////////////////////////////////////////////////////////////////////////////////////////////