From 12ed3ae65fcc663b4331a891ec27d75080b174ce Mon Sep 17 00:00:00 2001
From: TuxSH <1922548+TuxSH@users.noreply.github.com>
Date: Thu, 7 Jan 2021 01:37:46 +0000
Subject: [PATCH] rosalina: add kernel&mcu fw ver. to debug info menu

---
 sysmodules/rosalina/include/menu.h |  7 +++++--
 sysmodules/rosalina/source/main.c  |  1 -
 sysmodules/rosalina/source/menu.c  |  3 +--
 sysmodules/rosalina/source/menus.c | 12 +++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sysmodules/rosalina/include/menu.h b/sysmodules/rosalina/include/menu.h
index 98080b605..ff94827de 100644
--- a/sysmodules/rosalina/include/menu.h
+++ b/sysmodules/rosalina/include/menu.h
@@ -64,13 +64,16 @@ typedef struct Menu {
     MenuItem items[16];
 } Menu;
 
+extern u32 menuCombo;
+extern bool isHidInitialized;
+extern u32 mcuFwVersion;
+
+// From main.c
 extern bool isN3DS;
 extern bool menuShouldExit;
 extern bool preTerminationRequested;
 extern Handle preTerminationEvent;
 
-extern u32 menuCombo;
-
 u32 waitInputWithTimeout(s32 msec);
 u32 waitInput(void);
 
diff --git a/sysmodules/rosalina/source/main.c b/sysmodules/rosalina/source/main.c
index 487416192..e0b82566c 100644
--- a/sysmodules/rosalina/source/main.c
+++ b/sysmodules/rosalina/source/main.c
@@ -128,7 +128,6 @@ void initSystem(void)
 bool menuShouldExit = false;
 bool preTerminationRequested = false;
 Handle preTerminationEvent;
-extern bool isHidInitialized;
 
 static void handleTermNotification(u32 notificationId)
 {
diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
index 8536bc701..b5b07fff3 100644
--- a/sysmodules/rosalina/source/menu.c
+++ b/sysmodules/rosalina/source/menu.c
@@ -36,6 +36,7 @@
 #include "menus/cheats.h"
 #include "minisoc.h"
 
+u32 menuCombo = 0;
 bool isHidInitialized = false;
 u32 mcuFwVersion = 0;
 
@@ -226,8 +227,6 @@ MyThread *menuCreateThread(void)
     return &menuThread;
 }
 
-u32 menuCombo;
-
 void menuThreadMain(void)
 {
     if(isN3DS)
diff --git a/sysmodules/rosalina/source/menus.c b/sysmodules/rosalina/source/menus.c
index 43bdf2d00..86655834b 100644
--- a/sysmodules/rosalina/source/menus.c
+++ b/sysmodules/rosalina/source/menus.c
@@ -85,13 +85,23 @@ void RosalinaMenu_ShowDebugInfo(void)
     u32 kextPa = (u32)((u64)kextAddrSize >> 32);
     u32 kextSize = (u32)kextAddrSize;
 
+    u32 kernelVer = osGetKernelVersion();
     do
     {
         Draw_Lock();
         Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina -- Debug info");
 
         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_Unlock();
     }