citra-emu
/
citra
Archived
1
0
Fork 0
Code

Kernel: Implement the Close command for Archive, File and Directory.

This commit is contained in:
Emmanuel Gil Peyrot 2014-09-14 11:52:52 +00:00
parent 99bfa4ae1f
commit 3a570a9fee
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/hle/kernel/archive.cpp
View File

@ -96,6 +96,13 @@ public:
backend->SetSize(cmd_buff[1] | ((u64)cmd_buff[2] << 32));
break;
}
case FileCommand::Close:
{
DEBUG_LOG(KERNEL, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
Kernel::g_object_pool.Destroy<Archive>(GetHandle());
CloseArchive(backend->GetIdCode());
break;
}
// Unknown command...
default:
{
@ -174,6 +181,13 @@ public:
break;
}
case FileCommand::Close:
{
DEBUG_LOG(KERNEL, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
Kernel::g_object_pool.Destroy<File>(GetHandle());
break;
}
// Unknown command...
default:
ERROR_LOG(KERNEL, "Unknown command=0x%08X!", cmd);
@ -230,6 +244,13 @@ public:
break;
}
case DirectoryCommand::Close:
{
DEBUG_LOG(KERNEL, "Close %s %s", GetTypeName().c_str(), GetName().c_str());
Kernel::g_object_pool.Destroy<Directory>(GetHandle());
break;
}
// Unknown command...
default:
ERROR_LOG(KERNEL, "Unknown command=0x%08X!", cmd);
@ -269,6 +290,21 @@ Handle OpenArchive(FileSys::Archive::IdCode id_code) {
return itr->second;
}
/**
* Closes an archive
* @param id_code IdCode of the archive to open
* @return Result of operation, 0 on success, otherwise error code
*/
Result CloseArchive(FileSys::Archive::IdCode id_code) {
if (1 != g_archive_map.erase(id_code)) {
ERROR_LOG(KERNEL, "Cannot close archive %d", (int) id_code);
return -1;
}
INFO_LOG(KERNEL, "Closed archive %d", (int) id_code);
return 0;
}
/**
* Mounts an archive
* @param archive Pointer to the archive to mount

7
src/core/hle/kernel/archive.h
View File

@ -21,6 +21,13 @@ namespace Kernel {
*/
Handle OpenArchive(FileSys::Archive::IdCode id_code);
/**
* Closes an archive
* @param id_code IdCode of the archive to open
* @return true if it worked fine
*/
Result CloseArchive(FileSys::Archive::IdCode id_code);
/**
* Creates an Archive
* @param backend File system backend interface to the archive