anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rosalina: add kernel&mcu fw ver. to debug info menu

Browse Source
This commit is contained in:
TuxSH 2021-01-07 01:37:46 +00:00
parent f54c709f64
commit 12ed3ae65f
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysmodules/rosalina/include/menu.h
View File

@ -64,13 +64,16 @@ typedef struct Menu {
MenuItem items[16]; MenuItem items[16];
} Menu; } Menu;
extern u32 menuCombo;
extern bool isHidInitialized;
extern u32 mcuFwVersion;
// From main.c
extern bool isN3DS; extern bool isN3DS;
extern bool menuShouldExit; extern bool menuShouldExit;
extern bool preTerminationRequested; extern bool preTerminationRequested;
extern Handle preTerminationEvent; extern Handle preTerminationEvent;
extern u32 menuCombo;
u32 waitInputWithTimeout(s32 msec); u32 waitInputWithTimeout(s32 msec);
u32 waitInput(void); u32 waitInput(void);

1
sysmodules/rosalina/source/main.c
View File

@ -128,7 +128,6 @@ void initSystem(void)
bool menuShouldExit = false; bool menuShouldExit = false;
bool preTerminationRequested = false; bool preTerminationRequested = false;
Handle preTerminationEvent; Handle preTerminationEvent;
extern bool isHidInitialized;
static void handleTermNotification(u32 notificationId) static void handleTermNotification(u32 notificationId)
{ {

3
sysmodules/rosalina/source/menu.c
View File

@ -36,6 +36,7 @@
#include "menus/cheats.h" #include "menus/cheats.h"
#include "minisoc.h" #include "minisoc.h"
u32 menuCombo = 0;
bool isHidInitialized = false; bool isHidInitialized = false;
u32 mcuFwVersion = 0; u32 mcuFwVersion = 0;
@ -226,8 +227,6 @@ MyThread *menuCreateThread(void)
return &menuThread; return &menuThread;
} }
u32 menuCombo;
void menuThreadMain(void) void menuThreadMain(void)
{ {
if(isN3DS) if(isN3DS)

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

@ -85,13 +85,23 @@ void RosalinaMenu_ShowDebugInfo(void)
u32 kextPa = (u32)((u64)kextAddrSize >> 32); u32 kextPa = (u32)((u64)kextAddrSize >> 32);
u32 kextSize = (u32)kextAddrSize; u32 kextSize = (u32)kextAddrSize;
u32 kernelVer = osGetKernelVersion();
do do
{ {
Draw_Lock(); Draw_Lock();
Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina -- Debug info"); Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina -- Debug info");
u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, memoryMap); u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, memoryMap);
Draw_DrawFormattedString(10, posY, COLOR_WHITE, "Kernel ext PA: %08lx - %08lx\n", kextPa, kextPa + kextSize); posY = Draw_DrawFormattedString(10, posY, COLOR_WHITE, "Kernel ext PA: %08lx - %08lx\n\n", kextPa, kextPa + kextSize);
posY = Draw_DrawFormattedString(
10, posY, COLOR_WHITE, "Kernel version: %lu.%lu-%lu\n",
GET_VERSION_MAJOR(kernelVer), GET_VERSION_MINOR(kernelVer), GET_VERSION_REVISION(kernelVer)
);
if (mcuFwVersion != 0)
posY = Draw_DrawFormattedString(
10, posY, COLOR_WHITE, "MCU FW version: %lu.%lu\n",
GET_VERSION_MAJOR(mcuFwVersion), GET_VERSION_MINOR(mcuFwVersion)
);
Draw_FlushFramebuffer(); Draw_FlushFramebuffer();
Draw_Unlock(); Draw_Unlock();
} }