LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

rosalina/sysconfig: fix wifi forcing, including a regression from v10.1.1

Browse Source
This commit is contained in:
TuxSH 2020-04-27 20:00:41 +01:00
parent 3e228c33c9
commit b551061264
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysmodules/rosalina/include/menus/sysconfig.h
View File

@ -30,8 +30,10 @@
#include "menu.h" #include "menu.h"
extern Menu sysconfigMenu; extern Menu sysconfigMenu;
extern bool isConnectionForced;
void SysConfigMenu_ToggleLEDs(void); void SysConfigMenu_ToggleLEDs(void);
void SysConfigMenu_ToggleWireless(void); void SysConfigMenu_ToggleWireless(void);
void SysConfigMenu_TogglePowerButton(void); void SysConfigMenu_TogglePowerButton(void);
void SysConfigMenu_ControlWifi(void); void SysConfigMenu_ControlWifi(void);
void SysConfigMenu_DisableForcedWifiConnection(void);

62
sysmodules/rosalina/source/menus/sysconfig.c
View File

@ -43,6 +43,8 @@ Menu sysconfigMenu = {
} }
}; };
bool isConnectionForced = false;
void SysConfigMenu_ToggleLEDs(void) void SysConfigMenu_ToggleLEDs(void)
{ {
Draw_Lock(); Draw_Lock();
@ -149,7 +151,23 @@ void SysConfigMenu_ToggleWireless(void)
while(!terminationRequest); while(!terminationRequest);
} }
static void SysConfigMenu_ForceWifiConnection(int slot) static void SysConfigMenu_UpdateStatus(bool control)
{
MenuItem *item = &sysconfigMenu.items[3];
if(control)
{
item->title = "Control Wireless connection";
item->method = &SysConfigMenu_ControlWifi;
}
else
{
item->title = "Disable forced wireless connection";
item->method = &SysConfigMenu_DisableForcedWifiConnection;
}
}
static bool SysConfigMenu_ForceWifiConnection(int slot)
{ {
char ssid[0x20 + 1] = {0}; char ssid[0x20 + 1] = {0};
@ -169,13 +187,18 @@ static void SysConfigMenu_ForceWifiConnection(int slot)
{ {
if(R_SUCCEEDED(svcWaitSynchronization(connectEvent, -1))) if(R_SUCCEEDED(svcWaitSynchronization(connectEvent, -1)))
{ {
ACU_GetSSID(ssid); if(R_FAILED(ACU_GetSSID(ssid)))
ssid[0] = 0;
forcedConnection = true; forcedConnection = true;
} }
} }
svcCloseHandle(connectEvent); svcCloseHandle(connectEvent);
acExit(); if(forcedConnection)
{
isConnectionForced = true;
SysConfigMenu_UpdateStatus(false);
}
char infoString[80] = {0}; char infoString[80] = {0};
u32 infoStringColor = forcedConnection ? COLOR_GREEN : COLOR_RED; u32 infoStringColor = forcedConnection ? COLOR_GREEN : COLOR_RED;
@ -202,9 +225,11 @@ static void SysConfigMenu_ForceWifiConnection(int slot)
u32 pressed = waitInputWithTimeout(1000); u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_B) if(pressed & BUTTON_B)
return; break;
} }
while(!terminationRequest); while(!terminationRequest);
return forcedConnection;
} }
void SysConfigMenu_TogglePowerButton(void) void SysConfigMenu_TogglePowerButton(void)
@ -273,7 +298,11 @@ void SysConfigMenu_ControlWifi(void)
if(pressed & BUTTON_A) if(pressed & BUTTON_A)
{ {
SysConfigMenu_ForceWifiConnection(slot); if(SysConfigMenu_ForceWifiConnection(slot))
{
// Connection successfully forced, return from this menu to prevent ac handle refcount leakage.
break;
}
Draw_Lock(); Draw_Lock();
Draw_ClearFramebuffer(); Draw_ClearFramebuffer();
@ -305,3 +334,26 @@ void SysConfigMenu_ControlWifi(void)
} }
while(!terminationRequest); while(!terminationRequest);
} }
void SysConfigMenu_DisableForcedWifiConnection(void)
{
Draw_Lock();
Draw_ClearFramebuffer();
Draw_FlushFramebuffer();
Draw_Unlock();
acExit();
SysConfigMenu_UpdateStatus(true);
do
{
Draw_Lock();
Draw_DrawString(10, 10, COLOR_TITLE, "System configuration menu");
Draw_DrawString(10, 30, COLOR_WHITE, "Forced connection successfully disabled.");
u32 pressed = waitInputWithTimeout(1000);
if(pressed & BUTTON_B)
return;
}
while(!terminationRequest);
}