Merge master into local branch

.github/ISSUE_TEMPLATE.md

@@ -26,7 +26,7 @@
 
 **Luma3DS version:**
 
-[e.g. 7.1 stable or if using nightly/hourly specify the commit like this https://github.com/AuroraWright/Luma3DS/commit/9570e6cbeca53128433abbf5e3473cb8a07fe69e]
+[e.g. 8.1 stable or if using nightly/hourly specify the commit like this https://github.com/AuroraWright/Luma3DS/commit/9570e6cbeca53128433abbf5e3473cb8a07fe69e]
 <!--You can check which version you're on in System Settings. It will be on the bottom right of the top screen.-->
 
 

k11_extension/include/svc/SetWifiEnabled.h

@@ -30,4 +30,4 @@
 #include "kernel.h"
 #include "svc.h"
 
-void SetWifiEnabled(bool enable);
+Result SetWifiEnabled(bool enable);

k11_extension/source/svc/SetWifiEnabled.c

@@ -26,10 +26,12 @@
 
 #include "svc/SetWifiEnabled.h"
 
-void SetWifiEnabled(bool enable)
+Result SetWifiEnabled(bool enable)
 {
     if(enable)
         CFG11_WIFICNT |= 1;
     else
         CFG11_WIFICNT &= ~1;
+
+    return 0;
 }

sysmodules/loader/patches/romfsredir.s

@@ -74,10 +74,10 @@ _start:
             ; Skip a slash if there are two after the mountpoint,
             ; as some games mistakenly have those
             ldrh    r3, [r1, #2]
-            cmp r3, #0x2F ; '/'
+            cmp     r3, #0x2F ; '/'
             pathRedir_3:
                 ldrh    r2, [r1], #2
-                strneh    r2, [r0], #2
+                strneh  r2, [r0], #2
                 cmp     r2, #0
                 bne     pathRedir_3
             ldmfd   sp!, {r0-r3}

sysmodules/rosalina/include/draw.h

@@ -63,6 +63,7 @@
 #define COLOR_TITLE RGB565(0x00, 0x26, 0x1F)
 #define COLOR_WHITE RGB565(0x1F, 0x3F, 0x1F)
 #define COLOR_RED   RGB565(0x1F, 0x00, 0x00)
+#define COLOR_GREEN RGB565(0x00, 0x1F, 0x00)
 #define COLOR_BLACK RGB565(0x00, 0x00, 0x00)
 
 #define DRAW_MAX_FORMATTED_STRING_SIZE  512

sysmodules/rosalina/include/menus/miscellaneous.h

@@ -35,5 +35,6 @@ void MiscellaneousMenu_SwitchBoot3dsxTargetTitle(void);
 void MiscellaneousMenu_ChangeMenuCombo(void);
 void MiscellaneousMenu_SaveSettings(void);
 void MiscellaneousMenu_InputRedirection(void);
+void MiscellaneousMenu_ToggleWireless(void);
 void MiscellaneousMenu_PowerOff(void);
 void MiscellaneousMenu_Reboot(void);

sysmodules/rosalina/source/menus/miscellaneous.c

@@ -37,12 +37,13 @@
 
 Menu miscellaneousMenu = {
     "Miscellaneous options menu",
-    .nbItems = 6,
+    .nbItems = 7,
     {
         { "Switch the hb. title to the current app.", METHOD, .method = &MiscellaneousMenu_SwitchBoot3dsxTargetTitle },
         { "Change the menu combo", METHOD, .method = MiscellaneousMenu_ChangeMenuCombo },
         { "Save settings", METHOD, .method = &MiscellaneousMenu_SaveSettings },
         { "Start InputRedirection", METHOD, .method = &MiscellaneousMenu_InputRedirection },
+        { "Toggle Wireless", METHOD, .method = &MiscellaneousMenu_ToggleWireless },
         { "Power off", METHOD, .method = &MiscellaneousMenu_PowerOff },
         { "Reboot", METHOD, .method = &MiscellaneousMenu_Reboot },
     }
@@ -335,6 +336,39 @@ void MiscellaneousMenu_InputRedirection(void)
     while(!(waitInput() & BUTTON_B) && !terminationRequest);
 }
 
+void MiscellaneousMenu_ToggleWireless(void)
+{
+    Draw_Lock();
+    Draw_ClearFramebuffer();
+    Draw_FlushFramebuffer();
+    Draw_Unlock();
+
+    do
+    {
+        Draw_Lock();
+        Draw_DrawString(10, 10, COLOR_TITLE, "Miscellaneous options menu");
+        Draw_DrawString(10, 30, COLOR_WHITE, "Press A to toggle, press B to go back.");
+        Draw_DrawString(10, 40, COLOR_WHITE, "Current status:");
+
+        u8 wireless = (*(vu8 *)((0x10140000 | (1u << 31)) + 0x180));
+        Draw_DrawString(100, 40, (wireless ? COLOR_GREEN : COLOR_RED), (wireless ? " ON " : " OFF"));
+        Draw_FlushFramebuffer();
+        Draw_Unlock();
+
+        u32 pressed = waitInputWithTimeout(1000);
+
+        if(pressed & BUTTON_A)
+        {
+            nwmExtInit();
+            NWMEXT_ControlWirelessEnabled(!wireless);
+            nwmExtExit();
+        }
+        else if(pressed & BUTTON_B)
+            return;
+    }
+    while(!terminationRequest);
+}
+
 void MiscellaneousMenu_Reboot(void)
 {
     Draw_Lock();