citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #733 from yuriks/remove-bin 

Loader: Remove .bin file support
This commit is contained in:
Lioncash 2015-05-08 22:32:06 -04:00
parent 917ac23dfc eb3eb9f75d
commit cb92817fb0
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/main.cpp
View File

@ -256,7 +256,7 @@ void GMainWindow::ShutdownGame() {
void GMainWindow::OnMenuLoadFile()
{
QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.cci *.cxi)"));
if (filename.size()) {
// Shutdown previous session if the emu thread is still active...
if (emu_thread != nullptr)

19
src/core/loader/loader.cpp
View File

@ -63,8 +63,6 @@ static FileType GuessFromExtension(const std::string& extension_) {
return FileType::CXI;
else if (extension == ".cci")
return FileType::CCI;
else if (extension == ".bin")
return FileType::BIN;
else if (extension == ".3ds")
return FileType::CCI;
else if (extension == ".3dsx")
@ -82,8 +80,6 @@ static const char* GetFileTypeString(FileType type) {
return "ELF";
case FileType::THREEDSX:
return "3DSX";
case FileType::BIN:
return "raw";
case FileType::Error:
case FileType::Unknown:
break;
@ -137,21 +133,6 @@ ResultStatus LoadFile(const std::string& filename) {
break;
}
// Raw BIN file format...
case FileType::BIN:
{
Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0);
Kernel::g_current_process->svc_access_mask.set();
Kernel::g_current_process->address_mappings = default_address_mappings;
size_t size = (size_t)file->GetSize();
if (file->ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), size) != size)
return ResultStatus::Error;
Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 0x30, Kernel::DEFAULT_STACK_SIZE);
return ResultStatus::Success;
}
// Error occurred durring IdentifyFile...
case FileType::Error:

1
src/core/loader/loader.h
View File

@ -24,7 +24,6 @@ enum class FileType {
CXI,
CIA,
ELF,
BIN,
THREEDSX, //3DSX
};