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

rosalina: cleanup variable names

Browse Source
This commit is contained in:
TuxSH
2020-05-15 20:00:13 +01:00
parent 9ae913064c
commit 71cddef78f
13 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sysmodules/rosalina/source/menus/cheats.c
View File

@@ -1944,7 +1944,7 @@ void RosalinaMenu_Cheats(void)
Draw_FlushFramebuffer();
Draw_Unlock();
} while (!(waitInput() & KEY_B) && !terminationRequest);
} while (!(waitInput() & KEY_B) && !menuShouldExit);
}
else
{
@@ -1982,14 +1982,14 @@ void RosalinaMenu_Cheats(void)
Draw_FlushFramebuffer();
Draw_Unlock();
if (terminationRequest) break;
if (menuShouldExit) break;
u32 pressed;
do
{
pressed = waitInputWithTimeout(50);
if (pressed != 0) break;
} while (pressed == 0 && !terminationRequest);
} while (pressed == 0 && !menuShouldExit);
if (pressed & KEY_B)
break;
@@ -2025,7 +2025,7 @@ void RosalinaMenu_Cheats(void)
pagePrev = page;
page = selected / CHEATS_PER_MENU_PAGE;
} while (!terminationRequest);
} while (!menuShouldExit);
}
}

10
sysmodules/rosalina/source/menus/debugger.c
View File

@@ -139,13 +139,13 @@ void DebuggerMenu_EnableDebugger(void)
if(!done)
{
res = GDB_InitializeServer(&gdbServer);
Handle handles[3] = { gdbServer.super.started_event, gdbServer.super.shall_terminate_event, terminationRequestEvent };
Handle handles[3] = { gdbServer.super.started_event, gdbServer.super.shall_terminate_event, preTerminationEvent };
s32 idx;
if(R_SUCCEEDED(res))
{
debuggerCreateSocketThread();
debuggerCreateDebugThread();
res = svcWaitSynchronizationN(&idx, handles, 3, false, 10 * 1000 * 1000 * 1000LL);
res = svcWaitSynchronizationN(&idx, handles, 3, false, 5 * 1000 * 1000 * 1000LL);
if(res == 0) res = gdbServer.super.init_result;
}
@@ -162,7 +162,7 @@ void DebuggerMenu_EnableDebugger(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void DebuggerMenu_DisableDebugger(void)
@@ -183,7 +183,7 @@ void DebuggerMenu_DisableDebugger(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void DebuggerMenu_DebugNextApplicationByForce(void)
@@ -232,7 +232,7 @@ void DebuggerMenu_DebugNextApplicationByForce(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void debuggerSocketThreadMain(void)

12
sysmodules/rosalina/source/menus/miscellaneous.c
View File

@@ -95,7 +95,7 @@ void MiscellaneousMenu_SwitchBoot3dsxTargetTitle(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
static void MiscellaneousMenu_ConvertComboToString(char *out, u32 combo)
@@ -161,7 +161,7 @@ void MiscellaneousMenu_ChangeMenuCombo(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void MiscellaneousMenu_SaveSettings(void)
@@ -227,7 +227,7 @@ void MiscellaneousMenu_SaveSettings(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void MiscellaneousMenu_InputRedirection(void)
@@ -327,7 +327,7 @@ void MiscellaneousMenu_InputRedirection(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
}
void MiscellaneousMenu_SyncTimeDate(void)
@@ -368,7 +368,7 @@ void MiscellaneousMenu_SyncTimeDate(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(input & (KEY_A | KEY_B)) && !terminationRequest);
while(!(input & (KEY_A | KEY_B)) && !menuShouldExit);
if (input & KEY_B)
return;
@@ -410,6 +410,6 @@ void MiscellaneousMenu_SyncTimeDate(void)
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(input & KEY_B) && !terminationRequest);
while(!(input & KEY_B) && !menuShouldExit);
}

10
sysmodules/rosalina/source/menus/process_list.c
View File

@@ -197,7 +197,7 @@ end:
Draw_FlushFramebuffer();
Draw_Unlock();
}
while(!(waitInput() & KEY_B) && !terminationRequest);
while(!(waitInput() & KEY_B) && !menuShouldExit);
#undef TRY
}
@@ -568,7 +568,7 @@ static void ProcessListMenu_MemoryViewer(const ProcessInfo *info)
if(menus[menuMode].selected >= menus[menuMode].max)
menus[menuMode].selected = menus[menuMode].max - 1;
}
while(!terminationRequest);
while(!menuShouldExit);
clearMenu();
}
@@ -685,7 +685,7 @@ void RosalinaMenu_ProcessList(void)
Draw_FlushFramebuffer();
Draw_Unlock();
if(terminationRequest)
if(menuShouldExit)
break;
u32 pressed;
@@ -698,7 +698,7 @@ void RosalinaMenu_ProcessList(void)
if(memcmp(infos, infosPrev, sizeof(infos)) != 0)
break;
}
while(pressed == 0 && !terminationRequest);
while(pressed == 0 && !menuShouldExit);
if(pressed & KEY_B)
break;
@@ -728,5 +728,5 @@ void RosalinaMenu_ProcessList(void)
pagePrev = page;
page = selected / PROCESSES_PER_MENU_PAGE;
}
while(!terminationRequest);
while(!menuShouldExit);
}

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

@@ -78,7 +78,7 @@ void SysConfigMenu_ToggleLEDs(void)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
while(!menuShouldExit);
}
void SysConfigMenu_ToggleWireless(void)
@@ -148,7 +148,7 @@ void SysConfigMenu_ToggleWireless(void)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
while(!menuShouldExit);
}
void SysConfigMenu_UpdateStatus(bool control)
@@ -227,7 +227,7 @@ static bool SysConfigMenu_ForceWifiConnection(int slot)
if(pressed & KEY_B)
break;
}
while(!terminationRequest);
while(!menuShouldExit);
return forcedConnection;
}
@@ -270,7 +270,7 @@ void SysConfigMenu_TogglePowerButton(void)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
while(!menuShouldExit);
}
void SysConfigMenu_ControlWifi(void)
@@ -332,7 +332,7 @@ void SysConfigMenu_ControlWifi(void)
else if(pressed & KEY_B)
return;
}
while(!terminationRequest);
while(!menuShouldExit);
}
void SysConfigMenu_DisableForcedWifiConnection(void)
@@ -355,5 +355,5 @@ void SysConfigMenu_DisableForcedWifiConnection(void)
if(pressed & KEY_B)
return;
}
while(!terminationRequest);
while(!menuShouldExit);
}