mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 01:53:22 +02:00
Kernel: Add a File object and a getter for it from an Archive object.
This commit is contained in:
parent
e73caaefe5
commit
19d04f3abe
@ -3,9 +3,11 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
#include "common/file_util.h"
|
||||||
#include "common/math_util.h"
|
#include "common/math_util.h"
|
||||||
|
|
||||||
#include "core/file_sys/archive.h"
|
#include "core/file_sys/archive.h"
|
||||||
|
#include "core/file_sys/archive_sdmc.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
#include "core/hle/kernel/archive.h"
|
#include "core/hle/kernel/archive.h"
|
||||||
|
|
||||||
@ -108,6 +110,83 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class File : public Object {
|
||||||
|
public:
|
||||||
|
std::string GetTypeName() const { return "File"; }
|
||||||
|
std::string GetName() const { return path; }
|
||||||
|
|
||||||
|
static Kernel::HandleType GetStaticHandleType() { return HandleType::File; }
|
||||||
|
Kernel::HandleType GetHandleType() const { return HandleType::File; }
|
||||||
|
|
||||||
|
std::string path; ///< Path of the file
|
||||||
|
std::unique_ptr<FileSys::File> backend; ///< File backend interface
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Synchronize kernel object
|
||||||
|
* @param wait Boolean wait set if current thread should wait as a result of sync operation
|
||||||
|
* @return Result of operation, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
Result SyncRequest(bool* wait) {
|
||||||
|
u32* cmd_buff = Service::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];
|
||||||
|
DEBUG_LOG(KERNEL, "Read %s %s: offset=0x%x 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];
|
||||||
|
DEBUG_LOG(KERNEL, "Write %s %s: offset=0x%x 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:
|
||||||
|
{
|
||||||
|
DEBUG_LOG(KERNEL, "GetSize %s %s", GetTypeName().c_str(), GetName().c_str());
|
||||||
|
u64 size = backend->GetSize();
|
||||||
|
cmd_buff[2] = (u32)size;
|
||||||
|
cmd_buff[3] = size >> 32;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unknown command...
|
||||||
|
default:
|
||||||
|
ERROR_LOG(KERNEL, "Unknown command=0x%08X!", cmd);
|
||||||
|
cmd_buff[1] = -1; // TODO(Link Mauve): use the correct error code for that.
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
cmd_buff[1] = 0; // No error
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wait for kernel object to synchronize
|
||||||
|
* @param wait Boolean wait set if current thread should wait as a result of sync operation
|
||||||
|
* @return Result of operation, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
Result WaitSynchronization(bool* wait) {
|
||||||
|
// TODO(bunnei): ImplementMe
|
||||||
|
ERROR_LOG(OSHLE, "(UNIMPLEMENTED)");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
std::map<FileSys::Archive::IdCode, Handle> g_archive_map; ///< Map of file archives by IdCode
|
std::map<FileSys::Archive::IdCode, Handle> g_archive_map; ///< Map of file archives by IdCode
|
||||||
@ -171,9 +250,39 @@ Handle CreateArchive(FileSys::Archive* backend, const std::string& name) {
|
|||||||
return handle;
|
return handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 Opened File object
|
||||||
|
*/
|
||||||
|
Handle OpenFileFromArchive(Handle archive_handle, const std::string& path, const FileSys::Mode mode) {
|
||||||
|
File* file = new File;
|
||||||
|
Handle handle = Kernel::g_object_pool.Create(file);
|
||||||
|
|
||||||
|
Archive* archive = Kernel::g_object_pool.GetFast<Archive>(archive_handle);
|
||||||
|
file->path = path;
|
||||||
|
file->backend = archive->backend->OpenFile(path, mode);
|
||||||
|
|
||||||
|
return handle;
|
||||||
|
}
|
||||||
|
|
||||||
/// Initialize archives
|
/// Initialize archives
|
||||||
void ArchiveInit() {
|
void ArchiveInit() {
|
||||||
g_archive_map.clear();
|
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.
|
||||||
|
|
||||||
|
// TODO(Link Mauve): don't assume the path separator is '/'.
|
||||||
|
std::string sdmc_directory = FileUtil::GetCurrentDir() + "/userdata/sdmc";
|
||||||
|
auto archive = new FileSys::Archive_SDMC(sdmc_directory);
|
||||||
|
if (archive->Initialize())
|
||||||
|
CreateArchive(archive, "SDMC");
|
||||||
|
else
|
||||||
|
ERROR_LOG(KERNEL, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shutdown archives
|
/// Shutdown archives
|
||||||
|
@ -29,6 +29,15 @@ Handle OpenArchive(FileSys::Archive::IdCode id_code);
|
|||||||
*/
|
*/
|
||||||
Handle CreateArchive(FileSys::Archive* backend, const std::string& name);
|
Handle 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 Opened File object
|
||||||
|
*/
|
||||||
|
Handle OpenFileFromArchive(Handle handle, const std::string& name, const FileSys::Mode mode);
|
||||||
|
|
||||||
/// Initialize archives
|
/// Initialize archives
|
||||||
void ArchiveInit();
|
void ArchiveInit();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user