Просмотр исходного кода

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.
Yuri Kunde Schlesner 11 лет назад
Родитель
Сommit
eb3eb9f75d
3 измененных файлов с 1 добавлено и 21 удалено
  1. 1 1
      src/citra_qt/main.cpp
  2. 0 19
      src/core/loader/loader.cpp
  3. 0 1
      src/core/loader/loader.h

+ 1 - 1
src/citra_qt/main.cpp

@@ -256,7 +256,7 @@ void GMainWindow::ShutdownGame() {
 
 
 void GMainWindow::OnMenuLoadFile()
 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()) {
     if (filename.size()) {
         // Shutdown previous session if the emu thread is still active...
         // Shutdown previous session if the emu thread is still active...
         if (emu_thread != nullptr)
         if (emu_thread != nullptr)

+ 0 - 19
src/core/loader/loader.cpp

@@ -63,8 +63,6 @@ static FileType GuessFromExtension(const std::string& extension_) {
         return FileType::CXI;
         return FileType::CXI;
     else if (extension == ".cci")
     else if (extension == ".cci")
         return FileType::CCI;
         return FileType::CCI;
-    else if (extension == ".bin")
-        return FileType::BIN;
     else if (extension == ".3ds")
     else if (extension == ".3ds")
         return FileType::CCI;
         return FileType::CCI;
     else if (extension == ".3dsx")
     else if (extension == ".3dsx")
@@ -82,8 +80,6 @@ static const char* GetFileTypeString(FileType type) {
         return "ELF";
         return "ELF";
     case FileType::THREEDSX:
     case FileType::THREEDSX:
         return "3DSX";
         return "3DSX";
-    case FileType::BIN:
-        return "raw";
     case FileType::Error:
     case FileType::Error:
     case FileType::Unknown:
     case FileType::Unknown:
         break;
         break;
@@ -137,21 +133,6 @@ ResultStatus LoadFile(const std::string& filename) {
         break;
         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...
     // Error occurred durring IdentifyFile...
     case FileType::Error:
     case FileType::Error:
 
 

+ 0 - 1
src/core/loader/loader.h

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