Emulator-Archive/melonds-ds
1
0
Fork 0
mirror of https://github.com/JesseTG/melonds-ds.git synced 2024-11-27 00:30:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add more firmware detection logging

Browse Source
This commit is contained in:
Jesse Talavera-Greenberg 2023-10-31 09:54:31 -04:00
parent 09212eaac7
commit 20c328c1f4
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libretro/config/constants.cpp
View File

@ -218,14 +218,25 @@ bool melonds::config::IsFirmwareImage(const retro::dirent& file, SPI_Firmware::F
retro_assert(path_is_absolute(file.path)); retro_assert(path_is_absolute(file.path));
if (!file.is_regular_file()) if (!file.is_regular_file()) {
retro::debug("{} is not a regular file, it's not firmware", file.path);
return false; return false;
}
if (find(FIRMWARE_SIZES.begin(), FIRMWARE_SIZES.end(), file.size) == FIRMWARE_SIZES.end()) if (find(FIRMWARE_SIZES.begin(), FIRMWARE_SIZES.end(), file.size) == FIRMWARE_SIZES.end()) {
retro::debug(
"{} is not a known firmware size (found {} bytes, must be one of {})",
file.path,
file.size,
fmt::join(FIRMWARE_SIZES, ", ")
);
return false; return false;
}
if (string_ends_with(file.path, ".bak")) if (string_ends_with(file.path, ".bak")) {
retro::debug("{} is a backup file, not counting it as firmware", file.path);
return false; return false;
}
RFILE* stream = filestream_open(file.path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE); RFILE* stream = filestream_open(file.path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
if (!stream) if (!stream)
@ -236,8 +247,15 @@ bool melonds::config::IsFirmwareImage(const retro::dirent& file, SPI_Firmware::F
int64_t bytesRead = filestream_read(stream, &buffer, sizeof(buffer)); int64_t bytesRead = filestream_read(stream, &buffer, sizeof(buffer));
filestream_close(stream); filestream_close(stream);
if (bytesRead < (int64_t)sizeof(buffer)) if (bytesRead < (int64_t)sizeof(buffer)) {
if (bytesRead < 0) {
retro::warn("Failed to read {}", file.path);
} else {
retro::warn("Failed to read {} (expected {} bytes, got {})", file.path, sizeof(buffer), bytesRead);
}
return false; return false;
}
SPI_Firmware::FirmwareHeader& loadedHeader = *reinterpret_cast<SPI_Firmware::FirmwareHeader*>(&buffer); SPI_Firmware::FirmwareHeader& loadedHeader = *reinterpret_cast<SPI_Firmware::FirmwareHeader*>(&buffer);