Skip to content
This repository has been archived by the owner on Jul 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/LumaTeam/Luma3DS into off…
Browse files Browse the repository at this point in the history
…icial
  • Loading branch information
PabloMK7 committed Jun 17, 2023
2 parents 9e274d0 + 82d689b commit 83f0068
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion arm9/source/firm.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static inline u32 loadFirmFromStorage(FirmwareType firmType)

u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadFromStorage, bool isSafeMode)
{
u32 firmVersion,
u32 firmVersion = 0xFFFFFFFF,
firmSize;

bool ctrNandError = isSdMode && !mountFs(false, false);
Expand Down Expand Up @@ -228,6 +228,8 @@ u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadF
case 2:
firmVersion = 0x1F;
break;
default:
break;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion sysmodules/loader/source/patcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
&& CONFIG(PATCHVERSTRING))
{
static const u16 pattern[] = u"Ve";
static u16 *patch;
u16 *patch;
u32 patchSize = 0,
currentNand = BOOTCFG_NAND;

Expand Down
2 changes: 1 addition & 1 deletion sysmodules/pm/source/termination.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static void TerminateProcessOrTitleAsync(void *argdata)

ProcessData *process;
bool notify = false;
u8 variation;
u8 variation = 0;

if (args->timeout >= 0) {
assertSuccess(svcClearEvent(g_manager.allNotifiedTerminationEvent));
Expand Down

0 comments on commit 83f0068

Please sign in to comment.