Use ctrulib functions for mcu/battery level

LumaTeam · Oct 5, 2017 · 188400c · 188400c
1 parent a74d9c6
commit 188400c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 135 deletions.
diff --git a/sysmodules/rosalina/include/mcu.h b/sysmodules/rosalina/include/mcu.h
diff --git a/sysmodules/rosalina/source/mcu.c b/sysmodules/rosalina/source/mcu.c
diff --git a/sysmodules/rosalina/source/menu.c b/sysmodules/rosalina/source/menu.c
@@ -28,7 +28,6 @@
 #include "menu.h"
 #include "draw.h"
 #include "fmt.h"
-#include "mcu.h"
 #include "memory.h"
 #include "ifile.h"
 #include "menus.h"
@@ -124,26 +123,6 @@ u32 waitCombo(void)
     return waitComboWithTimeout(0);
 }
 
-static Result _MCUHWC_GetBatteryLevel(u8 *out)
-{
-    #define TRY(expr) if(R_FAILED(res = (expr))) { mcuExit(); return res; }
-    Result res;
-
-    TRY(mcuInit());
-
-    u32 *cmdbuf = getThreadCommandBuffer();
-    cmdbuf[0] = 0x50000;
-
-    TRY(svcSendSyncRequest(mcuhwcHandle));
-
-    *out = (u8) cmdbuf[2];
-
-    svcCloseHandle(mcuhwcHandle);
-    return cmdbuf[1];
-
-    #undef TRY
-}
-
 static MyThread menuThread;
 static u8 ALIGN(8) menuThreadStack[THREAD_STACK_SIZE];
 static u8 batteryLevel = 255;
@@ -215,8 +194,12 @@ static void menuDraw(Menu *menu, u32 selected)
     u32 version, commitHash;
     bool isRelease;
 
-    if(R_FAILED(_MCUHWC_GetBatteryLevel(&batteryLevel)))
-        batteryLevel = 255;
+    if(R_SUCCEEDED(mcuHwcInit()))
+    {
+        if(R_FAILED(mcuHwcGetBatteryLevel(&batteryLevel)))
+            batteryLevel = 255;
+        mcuHwcExit();
+    }
 
     svcGetSystemInfo(&out, 0x10000, 0);
     version = (u32)out;

diff --git a/sysmodules/rosalina/source/menus/miscellaneous.c b/sysmodules/rosalina/source/menus/miscellaneous.c
@@ -27,7 +27,6 @@
 #include <3ds.h>
 #include "menus/miscellaneous.h"
 #include "input_redirection.h"
-#include "mcu.h"
 #include "memory.h"
 #include "draw.h"
 #include "hbloader.h"

diff --git a/sysmodules/rosalina/source/menus/sysconfig.c b/sysmodules/rosalina/source/menus/sysconfig.c
@@ -26,7 +26,6 @@
 
 #include <3ds.h>
 #include "menus/sysconfig.h"
-#include "mcu.h"
 #include "memory.h"
 #include "draw.h"
 #include "fmt.h"
@@ -65,12 +64,12 @@ void SysConfigMenu_ToggleLEDs(void)
 
         if(pressed & BUTTON_A)
         {
-            mcuInit();
+            mcuHwcInit();
             u8 result;
-            mcuGetLEDState(&result);
-            u8 value = ~result;
-            mcuWriteRegister(40, &value, 1);
-            mcuExit();
+            mcuHwcReadRegister(0x28, &result, 1);
+            result = ~result;
+            mcuHwcWriteRegister(40, &result, 1);
+            mcuHwcExit();
         }
         else if(pressed & BUTTON_B)
             return;