From 0bc51d5c347106a5c51f8a4512ea4b7e5692188a Mon Sep 17 00:00:00 2001
From: selabnayr <ryanb@stmproducts.com>
Date: Fri, 5 Jul 2019 15:04:38 -0700
Subject: [PATCH 1/2] Add an entry to the System Configuration menu to toggle
 disabling a short press of the power button triggering a software closure.

---
 sysmodules/rosalina/include/menus/sysconfig.h |  1 +
 sysmodules/rosalina/source/menus/sysconfig.c  | 44 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/sysmodules/rosalina/include/menus/sysconfig.h b/sysmodules/rosalina/include/menus/sysconfig.h
index fcae0a4..eda9eab 100644
--- a/sysmodules/rosalina/include/menus/sysconfig.h
+++ b/sysmodules/rosalina/include/menus/sysconfig.h
@@ -33,3 +33,4 @@ extern Menu sysconfigMenu;
 
 void SysConfigMenu_ToggleLEDs(void);
 void SysConfigMenu_ToggleWireless(void);
+void SysConfigMenu_TogglePowerButton(void);
diff --git a/sysmodules/rosalina/source/menus/sysconfig.c b/sysmodules/rosalina/source/menus/sysconfig.c
index f2f8851..e41e3b2 100644
--- a/sysmodules/rosalina/source/menus/sysconfig.c
+++ b/sysmodules/rosalina/source/menus/sysconfig.c
@@ -34,10 +34,11 @@
 
 Menu sysconfigMenu = {
     "System configuration menu",
-    .nbItems = 2,
+    .nbItems = 3,
     {
         { "Toggle LEDs", METHOD, .method = &SysConfigMenu_ToggleLEDs },
         { "Toggle Wireless", METHOD, .method = &SysConfigMenu_ToggleWireless },
+        { "Toggle Power Button", METHOD, .method=&SysConfigMenu_TogglePowerButton },
     }
 };
 
@@ -146,3 +147,44 @@ void SysConfigMenu_ToggleWireless(void)
     }
     while(!terminationRequest);
 }
+
+void SysConfigMenu_TogglePowerButton(void)
+{
+    u8 result;
+    
+    Draw_Lock();
+    Draw_ClearFramebuffer();
+    Draw_FlushFramebuffer();
+    Draw_Unlock();
+    
+    mcuHwcInit();
+    MCUHWC_ReadRegister(0x18, &result, 1);
+    mcuHwcExit();
+
+    do
+    {
+        Draw_Lock();
+        Draw_DrawString(10, 10, COLOR_TITLE, "System configuration menu");
+        Draw_DrawString(10, 30, COLOR_WHITE, "Press A to toggle, press B to go back.");
+
+        Draw_DrawString(10, 50, COLOR_WHITE, "Current status:");
+        Draw_DrawString(100, 50, (((result & 0x01) == 0x01) ? COLOR_RED : COLOR_GREEN), (((result & 0x01) == 0x01) ? " DISABLED" : " ENABLED "));
+        
+        Draw_FlushFramebuffer();
+        Draw_Unlock();
+        
+        u32 pressed = waitInputWithTimeout(1000);
+
+        if(pressed & BUTTON_A)
+        {
+            mcuHwcInit();
+            MCUHWC_ReadRegister(0x18, &result, 1);
+            result ^= 0x01;
+            MCUHWC_WriteRegister(0x18, &result, 1);
+            mcuHwcExit();
+        }
+        else if(pressed & BUTTON_B)
+            return;
+    }
+    while(!terminationRequest);
+}

From 3061001fb1f3193d4fdbdf3a156489ebd00ecf07 Mon Sep 17 00:00:00 2001
From: selabnayr <ryanb@stmproducts.com>
Date: Fri, 5 Jul 2019 15:37:54 -0700
Subject: [PATCH 2/2] Switch to updating all 4 bytes of the IRQ mask, on the
 suggestion of profi200.

---
 sysmodules/rosalina/source/menus/sysconfig.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sysmodules/rosalina/source/menus/sysconfig.c b/sysmodules/rosalina/source/menus/sysconfig.c
index e41e3b2..1eb2e6c 100644
--- a/sysmodules/rosalina/source/menus/sysconfig.c
+++ b/sysmodules/rosalina/source/menus/sysconfig.c
@@ -150,7 +150,7 @@ void SysConfigMenu_ToggleWireless(void)
 
 void SysConfigMenu_TogglePowerButton(void)
 {
-    u8 result;
+    u32 mcuIRQMask;
     
     Draw_Lock();
     Draw_ClearFramebuffer();
@@ -158,7 +158,7 @@ void SysConfigMenu_TogglePowerButton(void)
     Draw_Unlock();
     
     mcuHwcInit();
-    MCUHWC_ReadRegister(0x18, &result, 1);
+    MCUHWC_ReadRegister(0x18, (u8*)&mcuIRQMask, 4);
     mcuHwcExit();
 
     do
@@ -168,7 +168,7 @@ void SysConfigMenu_TogglePowerButton(void)
         Draw_DrawString(10, 30, COLOR_WHITE, "Press A to toggle, press B to go back.");
 
         Draw_DrawString(10, 50, COLOR_WHITE, "Current status:");
-        Draw_DrawString(100, 50, (((result & 0x01) == 0x01) ? COLOR_RED : COLOR_GREEN), (((result & 0x01) == 0x01) ? " DISABLED" : " ENABLED "));
+        Draw_DrawString(100, 50, (((mcuIRQMask & 0x00000001) == 0x00000001) ? COLOR_RED : COLOR_GREEN), (((mcuIRQMask & 0x00000001) == 0x00000001) ? " DISABLED" : " ENABLED "));
         
         Draw_FlushFramebuffer();
         Draw_Unlock();
@@ -178,9 +178,9 @@ void SysConfigMenu_TogglePowerButton(void)
         if(pressed & BUTTON_A)
         {
             mcuHwcInit();
-            MCUHWC_ReadRegister(0x18, &result, 1);
-            result ^= 0x01;
-            MCUHWC_WriteRegister(0x18, &result, 1);
+            MCUHWC_ReadRegister(0x18, (u8*)&mcuIRQMask, 4);
+            mcuIRQMask ^= 0x00000001;
+            MCUHWC_WriteRegister(0x18, (u8*)&mcuIRQMask, 4);
             mcuHwcExit();
         }
         else if(pressed & BUTTON_B)