mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-11-04 07:38:47 +00:00 
			
		
		
		
	HLE: Move kernel/archive.* to service/fs/
This commit is contained in:
		
							parent
							
								
									731b31fe97
								
							
						
					
					
						commit
						c72ccfa6db
					
				
					 9 changed files with 11 additions and 12 deletions
				
			
		
							
								
								
									
										426
									
								
								src/core/hle/service/fs/archive.cpp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										426
									
								
								src/core/hle/service/fs/archive.cpp
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,426 @@
 | 
			
		|||
// Copyright 2014 Citra Emulator Project
 | 
			
		||||
// Licensed under GPLv2
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#include <map>
 | 
			
		||||
 | 
			
		||||
#include "common/common_types.h"
 | 
			
		||||
#include "common/file_util.h"
 | 
			
		||||
#include "common/math_util.h"
 | 
			
		||||
 | 
			
		||||
#include "core/file_sys/archive.h"
 | 
			
		||||
#include "core/file_sys/archive_sdmc.h"
 | 
			
		||||
#include "core/file_sys/directory.h"
 | 
			
		||||
#include "core/hle/service/fs/archive.h"
 | 
			
		||||
#include "core/hle/kernel/session.h"
 | 
			
		||||
#include "core/hle/result.h"
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Kernel namespace
 | 
			
		||||
 | 
			
		||||
namespace Kernel {
 | 
			
		||||
 | 
			
		||||
// Command to access archive file
 | 
			
		||||
enum class FileCommand : u32 {
 | 
			
		||||
    Dummy1          = 0x000100C6,
 | 
			
		||||
    Control         = 0x040100C4,
 | 
			
		||||
    OpenSubFile     = 0x08010100,
 | 
			
		||||
    Read            = 0x080200C2,
 | 
			
		||||
    Write           = 0x08030102,
 | 
			
		||||
    GetSize         = 0x08040000,
 | 
			
		||||
    SetSize         = 0x08050080,
 | 
			
		||||
    GetAttributes   = 0x08060000,
 | 
			
		||||
    SetAttributes   = 0x08070040,
 | 
			
		||||
    Close           = 0x08080000,
 | 
			
		||||
    Flush           = 0x08090000,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// Command to access directory
 | 
			
		||||
enum class DirectoryCommand : u32 {
 | 
			
		||||
    Dummy1          = 0x000100C6,
 | 
			
		||||
    Control         = 0x040100C4,
 | 
			
		||||
    Read            = 0x08010042,
 | 
			
