fs.mitm: mitm StorageForBatchRead as well as previously missing FileSystem/DataStorage commands

libraries/libstratosphere/source/fs/common/fs_file_storage.cpp

@@ -58,6 +58,11 @@ namespace ams::fs {
     Result FileStorage::Flush() {
         R_RETURN(m_base_file->Flush());
     }
+    
+    Result FileStorage::SetSize(s64 size) {
+        m_size = InvalidSize;
+        R_RETURN(m_base_file->SetSize(size));
+    }
 
     Result FileStorage::GetSize(s64 *out_size) {
         R_TRY(this->UpdateSize());
@@ -65,11 +70,6 @@ namespace ams::fs {
         R_SUCCEED();
     }
 
-    Result FileStorage::SetSize(s64 size) {
-        m_size = InvalidSize;
-        R_RETURN(m_base_file->SetSize(size));
-    }
-
     Result FileStorage::OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) {
         switch (op_id) {
             case OperationId::Invalidate:
@@ -102,7 +102,7 @@ namespace ams::fs {
 
         R_SUCCEED();
     }
-
+    
     Result FileHandleStorage::UpdateSize() {
         R_SUCCEED_IF(m_size != InvalidSize);
         R_RETURN(GetFileSize(std::addressof(m_size), m_handle));
@@ -149,6 +149,11 @@ namespace ams::fs {
     Result FileHandleStorage::Flush() {
         R_RETURN(FlushFile(m_handle));
     }
+    
+    Result FileHandleStorage::SetSize(s64 size) {
+        m_size = InvalidSize;
+        R_RETURN(SetFileSize(m_handle, size));
+    }
 
     Result FileHandleStorage::GetSize(s64 *out_size) {
         R_TRY(this->UpdateSize());
@@ -156,11 +161,6 @@ namespace ams::fs {
         R_SUCCEED();
     }
 
-    Result FileHandleStorage::SetSize(s64 size) {
-        m_size = InvalidSize;
-        R_RETURN(SetFileSize(m_handle, size));
-    }
-
     Result FileHandleStorage::OperateRange(void *dst, size_t dst_size, OperationId op_id, s64 offset, s64 size, const void *src, size_t src_size) {
         AMS_UNUSED(src, src_size);
 

libraries/libstratosphere/source/fssrv/fssrv_storage_interface_adapter.cpp

@@ -30,7 +30,7 @@ namespace ams::fssrv::impl {
         }));
     }
 
-    Result StorageInterfaceAdapter::Write(s64 offset, const ams::sf::InNonSecureBuffer &buffer, s64 size)  {
+    Result StorageInterfaceAdapter::Write(s64 offset, const ams::sf::InNonSecureBuffer &buffer, s64 size) {
         /* Check pre-conditions. */
         R_UNLESS(0 <= offset,                                fs::ResultInvalidOffset());
         R_UNLESS(0 <= size,                                  fs::ResultInvalidSize());
@@ -42,16 +42,16 @@ namespace ams::fssrv::impl {
         R_RETURN(m_base_storage->Write(offset, buffer.GetPointer(), size));
     }
 
-    Result StorageInterfaceAdapter::Flush()  {
+    Result StorageInterfaceAdapter::Flush() {
         R_RETURN(m_base_storage->Flush());
     }
 
-    Result StorageInterfaceAdapter::SetSize(s64 size)  {
+    Result StorageInterfaceAdapter::SetSize(s64 size) {
         R_UNLESS(size >= 0, fs::ResultInvalidSize());
         R_RETURN(m_base_storage->SetSize(size));
     }
 
-    Result StorageInterfaceAdapter::GetSize(ams::sf::Out<s64> out)  {
+    Result StorageInterfaceAdapter::GetSize(ams::sf::Out<s64> out) {
         R_RETURN(m_base_storage->GetSize(out.GetPointer()));
     }
 
@@ -72,5 +72,11 @@ namespace ams::fssrv::impl {
 
         R_SUCCEED();
     }
+    
+    Result StorageInterfaceAdapterForBatchRead::BatchRead(const ams::sf::OutNonSecureBuffer &out0, const ams::sf::OutNonSecureBuffer &out1, const ams::sf::OutNonSecureBuffer &out2, const ams::sf::OutNonSecureBuffer &out3, const ams::sf::OutNonSecureBuffer &out4, const ams::sf::OutNonSecureBuffer &out5, const ams::sf::OutNonSecureBuffer &out6, const ams::sf::InBuffer &in)  {
+        /* TODO */
+        AMS_UNUSED(out0, out1, out2, out3, out4, out5, out6, in);
+        R_THROW(fs::ResultUnsupportedOperation());
+    }
 
 }