Merge branch 'official' into 3gx-loader

PabloMK7 · Mar 17, 2022 · 8ed8f86 · 8ed8f86
2 parents e30cd7e + 8038600
commit 8ed8f86
Show file tree

Hide file tree

Showing 23 changed files with 404 additions and 240 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ boot.firm:	$(SUBFOLDERS)
 	@echo built... $(notdir $@)
 
 boot.3dsx:
-	@curl -sSL "https://github.com/fincs/new-hbmenu/releases/latest/download/boot.3dsx" -o "$@"
+	@curl -sSfLO "https://github.com/fincs/new-hbmenu/releases/latest/download/$@"
 	@echo downloaded... $(notdir $@)
 
 $(SUBFOLDERS):

diff --git a/arm9/source/crypto.c b/arm9/source/crypto.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -348,7 +348,7 @@ int ctrNandInit(void)
     u8 __attribute__((aligned(4))) temp[0x200];
 
     //Read NCSD header
-    result = firmSource == FIRMWARE_SYSNAND ? sdmmc_nand_readsectors(0, 1, temp) : sdmmc_sdcard_readsectors(emuHeader, 1, temp);
+    result = firmSource == FIRMWARE_SYSNAND ? sdmmc_nand_readsectors(0, 1, temp) : sdmmc_sdcard_readsectors(emuOffset + emuHeader, 1, temp);
 
     if(!result)
     {

diff --git a/arm9/source/emunand.c b/arm9/source/emunand.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -77,15 +77,15 @@ void locateEmuNand(FirmwareSource *nandType)
             if(!sdmmc_sdcard_readsectors(nandOffset + 1, 1, temp) && memcmp(temp + 0x100, "NCSD", 4) == 0)
             {
                 emuOffset = nandOffset + 1;
-                emuHeader = nandOffset + 1;
+                emuHeader = 0;
                 return;
             }
 
             //Check for Gateway EmuNAND
             else if(i != 2 && !sdmmc_sdcard_readsectors(nandOffset + nandSize, 1, temp) && memcmp(temp + 0x100, "NCSD", 4) == 0)
             {
                 emuOffset = nandOffset;
-                emuHeader = nandOffset + nandSize;
+                emuHeader = nandSize;
                 return;
             }
         }

diff --git a/arm9/source/firm.c b/arm9/source/firm.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/arm9/source/fs.c b/arm9/source/fs.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/arm9/source/fs.h b/arm9/source/fs.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/loader/source/ifile.h b/sysmodules/loader/source/ifile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <3ds/types.h>
+#include <3ds/services/fs.h>
 
 #define PATH_MAX 255
 

diff --git a/sysmodules/loader/source/patcher.c b/sysmodules/loader/source/patcher.c
@@ -548,12 +548,14 @@ static inline bool patchLayeredFs(u64 progId, u8 *code, u32 size, u32 textSize,
 
 void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 roSize, u32 dataSize, u32 roAddress, u32 dataAddress)
 {
-    if(progId == 0x0004003000008F02LL || //USA Home Menu
-       progId == 0x0004003000008202LL || //JPN Home Menu
-       progId == 0x0004003000009802LL || //EUR Home Menu
-       progId == 0x000400300000A902LL || //KOR Home Menu
-       progId == 0x000400300000A102LL || //CHN Home Menu
-       progId == 0x000400300000B102LL) //TWN Home Menu
+    bool isHomeMenu = progId == 0x0004003000008F02LL || //USA Home Menu
+                      progId == 0x0004003000008202LL || //JPN Home Menu
+                      progId == 0x0004003000009802LL || //EUR Home Menu
+                      progId == 0x000400300000A902LL || //KOR Home Menu
+                      progId == 0x000400300000A102LL || //CHN Home Menu
+                      progId == 0x000400300000B102LL;   //TWN Home Menu
+
+    if(isHomeMenu)
     {
         bool applyRegionFreePatch = true;
 
@@ -864,7 +866,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
         if(!patcherApplyCodeBpsPatch(progId, code, size)) goto error;
         if(!applyCodeIpsPatch(progId, code, size)) goto error;
 
-        if((u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000)
+        if((u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000 || isHomeMenu)
         {
             u8 mask,
                regionId,

diff --git a/sysmodules/rosalina/include/ifile.h b/sysmodules/rosalina/include/ifile.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2022 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <3ds/types.h>
+#include <3ds/services/fs.h>
 
 #define PATH_MAX 255
 

diff --git a/sysmodules/rosalina/include/menu.h b/sysmodules/rosalina/include/menu.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/rosalina/include/menus/miscellaneous.h b/sysmodules/rosalina/include/menus/miscellaneous.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/rosalina/include/ntp.h b/sysmodules/rosalina/include/ntp.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,6 +29,6 @@
 #include <3ds/types.h>
 #include <time.h>
 
-Result ntpGetTimeStamp(time_t *outTimestamp);
-Result ntpSetTimeDate(time_t timestamp);
+Result ntpGetTimeStamp(u64 *msSince1900, u64 *samplingTick);
+Result ntpSetTimeDate(u64 msSince1900, u64 samplingTick);
 Result ntpNullifyUserTimeOffset(void); // not actually used for NTP
diff --git a/sysmodules/rosalina/include/process_patches.h b/sysmodules/rosalina/include/process_patches.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/rosalina/source/ifile.c b/sysmodules/rosalina/source/ifile.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/rosalina/source/main.c b/sysmodules/rosalina/source/main.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2021 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Luma3DS
-*   Copyright (C) 2016-2020 Aurora Wright, TuxSH
+*   Copyright (C) 2016-2022 Aurora Wright, TuxSH
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -444,6 +444,8 @@ void menuShow(Menu *root)
         }
         else if(pressed & KEY_B)
         {
+            while (nbPreviousMenus == 0 && (scanHeldKeys() & KEY_B)); // wait a bit before exiting rosalina
+
             Draw_Lock();
             Draw_ClearFramebuffer();
             Draw_FlushFramebuffer();

diff --git a/sysmodules/rosalina/source/menus.c b/sysmodules/rosalina/source/menus.c
@@ -143,7 +143,7 @@ void RosalinaMenu_ShowCredits(void)
         Draw_Lock();
         Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina -- Luma3DS credits");
 
-        u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, "Luma3DS (c) 2016-2020 AuroraWright, TuxSH") + SPACING_Y;
+        u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, "Luma3DS (c) 2016-2022 AuroraWright, TuxSH") + SPACING_Y;
 
         posY = Draw_DrawString(10, posY + SPACING_Y, COLOR_WHITE, "3DSX loading code by fincs");
         posY = Draw_DrawString(10, posY + SPACING_Y, COLOR_WHITE, "Networking code & basic GDB functionality by Stary");