		||||
    Close           = 0x08020000,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class Archive : public Kernel::Session {
 | 
			
		||||
public:
 | 
			
		||||
    std::string GetName() const override { return "Archive: " + name; }
 | 
			
		||||
 | 
			
		||||
    std::string name;           ///< Name of archive (optional)
 | 
			
		||||
    FileSys::Archive* backend;  ///< Archive backend interface
 | 
			
		||||
 | 
			
		||||
    ResultVal<bool> SyncRequest() override {
 | 
			
		||||
        u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
        FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
 | 
			
		||||
 | 
			
		||||
        switch (cmd) {
 | 
			
		||||
        // Read from archive...
 | 
			
		||||
        case FileCommand::Read:
 | 
			
		||||
        {
 | 
			
		||||
            u64 offset  = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
 | 
			
		||||
            u32 length  = cmd_buff[3];
 | 
			
		||||
            u32 address = cmd_buff[5];
 | 
			
		||||
 | 
			
		||||
            // Number of bytes read
 | 
			
		||||
            cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address));
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
        // Write to archive...
 | 
			
		||||
        case FileCommand::Write:
 | 
			
		||||
        {
 | 
			
		||||
            u64 offset  = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
 | 
			
		||||
            u32 length  = cmd_buff[3];
 | 
			
		||||
            u32 flush   = cmd_buff[4];
 | 
			
		||||
            u32 address = cmd_buff[6];
 | 
			
		||||
 | 
			
		||||
            // Number of bytes written
 | 
			
		||||
            cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address));
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
        case FileCommand::GetSize:
 | 
			
		||||
        {
 | 
			
		||||
            u64 filesize = (u64) backend->GetSize();
 | 
			
		||||
            cmd_buff[2]  = (u32) filesize;         // Lower word
 | 
			
		||||
            cmd_buff[3]  = (u32) (filesize >> 32); // Upper word
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
        case FileCommand::SetSize:
 | 
			
		||||
        {
 | 
			
		||||
            backend->SetSize(cmd_buff[1] | ((u64)cmd_buff[2] << 32));
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
        case FileCommand::Close:
 | 
			
		||||
        {
 | 
			
		||||
            LOG_TRACE(Service_FS, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
 | 
			
		||||
            CloseArchive(backend->GetIdCode());
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
        // Unknown command...
 | 
			
		||||
        default:
 | 
			
		||||
        {
 | 
			
		||||
            LOG_ERROR(Service_FS, "Unknown command=0x%08X", cmd);
 | 
			
		||||
            cmd_buff[0] = UnimplementedFunction(ErrorModule::FS).raw;
 | 
			
		||||
            return MakeResult<bool>(false);
 | 
			
		||||
        }
 | 
			
		||||
        }
 | 
			
		||||
        cmd_buff[1] = 0; // No error
 | 
			
		||||
        return MakeResult<bool>(false);
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class File : public Kernel::Session {
 | 
			
		||||
public:
 | 
			
		||||
    std::string GetName() const override { return "Path: " + path.DebugStr(); }
 | 
			
		||||
 | 
			
		||||
    FileSys::Path path; ///< Path of the file
 | 
			
		||||
    std::unique_ptr<FileSys::File> backend; ///< File backend interface
 | 
			
		||||
 | 
			
		||||
    ResultVal<bool> SyncRequest() override {
 | 
			
		||||
        u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
        FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
 | 
			
		||||
        switch (cmd) {
 | 
			
		||||
 | 
			
		||||
        // Read from file...
 | 
			
		||||
        case FileCommand::Read:
 | 
			
		||||
        {
 | 
			
		||||
            u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32;
 | 
			
		||||
            u32 length  = cmd_buff[3];
 | 
			
		||||
            u32 address = cmd_buff[5];
 | 
			
		||||
            LOG_TRACE(Service_FS, "Read %s %s: offset=0x%llx length=%d address=0x%x",
 | 
			
		||||
                      GetTypeName().c_str(), GetName().c_str(), offset, length, address);
 | 
			
		||||
            cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address));
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Write to file...
 | 
			
		||||
        case FileCommand::Write:
 | 
			
		||||
        {
 | 
			
		||||
            u64 offset  = cmd_buff[1] | ((u64) cmd_buff[2]) << 32;
 | 
			
		||||
            u32 length  = cmd_buff[3];
 | 
			
		||||
            u32 flush   = cmd_buff[4];
 | 
			
		||||
            u32 address = cmd_buff[6];
 | 
			
		||||
            LOG_TRACE(Service_FS, "Write %s %s: offset=0x%llx length=%d address=0x%x, flush=0x%x",
 | 
			
		||||
                      GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush);
 | 
			
		||||
            cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address));
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        case FileCommand::GetSize:
 | 
			
		||||
        {
 | 
			
		||||
            LOG_TRACE(Service_FS, "GetSize %s %s", GetTypeName().c_str(), GetName().c_str());
 | 
			
		||||
            u64 size = backend->GetSize();
 | 
			
		||||
            cmd_buff[2] = (u32)size;
 | 
			
		||||
            cmd_buff[3] = size >> 32;
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        case FileCommand::SetSize:
 | 
			
		||||
        {
 | 
			
		||||
            u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
 | 
			
		||||
            LOG_TRACE(Service_FS, "SetSize %s %s size=%llu",
 | 
			
		||||
                    GetTypeName().c_str(), GetName().c_str(), size);
 | 
			
		||||
            backend->SetSize(size);
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        case FileCommand::Close:
 | 
			
		||||
        {
 | 
			
		||||
            LOG_TRACE(Service_FS, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
 | 
			
		||||
            Kernel::g_object_pool.Destroy<File>(GetHandle());
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Unknown command...
 | 
			
		||||
        default:
 | 
			
		||||
            LOG_ERROR(Service_FS, "Unknown command=0x%08X!", cmd);
 | 
			
		||||
            ResultCode error = UnimplementedFunction(ErrorModule::FS);
 | 
			
		||||
            cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
 | 
			
		||||
            return error;
 | 
			
		||||
        }
 | 
			
		||||
        cmd_buff[1] = 0; // No error
 | 
			
		||||
        return MakeResult<bool>(false);
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class Directory : public Kernel::Session {
 | 
			
		||||
public:
 | 
			
		||||
    std::string GetName() const override { return "Directory: " + path.DebugStr(); }
 | 
			
		||||
 | 
			
		||||
    FileSys::Path path; ///< Path of the directory
 | 
			
		||||
    std::unique_ptr<FileSys::Directory> backend; ///< File backend interface
 | 
			
		||||
 | 
			
		||||
    ResultVal<bool> SyncRequest() override {
 | 
			
		||||
        u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
        DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
 | 
			
		||||
        switch (cmd) {
 | 
			
		||||
 | 
			
		||||
        // Read from directory...
 | 
			
		||||
        case DirectoryCommand::Read:
 | 
			
		||||
        {
 | 
			
		||||
            u32 count = cmd_buff[1];
 | 
			
		||||
            u32 address = cmd_buff[3];
 | 
			
		||||
            auto entries = reinterpret_cast<FileSys::Entry*>(Memory::GetPointer(address));
 | 
			
		||||
            LOG_TRACE(Service_FS, "Read %s %s: count=%d",
 | 
			
		||||
                    GetTypeName().c_str(), GetName().c_str(), count);
 | 
			
		||||
 | 
			
		||||
            // Number of entries actually read
 | 
			
		||||
            cmd_buff[2] = backend->Read(count, entries);
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        case DirectoryCommand::Close:
 | 
			
		||||
        {
 | 
			
		||||
            LOG_TRACE(Service_FS, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
 | 
			
		||||
            Kernel::g_object_pool.Destroy<Directory>(GetHandle());
 | 
			
		||||
            break;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Unknown command...
 | 
			
		||||
        default:
 | 
			
		||||
            LOG_ERROR(Service_FS, "Unknown command=0x%08X!", cmd);
 | 
			
		||||
            ResultCode error = UnimplementedFunction(ErrorModule::FS);
 | 
			
		||||
            cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
 | 
			
		||||
            return MakeResult<bool>(false);
 | 
			
		||||
        }
 | 
			
		||||
        cmd_buff[1] = 0; // No error
 | 
			
		||||
        return MakeResult<bool>(false);
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
 | 
			
		||||
std::map<FileSys::Archive::IdCode, Handle> g_archive_map; ///< Map of file archives by IdCode
 | 
			
		||||
 | 
			
		||||
ResultVal<Handle> OpenArchive(FileSys::Archive::IdCode id_code) {
 | 
			
		||||
    auto itr = g_archive_map.find(id_code);
 | 
			
		||||
    if (itr == g_archive_map.end()) {
 | 
			
		||||
        return ResultCode(ErrorDescription::NotFound, ErrorModule::FS,
 | 
			
		||||
                ErrorSummary::NotFound, ErrorLevel::Permanent);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return MakeResult<Handle>(itr->second);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode CloseArchive(FileSys::Archive::IdCode id_code) {
 | 
			
		||||
    auto itr = g_archive_map.find(id_code);
 | 
			
		||||
    if (itr == g_archive_map.end()) {
 | 
			
		||||
        LOG_ERROR(Service_FS, "Cannot close archive %d, does not exist!", (int)id_code);
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    LOG_TRACE(Service_FS, "Closed archive %d", (int) id_code);
 | 
			
		||||
    return RESULT_SUCCESS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Mounts an archive
 | 
			
		||||
 * @param archive Pointer to the archive to mount
 | 
			
		||||
 */
 | 
			
		||||
ResultCode MountArchive(Archive* archive) {
 | 
			
		||||
    FileSys::Archive::IdCode id_code = archive->backend->GetIdCode();
 | 
			
		||||
    ResultVal<Handle> archive_handle = OpenArchive(id_code);
 | 
			
		||||
    if (archive_handle.Succeeded()) {
 | 
			
		||||
        LOG_ERROR(Service_FS, "Cannot mount two archives with the same ID code! (%d)", (int) id_code);
 | 
			
		||||
        return archive_handle.Code();
 | 
			
		||||
    }
 | 
			
		||||
    g_archive_map[id_code] = archive->GetHandle();
 | 
			
		||||
    LOG_TRACE(Service_FS, "Mounted archive %s", archive->GetName().c_str());
 | 
			
		||||
    return RESULT_SUCCESS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode CreateArchive(FileSys::Archive* backend, const std::string& name) {
 | 
			
		||||
    Archive* archive = new Archive;
 | 
			
		||||
    Handle handle = Kernel::g_object_pool.Create(archive);
 | 
			
		||||
    archive->name = name;
 | 
			
		||||
    archive->backend = backend;
 | 
			
		||||
 | 
			
		||||
    ResultCode result = MountArchive(archive);
 | 
			
		||||
    if (result.IsError()) {
 | 
			
		||||
        return result;
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
    return RESULT_SUCCESS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultVal<Handle> OpenFileFromArchive(Handle archive_handle, const FileSys::Path& path, const FileSys::Mode mode) {
 | 
			
		||||
    // TODO(bunnei): Binary type files get a raw file pointer to the archive. Currently, we create
 | 
			
		||||
    // the archive file handles at app loading, and then keep them persistent throughout execution.
 | 
			
		||||
    // Archives file handles are just reused and not actually freed until emulation shut down.
 | 
			
		||||
    // Verify if real hardware works this way, or if new handles are created each time
 | 
			
		||||
    if (path.GetType() == FileSys::Binary)
 | 
			
		||||
        // TODO(bunnei): FixMe - this is a hack to compensate for an incorrect FileSys backend
 | 
			
		||||
        // design. While the functionally of this is OK, our implementation decision to separate
 | 
			
		||||
        // normal files from archive file pointers is very likely wrong.
 | 
			
		||||
        // See https://github.com/citra-emu/citra/issues/205
 | 
			
		||||
        return MakeResult<Handle>(archive_handle);
 | 
			
		||||
 | 
			
		||||
    File* file = new File;
 | 
			
		||||
    Handle handle = Kernel::g_object_pool.Create(file);
 | 
			
		||||
 | 
			
		||||
    Archive* archive = Kernel::g_object_pool.Get<Archive>(archive_handle);
 | 
			
		||||
    if (archive == nullptr) {
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    }
 | 
			
		||||
    file->path = path;
 | 
			
		||||
    file->backend = archive->backend->OpenFile(path, mode);
 | 
			
		||||
 | 
			
		||||
    if (!file->backend) {
 | 
			
		||||
        return ResultCode(ErrorDescription::NotFound, ErrorModule::FS,
 | 
			
		||||
                ErrorSummary::NotFound, ErrorLevel::Permanent);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return MakeResult<Handle>(handle);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode DeleteFileFromArchive(Handle archive_handle, const FileSys::Path& path) {
 | 
			
		||||
    Archive* archive = Kernel::g_object_pool.GetFast<Archive>(archive_handle);
 | 
			
		||||
    if (archive == nullptr)
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    if (archive->backend->DeleteFile(path))
 | 
			
		||||
        return RESULT_SUCCESS;
 | 
			
		||||
    return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
 | 
			
		||||
                      ErrorSummary::Canceled, ErrorLevel::Status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode RenameFileBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
 | 
			
		||||
                                     Handle dest_archive_handle, const FileSys::Path& dest_path) {
 | 
			
		||||
    Archive* src_archive = Kernel::g_object_pool.GetFast<Archive>(src_archive_handle);
 | 
			
		||||
    Archive* dest_archive = Kernel::g_object_pool.GetFast<Archive>(dest_archive_handle);
 | 
			
		||||
    if (src_archive == nullptr || dest_archive == nullptr)
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    if (src_archive == dest_archive) {
 | 
			
		||||
        if (src_archive->backend->RenameFile(src_path, dest_path))
 | 
			
		||||
            return RESULT_SUCCESS;
 | 
			
		||||
    } else {
 | 
			
		||||
        // TODO: Implement renaming across archives
 | 
			
		||||
        return UnimplementedFunction(ErrorModule::FS);
 | 
			
		||||
    }
 | 
			
		||||
    return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
 | 
			
		||||
                      ErrorSummary::NothingHappened, ErrorLevel::Status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode DeleteDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path) {
 | 
			
		||||
    Archive* archive = Kernel::g_object_pool.GetFast<Archive>(archive_handle);
 | 
			
		||||
    if (archive == nullptr)
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    if (archive->backend->DeleteDirectory(path))
 | 
			
		||||
        return RESULT_SUCCESS;
 | 
			
		||||
    return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
 | 
			
		||||
                      ErrorSummary::Canceled, ErrorLevel::Status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path) {
 | 
			
		||||
    Archive* archive = Kernel::g_object_pool.GetFast<Archive>(archive_handle);
 | 
			
		||||
    if (archive == nullptr)
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    if (archive->backend->CreateDirectory(path))
 | 
			
		||||
        return RESULT_SUCCESS;
 | 
			
		||||
    return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
 | 
			
		||||
                      ErrorSummary::Canceled, ErrorLevel::Status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
ResultCode RenameDirectoryBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
 | 
			
		||||
                                          Handle dest_archive_handle, const FileSys::Path& dest_path) {
 | 
			
		||||
    Archive* src_archive = Kernel::g_object_pool.GetFast<Archive>(src_archive_handle);
 | 
			
		||||
    Archive* dest_archive = Kernel::g_object_pool.GetFast<Archive>(dest_archive_handle);
 | 
			
		||||
    if (src_archive == nullptr || dest_archive == nullptr)
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    if (src_archive == dest_archive) {
 | 
			
		||||
        if (src_archive->backend->RenameDirectory(src_path, dest_path))
 | 
			
		||||
            return RESULT_SUCCESS;
 | 
			
		||||
    } else {
 | 
			
		||||
        // TODO: Implement renaming across archives
 | 
			
		||||
        return UnimplementedFunction(ErrorModule::FS);
 | 
			
		||||
    }
 | 
			
		||||
    return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
 | 
			
		||||
                      ErrorSummary::NothingHappened, ErrorLevel::Status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Open a Directory from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the Directory inside of the Archive
 | 
			
		||||
 * @return Opened Directory object
 | 
			
		||||
 */
 | 
			
		||||
ResultVal<Handle> OpenDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path) {
 | 
			
		||||
    Directory* directory = new Directory;
 | 
			
		||||
    Handle handle = Kernel::g_object_pool.Create(directory);
 | 
			
		||||
 | 
			
		||||
    Archive* archive = Kernel::g_object_pool.Get<Archive>(archive_handle);
 | 
			
		||||
    if (archive == nullptr) {
 | 
			
		||||
        return InvalidHandle(ErrorModule::FS);
 | 
			
		||||
    }
 | 
			
		||||
    directory->path = path;
 | 
			
		||||
    directory->backend = archive->backend->OpenDirectory(path);
 | 
			
		||||
 | 
			
		||||
    if (!directory->backend) {
 | 
			
		||||
        return ResultCode(ErrorDescription::NotFound, ErrorModule::FS,
 | 
			
		||||
                          ErrorSummary::NotFound, ErrorLevel::Permanent);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return MakeResult<Handle>(handle);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// Initialize archives
 | 
			
		||||
void ArchiveInit() {
 | 
			
		||||
    g_archive_map.clear();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): Add the other archive types (see here for the known types:
 | 
			
		||||
    // http://3dbrew.org/wiki/FS:OpenArchive#Archive_idcodes).  Currently the only half-finished
 | 
			
		||||
    // archive type is SDMC, so it is the only one getting exposed.
 | 
			
		||||
 | 
			
		||||
    std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX);
 | 
			
		||||
    auto archive = new FileSys::Archive_SDMC(sdmc_directory);
 | 
			
		||||
    if (archive->Initialize())
 | 
			
		||||
        CreateArchive(archive, "SDMC");
 | 
			
		||||
    else
 | 
			
		||||
        LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str());
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/// Shutdown archives
 | 
			
		||||
void ArchiveShutdown() {
 | 
			
		||||
    g_archive_map.clear();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
} // namespace Kernel
 | 
			
		||||
							
								
								
									
										107
									
								
								src/core/hle/service/fs/archive.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										107
									
								
								src/core/hle/service/fs/archive.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,107 @@
 | 
			
		|||
// Copyright 2014 Citra Emulator Project
 | 
			
		||||
// Licensed under GPLv2
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "common/common_types.h"
 | 
			
		||||
 | 
			
		||||
#include "core/file_sys/archive.h"
 | 
			
		||||
#include "core/hle/kernel/kernel.h"
 | 
			
		||||
#include "core/hle/result.h"
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Kernel namespace
 | 
			
		||||
 | 
			
		||||
namespace Kernel {
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Opens an archive
 | 
			
		||||
 * @param id_code IdCode of the archive to open
 | 
			
		||||
 * @return Handle to the opened archive
 | 
			
		||||
 */
 | 
			
		||||
ResultVal<Handle> OpenArchive(FileSys::Archive::IdCode id_code);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Closes an archive
 | 
			
		||||
 * @param id_code IdCode of the archive to open
 | 
			
		||||
 */
 | 
			
		||||
ResultCode CloseArchive(FileSys::Archive::IdCode id_code);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Creates an Archive
 | 
			
		||||
 * @param backend File system backend interface to the archive
 | 
			
		||||
 * @param name Name of Archive
 | 
			
		||||
 */
 | 
			
		||||
ResultCode CreateArchive(FileSys::Archive* backend, const std::string& name);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Open a File from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the File inside of the Archive
 | 
			
		||||
 * @param mode Mode under which to open the File
 | 
			
		||||
 * @return Handle to the opened File object
 | 
			
		||||
 */
 | 
			
		||||
ResultVal<Handle> OpenFileFromArchive(Handle archive_handle, const FileSys::Path& path, const FileSys::Mode mode);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Delete a File from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the File inside of the Archive
 | 
			
		||||
 * @return Whether deletion succeeded
 | 
			
		||||
 */
 | 
			
		||||
ResultCode DeleteFileFromArchive(Handle archive_handle, const FileSys::Path& path);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Rename a File between two Archives
 | 
			
		||||
 * @param src_archive_handle Handle to the source Archive object
 | 
			
		||||
 * @param src_path Path to the File inside of the source Archive
 | 
			
		||||
 * @param dest_archive_handle Handle to the destination Archive object
 | 
			
		||||
 * @param dest_path Path to the File inside of the destination Archive
 | 
			
		||||
 * @return Whether rename succeeded
 | 
			
		||||
 */
 | 
			
		||||
ResultCode RenameFileBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
 | 
			
		||||
                                     Handle dest_archive_handle, const FileSys::Path& dest_path);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Delete a Directory from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the Directory inside of the Archive
 | 
			
		||||
 * @return Whether deletion succeeded
 | 
			
		||||
 */
 | 
			
		||||
ResultCode DeleteDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Create a Directory from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the Directory inside of the Archive
 | 
			
		||||
 * @return Whether creation of directory succeeded
 | 
			
		||||
 */
 | 
			
		||||
ResultCode CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Rename a Directory between two Archives
 | 
			
		||||
 * @param src_archive_handle Handle to the source Archive object
 | 
			
		||||
 * @param src_path Path to the Directory inside of the source Archive
 | 
			
		||||
 * @param dest_archive_handle Handle to the destination Archive object
 | 
			
		||||
 * @param dest_path Path to the Directory inside of the destination Archive
 | 
			
		||||
 * @return Whether rename succeeded
 | 
			
		||||
 */
 | 
			
		||||
ResultCode RenameDirectoryBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
 | 
			
		||||
                                          Handle dest_archive_handle, const FileSys::Path& dest_path);
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Open a Directory from an Archive
 | 
			
		||||
 * @param archive_handle Handle to an open Archive object
 | 
			
		||||
 * @param path Path to the Directory inside of the Archive
 | 
			
		||||
 * @return Handle to the opened File object
 | 
			
		||||
 */
 | 
			
		||||
ResultVal<Handle> OpenDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path);
 | 
			
		||||
 | 
			
		||||
/// Initialize archives
 | 
			
		||||
void ArchiveInit();
 | 
			
		||||
 | 
			
		||||
/// Shutdown archives
 | 
			
		||||
void ArchiveShutdown();
 | 
			
		||||
 | 
			
		||||
} // namespace FileSys
 | 
			
		||||
							
								
								
									
										474
									
								
								src/core/hle/service/fs/fs_user.cpp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										474
									
								
								src/core/hle/service/fs/fs_user.cpp
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,474 @@
 | 
			
		|||
// Copyright 2014 Citra Emulator Project
 | 
			
		||||
// Licensed under GPLv2
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
 | 
			
		||||
#include "common/string_util.h"
 | 
			
		||||
#include "core/hle/service/fs/archive.h"
 | 
			
		||||
#include "core/hle/result.h"
 | 
			
		||||
#include "core/hle/service/fs/fs_user.h"
 | 
			
		||||
#include "core/settings.h"
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Namespace FS_User
 | 
			
		||||
 | 
			
		||||
namespace FS_User {
 | 
			
		||||
 | 
			
		||||
static void Initialize(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): check the behavior when cmd_buff[1] isn't 32, as per
 | 
			
		||||
    // http://3dbrew.org/wiki/FS:Initialize#Request
 | 
			
		||||
    cmd_buff[1] = RESULT_SUCCESS.raw;
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "called");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * FS_User::OpenFile service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      1 : Transaction
 | 
			
		||||
 *      2 : Archive handle lower word
 | 
			
		||||
 *      3 : Archive handle upper word
 | 
			
		||||
 *      4 : Low path type
 | 
			
		||||
 *      5 : Low path size
 | 
			
		||||
 *      6 : Open flags
 | 
			
		||||
 *      7 : Attributes
 | 
			
		||||
 *      8 : (LowPathSize << 14) | 2
 | 
			
		||||
 *      9 : Low path data pointer
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 *      3 : File handle
 | 
			
		||||
 */
 | 
			
		||||
static void OpenFile(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle archive_handle = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto filename_type    = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 filename_size     = cmd_buff[5];
 | 
			
		||||
    FileSys::Mode mode; mode.hex = cmd_buff[6];
 | 
			
		||||
    u32 attributes        = cmd_buff[7]; // TODO(Link Mauve): do something with those attributes.
 | 
			
		||||
    u32 filename_ptr      = cmd_buff[9];
 | 
			
		||||
    FileSys::Path file_path(filename_type, filename_size, filename_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "path=%s, mode=%d attrs=%u", file_path.DebugStr().c_str(), mode.hex, attributes);
 | 
			
		||||
 | 
			
		||||
    ResultVal<Handle> handle = Kernel::OpenFileFromArchive(archive_handle, file_path, mode);
 | 
			
		||||
    cmd_buff[1] = handle.Code().raw;
 | 
			
		||||
    if (handle.Succeeded()) {
 | 
			
		||||
        cmd_buff[3] = *handle;
 | 
			
		||||
    } else {
 | 
			
		||||
        LOG_ERROR(Service_FS, "failed to get a handle for file %s", file_path.DebugStr().c_str());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * FS_User::OpenFileDirectly service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      1 : Transaction
 | 
			
		||||
 *      2 : Archive ID
 | 
			
		||||
 *      3 : Archive low path type
 | 
			
		||||
 *      4 : Archive low path size
 | 
			
		||||
 *      5 : File low path type
 | 
			
		||||
 *      6 : File low path size
 | 
			
		||||
 *      7 : Flags
 | 
			
		||||
 *      8 : Attributes
 | 
			
		||||
 *      9 : (ArchiveLowPathSize << 14) | 0x802
 | 
			
		||||
 *      10 : Archive low path
 | 
			
		||||
 *      11 : (FileLowPathSize << 14) | 2
 | 
			
		||||
 *      12 : File low path
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 *      3 : File handle
 | 
			
		||||
 */
 | 
			
		||||
static void OpenFileDirectly(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    auto archive_id       = static_cast<FileSys::Archive::IdCode>(cmd_buff[2]);
 | 
			
		||||
    auto archivename_type = static_cast<FileSys::LowPathType>(cmd_buff[3]);
 | 
			
		||||
    u32 archivename_size  = cmd_buff[4];
 | 
			
		||||
    auto filename_type    = static_cast<FileSys::LowPathType>(cmd_buff[5]);
 | 
			
		||||
    u32 filename_size     = cmd_buff[6];
 | 
			
		||||
    FileSys::Mode mode; mode.hex = cmd_buff[7];
 | 
			
		||||
    u32 attributes        = cmd_buff[8]; // TODO(Link Mauve): do something with those attributes.
 | 
			
		||||
    u32 archivename_ptr   = cmd_buff[10];
 | 
			
		||||
    u32 filename_ptr      = cmd_buff[12];
 | 
			
		||||
    FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr);
 | 
			
		||||
    FileSys::Path file_path(filename_type, filename_size, filename_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "archive_path=%s file_path=%s, mode=%u attributes=%d",
 | 
			
		||||
              archive_path.DebugStr().c_str(), file_path.DebugStr().c_str(), mode.hex, attributes);
 | 
			
		||||
 | 
			
		||||
    if (archive_path.GetType() != FileSys::Empty) {
 | 
			
		||||
        LOG_ERROR(Service_FS, "archive LowPath type other than empty is currently unsupported");
 | 
			
		||||
        cmd_buff[1] = UnimplementedFunction(ErrorModule::FS).raw;
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): Check if we should even get a handle for the archive, and don't leak it
 | 
			
		||||
    // TODO(yuriks): Why is there all this duplicate (and seemingly useless) code up here?
 | 
			
		||||
    ResultVal<Handle> archive_handle = Kernel::OpenArchive(archive_id);
 | 
			
		||||
    cmd_buff[1] = archive_handle.Code().raw;
 | 
			
		||||
    if (archive_handle.Failed()) {
 | 
			
		||||
        LOG_ERROR(Service_FS, "failed to get a handle for archive");
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
    // cmd_buff[2] isn't used according to 3dmoo's implementation.
 | 
			
		||||
    cmd_buff[3] = *archive_handle;
 | 
			
		||||
 | 
			
		||||
    ResultVal<Handle> handle = Kernel::OpenFileFromArchive(*archive_handle, file_path, mode);
 | 
			
		||||
    cmd_buff[1] = handle.Code().raw;
 | 
			
		||||
    if (handle.Succeeded()) {
 | 
			
		||||
        cmd_buff[3] = *handle;
 | 
			
		||||
    } else {
 | 
			
		||||
        LOG_ERROR(Service_FS, "failed to get a handle for file %s", file_path.DebugStr().c_str());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * FS_User::DeleteFile service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      2 : Archive handle lower word
 | 
			
		||||
 *      3 : Archive handle upper word
 | 
			
		||||
 *      4 : File path string type
 | 
			
		||||
 *      5 : File path string size
 | 
			
		||||
 *      7 : File path string data
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 */
 | 
			
		||||
void DeleteFile(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle archive_handle = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto filename_type    = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 filename_size     = cmd_buff[5];
 | 
			
		||||
    u32 filename_ptr      = cmd_buff[7];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path file_path(filename_type, filename_size, filename_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "type=%d size=%d data=%s",
 | 
			
		||||
              filename_type, filename_size, file_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = Kernel::DeleteFileFromArchive(archive_handle, file_path).raw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * FS_User::RenameFile service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      2 : Source archive handle lower word
 | 
			
		||||
 *      3 : Source archive handle upper word
 | 
			
		||||
 *      4 : Source file path type
 | 
			
		||||
 *      5 : Source file path size
 | 
			
		||||
 *      6 : Dest archive handle lower word
 | 
			
		||||
 *      7 : Dest archive handle upper word
 | 
			
		||||
 *      8 : Dest file path type
 | 
			
		||||
 *      9 : Dest file path size
 | 
			
		||||
 *      11: Source file path string data
 | 
			
		||||
 *      13: Dest file path string
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 */
 | 
			
		||||
void RenameFile(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2] and cmd_buff[6], aka archive handle lower word, aren't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle src_archive_handle  = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto src_filename_type     = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 src_filename_size      = cmd_buff[5];
 | 
			
		||||
    Handle dest_archive_handle = static_cast<Handle>(cmd_buff[7]);
 | 
			
		||||
    auto dest_filename_type    = static_cast<FileSys::LowPathType>(cmd_buff[8]);
 | 
			
		||||
    u32 dest_filename_size     = cmd_buff[9];
 | 
			
		||||
    u32 src_filename_ptr       = cmd_buff[11];
 | 
			
		||||
    u32 dest_filename_ptr      = cmd_buff[13];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path src_file_path(src_filename_type, src_filename_size, src_filename_ptr);
 | 
			
		||||
    FileSys::Path dest_file_path(dest_filename_type, dest_filename_size, dest_filename_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "src_type=%d src_size=%d src_data=%s dest_type=%d dest_size=%d dest_data=%s",
 | 
			
		||||
              src_filename_type, src_filename_size, src_file_path.DebugStr().c_str(),
 | 
			
		||||
              dest_filename_type, dest_filename_size, dest_file_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = Kernel::RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle, dest_file_path).raw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * FS_User::DeleteDirectory service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      2 : Archive handle lower word
 | 
			
		||||
 *      3 : Archive handle upper word
 | 
			
		||||
 *      4 : Directory path string type
 | 
			
		||||
 *      5 : Directory path string size
 | 
			
		||||
 *      7 : Directory path string data
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 */
 | 
			
		||||
void DeleteDirectory(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle archive_handle = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto dirname_type     = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 dirname_size      = cmd_buff[5];
 | 
			
		||||
    u32 dirname_ptr       = cmd_buff[7];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "type=%d size=%d data=%s",
 | 
			
		||||
              dirname_type, dirname_size, dir_path.DebugStr().c_str());
 | 
			
		||||
    
 | 
			
		||||
    cmd_buff[1] = Kernel::DeleteDirectoryFromArchive(archive_handle, dir_path).raw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * FS_User::CreateDirectory service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      2 : Archive handle lower word
 | 
			
		||||
 *      3 : Archive handle upper word
 | 
			
		||||
 *      4 : Directory path string type
 | 
			
		||||
 *      5 : Directory path string size
 | 
			
		||||
 *      8 : Directory path string data
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 */
 | 
			
		||||
static void CreateDirectory(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO: cmd_buff[2], aka archive handle lower word, isn't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle archive_handle = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 dirname_size = cmd_buff[5];
 | 
			
		||||
    u32 dirname_ptr = cmd_buff[8];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = Kernel::CreateDirectoryFromArchive(archive_handle, dir_path).raw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * FS_User::RenameDirectory service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      2 : Source archive handle lower word
 | 
			
		||||
 *      3 : Source archive handle upper word
 | 
			
		||||
 *      4 : Source dir path type
 | 
			
		||||
 *      5 : Source dir path size
 | 
			
		||||
 *      6 : Dest archive handle lower word
 | 
			
		||||
 *      7 : Dest archive handle upper word
 | 
			
		||||
 *      8 : Dest dir path type
 | 
			
		||||
 *      9 : Dest dir path size
 | 
			
		||||
 *      11: Source dir path string data
 | 
			
		||||
 *      13: Dest dir path string
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 */
 | 
			
		||||
void RenameDirectory(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2] and cmd_buff[6], aka archive handle lower word, aren't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle src_archive_handle  = static_cast<Handle>(cmd_buff[3]);
 | 
			
		||||
    auto src_dirname_type      = static_cast<FileSys::LowPathType>(cmd_buff[4]);
 | 
			
		||||
    u32 src_dirname_size       = cmd_buff[5];
 | 
			
		||||
    Handle dest_archive_handle = static_cast<Handle>(cmd_buff[7]);
 | 
			
		||||
    auto dest_dirname_type     = static_cast<FileSys::LowPathType>(cmd_buff[8]);
 | 
			
		||||
    u32 dest_dirname_size      = cmd_buff[9];
 | 
			
		||||
    u32 src_dirname_ptr        = cmd_buff[11];
 | 
			
		||||
    u32 dest_dirname_ptr       = cmd_buff[13];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path src_dir_path(src_dirname_type, src_dirname_size, src_dirname_ptr);
 | 
			
		||||
    FileSys::Path dest_dir_path(dest_dirname_type, dest_dirname_size, dest_dirname_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "src_type=%d src_size=%d src_data=%s dest_type=%d dest_size=%d dest_data=%s",
 | 
			
		||||
              src_dirname_type, src_dirname_size, src_dir_path.DebugStr().c_str(),
 | 
			
		||||
              dest_dirname_type, dest_dirname_size, dest_dir_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = Kernel::RenameDirectoryBetweenArchives(src_archive_handle, src_dir_path, dest_archive_handle, dest_dir_path).raw;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void OpenDirectory(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    // TODO(Link Mauve): cmd_buff[2], aka archive handle lower word, isn't used according to
 | 
			
		||||
    // 3dmoo's or ctrulib's implementations.  Triple check if it's really the case.
 | 
			
		||||
    Handle archive_handle = static_cast<Handle>(cmd_buff[2]);
 | 
			
		||||
    auto dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[3]);
 | 
			
		||||
    u32 dirname_size = cmd_buff[4];
 | 
			
		||||
    u32 dirname_ptr = cmd_buff[6];
 | 
			
		||||
 | 
			
		||||
    FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    ResultVal<Handle> handle = Kernel::OpenDirectoryFromArchive(archive_handle, dir_path);
 | 
			
		||||
    cmd_buff[1] = handle.Code().raw;
 | 
			
		||||
    if (handle.Succeeded()) {
 | 
			
		||||
        cmd_buff[3] = *handle;
 | 
			
		||||
    } else {
 | 
			
		||||
        LOG_ERROR(Service_FS, "failed to get a handle for directory");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * FS_User::OpenArchive service function
 | 
			
		||||
 *  Inputs:
 | 
			
		||||
 *      1 : Archive ID
 | 
			
		||||
 *      2 : Archive low path type
 | 
			
		||||
 *      3 : Archive low path size
 | 
			
		||||
 *      4 : (LowPathSize << 14) | 2
 | 
			
		||||
 *      5 : Archive low path
 | 
			
		||||
 *  Outputs:
 | 
			
		||||
 *      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
 *      2 : Archive handle lower word (unused)
 | 
			
		||||
 *      3 : Archive handle upper word (same as file handle)
 | 
			
		||||
 */
 | 
			
		||||
static void OpenArchive(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    auto archive_id       = static_cast<FileSys::Archive::IdCode>(cmd_buff[1]);
 | 
			
		||||
    auto archivename_type = static_cast<FileSys::LowPathType>(cmd_buff[2]);
 | 
			
		||||
    u32 archivename_size  = cmd_buff[3];
 | 
			
		||||
    u32 archivename_ptr   = cmd_buff[5];
 | 
			
		||||
    FileSys::Path archive_path(archivename_type, archivename_size, archivename_ptr);
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "archive_path=%s", archive_path.DebugStr().c_str());
 | 
			
		||||
 | 
			
		||||
    if (archive_path.GetType() != FileSys::Empty) {
 | 
			
		||||
        LOG_ERROR(Service_FS, "archive LowPath type other than empty is currently unsupported");
 | 
			
		||||
        cmd_buff[1] = UnimplementedFunction(ErrorModule::FS).raw;
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    ResultVal<Handle> handle = Kernel::OpenArchive(archive_id);
 | 
			
		||||
    cmd_buff[1] = handle.Code().raw;
 | 
			
		||||
    if (handle.Succeeded()) {
 | 
			
		||||
        // cmd_buff[2] isn't used according to 3dmoo's implementation.
 | 
			
		||||
        cmd_buff[3] = *handle;
 | 
			
		||||
    } else {
 | 
			
		||||
        LOG_ERROR(Service_FS, "failed to get a handle for archive");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
* FS_User::IsSdmcDetected service function
 | 
			
		||||
*  Outputs:
 | 
			
		||||
*      1 : Result of function, 0 on success, otherwise error code
 | 
			
		||||
*      2 : Whether the Sdmc could be detected
 | 
			
		||||
*/
 | 
			
		||||
static void IsSdmcDetected(Service::Interface* self) {
 | 
			
		||||
    u32* cmd_buff = Kernel::GetCommandBuffer();
 | 
			
		||||
 | 
			
		||||
    cmd_buff[1] = 0;
 | 
			
		||||
    cmd_buff[2] = Settings::values.use_virtual_sd ? 1 : 0;
 | 
			
		||||
 | 
			
		||||
    LOG_DEBUG(Service_FS, "called");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const Interface::FunctionInfo FunctionTable[] = {
 | 
			
		||||
    {0x000100C6, nullptr,               "Dummy1"},
 | 
			
		||||
    {0x040100C4, nullptr,               "Control"},
 | 
			
		||||
    {0x08010002, Initialize,            "Initialize"},
 | 
			
		||||
    {0x080201C2, OpenFile,              "OpenFile"},
 | 
			
		||||
    {0x08030204, OpenFileDirectly,      "OpenFileDirectly"},
 | 
			
		||||
    {0x08040142, DeleteFile,            "DeleteFile"},
 | 
			
		||||
    {0x08050244, RenameFile,            "RenameFile"},
 | 
			
		||||
    {0x08060142, DeleteDirectory,       "DeleteDirectory"},
 | 
			
		||||
    {0x08070142, nullptr,               "DeleteDirectoryRecursively"},
 | 
			
		||||
    {0x08080202, nullptr,               "CreateFile"},
 | 
			
		||||
    {0x08090182, CreateDirectory,       "CreateDirectory"},
 | 
			
		||||
    {0x080A0244, RenameDirectory,       "RenameDirectory"},
 | 
			
		||||
    {0x080B0102, OpenDirectory,         "OpenDirectory"},
 | 
			
		||||
    {0x080C00C2, OpenArchive,           "OpenArchive"},
 | 
			
		||||
    {0x080D0144, nullptr,               "ControlArchive"},
 | 
			
		||||
    {0x080E0080, nullptr,               "CloseArchive"},
 | 
			
		||||
    {0x080F0180, nullptr,               "FormatThisUserSaveData"},
 | 
			
		||||
    {0x08100200, nullptr,               "CreateSystemSaveData"},
 | 
			
		||||
    {0x08110040, nullptr,               "DeleteSystemSaveData"},
 | 
			
		||||
    {0x08120080, nullptr,               "GetFreeBytes"},
 | 
			
		||||
    {0x08130000, nullptr,               "GetCardType"},
 | 
			
		||||
    {0x08140000, nullptr,               "GetSdmcArchiveResource"},
 | 
			
		||||
    {0x08150000, nullptr,               "GetNandArchiveResource"},
 | 
			
		||||
    {0x08160000, nullptr,               "GetSdmcFatfsErro"},
 | 
			
		||||
    {0x08170000, IsSdmcDetected,        "IsSdmcDetected"},
 | 
			
		||||
    {0x08180000, nullptr,               "IsSdmcWritable"},
 | 
			
		||||
    {0x08190042, nullptr,               "GetSdmcCid"},
 | 
			
		||||
    {0x081A0042, nullptr,               "GetNandCid"},
 | 
			
		||||
    {0x081B0000, nullptr,               "GetSdmcSpeedInfo"},
 | 
			
		||||
    {0x081C0000, nullptr,               "GetNandSpeedInfo"},
 | 
			
		||||
    {0x081D0042, nullptr,               "GetSdmcLog"},
 | 
			
		||||
    {0x081E0042, nullptr,               "GetNandLog"},
 | 
			
		||||
    {0x081F0000, nullptr,               "ClearSdmcLog"},
 | 
			
		||||
    {0x08200000, nullptr,               "ClearNandLog"},
 | 
			
		||||
    {0x08210000, nullptr,               "CardSlotIsInserted"},
 | 
			
		||||
    {0x08220000, nullptr,               "CardSlotPowerOn"},
 | 
			
		||||
    {0x08230000, nullptr,               "CardSlotPowerOff"},
 | 
			
		||||
    {0x08240000, nullptr,               "CardSlotGetCardIFPowerStatus"},
 | 
			
		||||
    {0x08250040, nullptr,               "CardNorDirectCommand"},
 | 
			
		||||
    {0x08260080, nullptr,               "CardNorDirectCommandWithAddress"},
 | 
			
		||||
    {0x08270082, nullptr,               "CardNorDirectRead"},
 | 
			
		||||
    {0x082800C2, nullptr,               "CardNorDirectReadWithAddress"},
 | 
			
		||||
    {0x08290082, nullptr,               "CardNorDirectWrite"},
 | 
			
		||||
    {0x082A00C2, nullptr,               "CardNorDirectWriteWithAddress"},
 | 
			
		||||
    {0x082B00C2, nullptr,               "CardNorDirectRead_4xIO"},
 | 
			
		||||
    {0x082C0082, nullptr,               "CardNorDirectCpuWriteWithoutVerify"},
 | 
			
		||||
    {0x082D0040, nullptr,               "CardNorDirectSectorEraseWithoutVerify"},
 | 
			
		||||
    {0x082E0040, nullptr,               "GetProductInfo"},
 | 
			
		||||
    {0x082F0040, nullptr,               "GetProgramLaunchInfo"},
 | 
			
		||||
    {0x08300182, nullptr,               "CreateExtSaveData"},
 | 
			
		||||
    {0x08310180, nullptr,               "CreateSharedExtSaveData"},
 | 
			
		||||
    {0x08320102, nullptr,               "ReadExtSaveDataIcon"},
 | 
			
		||||
    {0x08330082, nullptr,               "EnumerateExtSaveData"},
 | 
			
		||||
    {0x08340082, nullptr,               "EnumerateSharedExtSaveData"},
 | 
			
		||||
    {0x08350080, nullptr,               "DeleteExtSaveData"},
 | 
			
		||||
    {0x08360080, nullptr,               "DeleteSharedExtSaveData"},
 | 
			
		||||
    {0x08370040, nullptr,               "SetCardSpiBaudRate"},
 | 
			
		||||
    {0x08380040, nullptr,               "SetCardSpiBusMode"},
 | 
			
		||||
    {0x08390000, nullptr,               "SendInitializeInfoTo9"},
 | 
			
		||||
    {0x083A0100, nullptr,               "GetSpecialContentIndex"},
 | 
			
		||||
    {0x083B00C2, nullptr,               "GetLegacyRomHeader"},
 | 
			
		||||
    {0x083C00C2, nullptr,               "GetLegacyBannerData"},
 | 
			
		||||
    {0x083D0100, nullptr,               "CheckAuthorityToAccessExtSaveData"},
 | 
			
		||||
    {0x083E00C2, nullptr,               "QueryTotalQuotaSize"},
 | 
			
		||||
    {0x083F00C0, nullptr,               "GetExtDataBlockSize"},
 | 
			
		||||
    {0x08400040, nullptr,               "AbnegateAccessRight"},
 | 
			
		||||
    {0x08410000, nullptr,               "DeleteSdmcRoot"},
 | 
			
		||||
    {0x08420040, nullptr,               "DeleteAllExtSaveDataOnNand"},
 | 
			
		||||
    {0x08430000, nullptr,               "InitializeCtrFileSystem"},
 | 
			
		||||
    {0x08440000, nullptr,               "CreateSeed"},
 | 
			
		||||
    {0x084500C2, nullptr,               "GetFormatInfo"},
 | 
			
		||||
    {0x08460102, nullptr,               "GetLegacyRomHeader2"},
 | 
			
		||||
    {0x08470180, nullptr,               "FormatCtrCardUserSaveData"},
 | 
			
		||||
    {0x08480042, nullptr,               "GetSdmcCtrRootPath"},
 | 
			
		||||
    {0x08490040, nullptr,               "GetArchiveResource"},
 | 
			
		||||
    {0x084A0002, nullptr,               "ExportIntegrityVerificationSeed"},
 | 
			
		||||
    {0x084B0002, nullptr,               "ImportIntegrityVerificationSeed"},
 | 
			
		||||
    {0x084C0242, nullptr,               "FormatSaveData"},
 | 
			
		||||
    {0x084D0102, nullptr,               "GetLegacySubBannerData"},
 | 
			
		||||
    {0x084E0342, nullptr,               "UpdateSha256Context"},
 | 
			
		||||
    {0x084F0102, nullptr,               "ReadSpecialFile"},
 | 
			
		||||
    {0x08500040, nullptr,               "GetSpecialFileSize"},
 | 
			
		||||
    {0x08580000, nullptr,               "GetMovableSedHashedKeyYRandomData"},
 | 
			
		||||
    {0x08610042, nullptr,               "InitializeWithSdkVersion"},
 | 
			
		||||
    {0x08620040, nullptr,               "SetPriority"},
 | 
			
		||||
    {0x08630000, nullptr,               "GetPriority"},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Interface class
 | 
			
		||||
 | 
			
		||||
Interface::Interface() {
 | 
			
		||||
    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Interface::~Interface() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
} // namespace
 | 
			
		||||
							
								
								
									
										31
									
								
								src/core/hle/service/fs/fs_user.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								src/core/hle/service/fs/fs_user.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,31 @@
 | 
			
		|||
// Copyright 2014 Citra Emulator Project
 | 
			
		||||
// Licensed under GPLv2
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "core/hle/service/service.h"
 | 
			
		||||
 | 
			
		||||
////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
			
		||||
// Namespace FS_User
 | 
			
		||||
 | 
			
		||||
namespace FS_User {
 | 
			
		||||
 | 
			
		||||
/// Interface to "fs:USER" service
 | 
			
		||||
class Interface : public Service::Interface {
 | 
			
		||||
public:
 | 
			
		||||
 | 
			
		||||
    Interface();
 | 
			
		||||
 | 
			
		||||
    ~Interface();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Gets the string port name used by CTROS for the service
 | 
			
		||||
     * @return Port name of service
 | 
			
		||||
     */
 | 
			
		||||
    std::string GetPortName() const override {
 | 
			
		||||
        return "fs:USER";
 | 
			
		||||
    }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
} // namespace
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue