diff options
| author | 2015-05-08 23:09:41 -0300 | |
|---|---|---|
| committer | 2015-05-08 23:09:41 -0300 | |
| commit | eb3eb9f75d9ed1e12bc472fdd94812e911c92927 (patch) | |
| tree | 4696b6e6ffa900c3b000868c016f859eb99e0f45 /src | |
| parent | Merge pull request #731 from yuriks/app-info (diff) | |
| download | yuzu-eb3eb9f75d9ed1e12bc472fdd94812e911c92927.tar.gz yuzu-eb3eb9f75d9ed1e12bc472fdd94812e911c92927.tar.xz yuzu-eb3eb9f75d9ed1e12bc472fdd94812e911c92927.zip | |
Loader: Remove .bin file support
It is of very limited practical utility currently, and will soon be
impossible to support due to more accurate memory map emulation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/main.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 19 | ||||
| -rw-r--r-- | src/core/loader/loader.h | 1 |
3 files changed, 1 insertions, 21 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index d15338f0d..f115c5b6a 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -256,7 +256,7 @@ void GMainWindow::ShutdownGame() { | |||
| 256 | 256 | ||
| 257 | void GMainWindow::OnMenuLoadFile() | 257 | void GMainWindow::OnMenuLoadFile() |
| 258 | { | 258 | { |
| 259 | QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)")); | 259 | QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.cci *.cxi)")); |
| 260 | if (filename.size()) { | 260 | if (filename.size()) { |
| 261 | // Shutdown previous session if the emu thread is still active... | 261 | // Shutdown previous session if the emu thread is still active... |
| 262 | if (emu_thread != nullptr) | 262 | if (emu_thread != nullptr) |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 505e2d280..4f881cf6f 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -63,8 +63,6 @@ static FileType GuessFromExtension(const std::string& extension_) { | |||
| 63 | return FileType::CXI; | 63 | return FileType::CXI; |
| 64 | else if (extension == ".cci") | 64 | else if (extension == ".cci") |
| 65 | return FileType::CCI; | 65 | return FileType::CCI; |
| 66 | else if (extension == ".bin") | ||
| 67 | return FileType::BIN; | ||
| 68 | else if (extension == ".3ds") | 66 | else if (extension == ".3ds") |
| 69 | return FileType::CCI; | 67 | return FileType::CCI; |
| 70 | else if (extension == ".3dsx") | 68 | else if (extension == ".3dsx") |
| @@ -82,8 +80,6 @@ static const char* GetFileTypeString(FileType type) { | |||
| 82 | return "ELF"; | 80 | return "ELF"; |
| 83 | case FileType::THREEDSX: | 81 | case FileType::THREEDSX: |
| 84 | return "3DSX"; | 82 | return "3DSX"; |
| 85 | case FileType::BIN: | ||
| 86 | return "raw"; | ||
| 87 | case FileType::Error: | 83 | case FileType::Error: |
| 88 | case FileType::Unknown: | 84 | case FileType::Unknown: |
| 89 | break; | 85 | break; |
| @@ -137,21 +133,6 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 137 | break; | 133 | break; |
| 138 | } | 134 | } |
| 139 | 135 | ||
| 140 | // Raw BIN file format... | ||
| 141 | case FileType::BIN: | ||
| 142 | { | ||
| 143 | Kernel::g_current_process = Kernel::Process::Create(filename_filename, 0); | ||
| 144 | Kernel::g_current_process->svc_access_mask.set(); | ||
| 145 | Kernel::g_current_process->address_mappings = default_address_mappings; | ||
| 146 | |||
| 147 | size_t size = (size_t)file->GetSize(); | ||
| 148 | if (file->ReadBytes(Memory::GetPointer(Memory::EXEFS_CODE_VADDR), size) != size) | ||
| 149 | return ResultStatus::Error; | ||
| 150 | |||
| 151 | Kernel::g_current_process->Run(Memory::EXEFS_CODE_VADDR, 0x30, Kernel::DEFAULT_STACK_SIZE); | ||
| 152 | return ResultStatus::Success; | ||
| 153 | } | ||
| 154 | |||
| 155 | // Error occurred durring IdentifyFile... | 136 | // Error occurred durring IdentifyFile... |
| 156 | case FileType::Error: | 137 | case FileType::Error: |
| 157 | 138 | ||
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index a56f67205..87e16fb98 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -24,7 +24,6 @@ enum class FileType { | |||
| 24 | CXI, | 24 | CXI, |
| 25 | CIA, | 25 | CIA, |
| 26 | ELF, | 26 | ELF, |
| 27 | BIN, | ||
| 28 | THREEDSX, //3DSX | 27 | THREEDSX, //3DSX |
| 29 | }; | 28 | }; |
| 30 | 29 | ||