From e9ffc5a5e6e421a2685c9218918b36a6e376e1a5 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Wed, 6 Jan 2021 00:38:42 -0700 Subject: [PATCH] Move IFileSystemProxy to the Sf namespace --- src/LibHac/Fs/FileSystemClient.AccessLog.cs | 2 +- src/LibHac/Fs/FileSystemClient.cs | 1 - src/LibHac/Fs/Shim/Application.cs | 1 - src/LibHac/Fs/Shim/BcatSaveData.cs | 2 +- src/LibHac/Fs/Shim/Bis.cs | 1 - src/LibHac/Fs/Shim/Content.cs | 1 - src/LibHac/Fs/Shim/ContentStorage.cs | 2 +- src/LibHac/Fs/Shim/CustomStorage.cs | 2 +- src/LibHac/Fs/Shim/ProgramIndexMapInfo.cs | 2 +- src/LibHac/Fs/Shim/RightsId.cs | 1 - src/LibHac/Fs/Shim/SaveData.cs | 2 +- src/LibHac/Fs/Shim/SystemSaveData.cs | 2 +- src/LibHac/FsSrv/{ => Sf}/IFileSystemProxy.cs | 3 +-- 13 files changed, 8 insertions(+), 14 deletions(-) rename src/LibHac/FsSrv/{ => Sf}/IFileSystemProxy.cs (99%) diff --git a/src/LibHac/Fs/FileSystemClient.AccessLog.cs b/src/LibHac/Fs/FileSystemClient.AccessLog.cs index ed596f79..1f859a96 100644 --- a/src/LibHac/Fs/FileSystemClient.AccessLog.cs +++ b/src/LibHac/Fs/FileSystemClient.AccessLog.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs.Accessors; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using LibHac.Sf; namespace LibHac.Fs diff --git a/src/LibHac/Fs/FileSystemClient.cs b/src/LibHac/Fs/FileSystemClient.cs index 32bf8285..3277886a 100644 --- a/src/LibHac/Fs/FileSystemClient.cs +++ b/src/LibHac/Fs/FileSystemClient.cs @@ -5,7 +5,6 @@ using LibHac.Common; using LibHac.Diag; using LibHac.Fs.Accessors; using LibHac.Fs.Fsa; -using LibHac.FsSrv; using LibHac.FsSrv.Sf; using LibHac.FsSystem; using LibHac.Util; diff --git a/src/LibHac/Fs/Shim/Application.cs b/src/LibHac/Fs/Shim/Application.cs index 50ceb910..b7538a48 100644 --- a/src/LibHac/Fs/Shim/Application.cs +++ b/src/LibHac/Fs/Shim/Application.cs @@ -1,7 +1,6 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; using LibHac.FsSrv.Sf; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; diff --git a/src/LibHac/Fs/Shim/BcatSaveData.cs b/src/LibHac/Fs/Shim/BcatSaveData.cs index 7a4c4d83..d19973af 100644 --- a/src/LibHac/Fs/Shim/BcatSaveData.cs +++ b/src/LibHac/Fs/Shim/BcatSaveData.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/Bis.cs b/src/LibHac/Fs/Shim/Bis.cs index 8f1f164e..d4ecf135 100644 --- a/src/LibHac/Fs/Shim/Bis.cs +++ b/src/LibHac/Fs/Shim/Bis.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; using LibHac.FsSrv.Sf; using LibHac.FsSystem; using LibHac.Util; diff --git a/src/LibHac/Fs/Shim/Content.cs b/src/LibHac/Fs/Shim/Content.cs index ffc8d290..f5418482 100644 --- a/src/LibHac/Fs/Shim/Content.cs +++ b/src/LibHac/Fs/Shim/Content.cs @@ -1,7 +1,6 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; using LibHac.FsSrv.Sf; using LibHac.Ncm; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; diff --git a/src/LibHac/Fs/Shim/ContentStorage.cs b/src/LibHac/Fs/Shim/ContentStorage.cs index 64ac316b..ebd80193 100644 --- a/src/LibHac/Fs/Shim/ContentStorage.cs +++ b/src/LibHac/Fs/Shim/ContentStorage.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using LibHac.Util; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; diff --git a/src/LibHac/Fs/Shim/CustomStorage.cs b/src/LibHac/Fs/Shim/CustomStorage.cs index 0df018ae..cd92c356 100644 --- a/src/LibHac/Fs/Shim/CustomStorage.cs +++ b/src/LibHac/Fs/Shim/CustomStorage.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/ProgramIndexMapInfo.cs b/src/LibHac/Fs/Shim/ProgramIndexMapInfo.cs index a6a4625a..43c06b14 100644 --- a/src/LibHac/Fs/Shim/ProgramIndexMapInfo.cs +++ b/src/LibHac/Fs/Shim/ProgramIndexMapInfo.cs @@ -1,6 +1,6 @@ using System; using System.Runtime.InteropServices; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using LibHac.Sf; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/RightsId.cs b/src/LibHac/Fs/Shim/RightsId.cs index 28661d59..910f7be4 100644 --- a/src/LibHac/Fs/Shim/RightsId.cs +++ b/src/LibHac/Fs/Shim/RightsId.cs @@ -1,5 +1,4 @@ using LibHac.Common; -using LibHac.FsSrv; using LibHac.FsSrv.Sf; using LibHac.Ncm; using LibHac.Spl; diff --git a/src/LibHac/Fs/Shim/SaveData.cs b/src/LibHac/Fs/Shim/SaveData.cs index 23669cb0..24f12161 100644 --- a/src/LibHac/Fs/Shim/SaveData.cs +++ b/src/LibHac/Fs/Shim/SaveData.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using LibHac.Ncm; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; diff --git a/src/LibHac/Fs/Shim/SystemSaveData.cs b/src/LibHac/Fs/Shim/SystemSaveData.cs index 2a84b973..a2481f58 100644 --- a/src/LibHac/Fs/Shim/SystemSaveData.cs +++ b/src/LibHac/Fs/Shim/SystemSaveData.cs @@ -1,6 +1,6 @@ using LibHac.Common; using LibHac.Fs.Impl; -using LibHac.FsSrv; +using LibHac.FsSrv.Sf; using LibHac.Ncm; using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; diff --git a/src/LibHac/FsSrv/IFileSystemProxy.cs b/src/LibHac/FsSrv/Sf/IFileSystemProxy.cs similarity index 99% rename from src/LibHac/FsSrv/IFileSystemProxy.cs rename to src/LibHac/FsSrv/Sf/IFileSystemProxy.cs index d05035b8..2d5aa070 100644 --- a/src/LibHac/FsSrv/IFileSystemProxy.cs +++ b/src/LibHac/FsSrv/Sf/IFileSystemProxy.cs @@ -1,5 +1,4 @@ using LibHac.Fs; -using LibHac.FsSrv.Sf; using LibHac.Ncm; using LibHac.Sf; using LibHac.Spl; @@ -7,7 +6,7 @@ using IFileSystemSf = LibHac.FsSrv.Sf.IFileSystem; using IFileSf = LibHac.FsSrv.Sf.IFile; using IStorageSf = LibHac.FsSrv.Sf.IStorage; -namespace LibHac.FsSrv +namespace LibHac.FsSrv.Sf { public interface IFileSystemProxy {