This commit is contained in:
RocketRobz 2020-02-04 18:54:27 -07:00
parent cf7c367b36
commit fe37c33b29
2 changed files with 15 additions and 5 deletions

View File

@ -101,15 +101,21 @@ void getDirectoryContents (vector<DirEntry>& dirContents) {
if (!dirEntry.isDirectory) { if (!dirEntry.isDirectory) {
dirEntry.size = getFileSize(dirEntry.name.c_str()); dirEntry.size = getFileSize(dirEntry.name.c_str());
} }
dirEntry.isApp = if ((dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "nds")
((dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "nds")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "NDS") || (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "NDS")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "argv") || (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "argv")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "ARGV") || (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "ARGV")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "dsi") || (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "dsi")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "DSI") || (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "DSI"))
|| (isDSiMode() && is3DS && sdMounted && dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "firm") {
|| (isDSiMode() && is3DS && sdMounted && dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "FIRM")); dirEntry.isApp = (sdMounted || flashcardMounted);
} else if ((dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "firm")
|| (dirEntry.name.substr(dirEntry.name.find_last_of(".") + 1) == "FIRM"))
{
dirEntry.isApp = (isDSiMode() && is3DS && sdMounted);
} else {
dirEntry.isApp = false;
}
if (dirEntry.name.compare(".") != 0 && (dirEntry.isDirectory || nameEndsWith(dirEntry.name))) { if (dirEntry.name.compare(".") != 0 && (dirEntry.isDirectory || nameEndsWith(dirEntry.name))) {
dirContents.push_back (dirEntry); dirContents.push_back (dirEntry);

View File

@ -356,8 +356,12 @@ int main (void) {
#ifndef NO_SDMMC #ifndef NO_SDMMC
if (dsiSD && dsiMode) { if (dsiSD && dsiMode) {
sdmmc_controller_init(true); sdmmc_controller_init(true);
*(vu16*)(SDMMC_BASE + REG_SDDATACTL32) &= 0xFFFDu;
*(vu16*)(SDMMC_BASE + REG_SDDATACTL) &= 0xFFDDu;
*(vu16*)(SDMMC_BASE + REG_SDBLKLEN32) = 0;
} }
#endif #endif
// Pass command line arguments to loaded program // Pass command line arguments to loaded program
passArgs_ARM7(); passArgs_ARM7();