HLE: Move kernel/archive.* to service/fs/

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

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 {
 

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"
 

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/service/fs/archive.h"
-#include "core/hle/kernel/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"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

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"

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"

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"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////