fix compile errors

sysmodules/rosalina/include/menu.h

@@ -74,9 +74,6 @@ extern u32 menuCombo;
 u32     waitInputWithTimeout(u32 msec);
 u32     waitInput(void);
 
-u32     waitComboWithTimeout(u32 msec);
-u32     waitCombo(void);
-
 bool menuCheckN3ds(void);
 u32 menuCountItems(const Menu *menu);
 

sysmodules/rosalina/source/draw.c

@@ -247,7 +247,7 @@ void Draw_CreateBitmapHeader(u8 *dst, u32 width, u32 heigth)
     Draw_WriteUnaligned(dst + 0x22, 3 * width * heigth, 4);
 }
 
-static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_FramebufferFormat srcFormat)
+static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_FramebufferFormats srcFormat)
 {
     u8 red, green, blue;
     switch(srcFormat)
@@ -323,7 +323,7 @@ static void Draw_ConvertFrameBufferLinesKernel(const FrameBufferConvertArgs *arg
 {
     static const u8 formatSizes[] = { 4, 3, 2, 2, 2 };
 
-    GSPGPU_FramebufferFormat fmt = args->top ? (GSPGPU_FramebufferFormat)(GPU_FB_TOP_FMT & 7) : (GSPGPU_FramebufferFormat)(GPU_FB_BOTTOM_FMT & 7);
+    GSPGPU_FramebufferFormats fmt = args->top ? (GSPGPU_FramebufferFormats)(GPU_FB_TOP_FMT & 7) : (GSPGPU_FramebufferFormats)(GPU_FB_BOTTOM_FMT & 7);
     u32 width = args->top ? 400 : 320;
     u32 stride = args->top ? GPU_FB_TOP_STRIDE : GPU_FB_BOTTOM_STRIDE;
 

sysmodules/rosalina/source/input_redirection.c

@@ -126,7 +126,7 @@ void inputRedirectionThreadMain(void)
         if (Sleep__Status())
         {
             while (!Wifi__IsConnected()
-                    && inputRedirectionEnabled && !terminationRequest)
+                    && inputRedirectionEnabled && !preTerminationRequested)
                 svcSleepThread(1000000000ULL);
         }
 

sysmodules/rosalina/source/menu.c

@@ -53,7 +53,7 @@ static inline u32 convertHidKeys(u32 keys)
     return keys;
 }
 
-u32 waitInputWithTimeout(s32 msec)
+u32 waitInputWithTimeout(u32 msec)
 {
     s32 n = 0;
     u32 keys;
@@ -204,14 +204,7 @@ void    menuThreadMain(void)
                 menuShow(&rosalinaMenu);
                 menuLeave();
             }
-        }
-        else
-        {
-            menuEnter();
-            if(isN3DS) N3DSMenu_UpdateStatus();
-            menuShow(&rosalinaMenu);
-            menuLeave();
-        }
+        
 
         // Check for home button on O3DS Mode3 with plugin loaded
         if (homeBtnPressed != 0)
@@ -450,7 +443,7 @@ void    DispMessage(const char *title, const char *message)
     do
     {
         keys = waitComboWithTimeout(1000);
-    }while (!terminationRequest && !(keys & BUTTON_B));
+    }while (!preTerminationRequested && !(keys & KEY_B));
 
     Draw_Unlock(); ///< Keep it locked until we exit the message
     menuLeave();
@@ -478,7 +471,7 @@ u32    DispErrMessage(const char *title, const char *message, const Result error
     do
     {
         keys = waitComboWithTimeout(1000);
-    }while (!terminationRequest && !(keys & BUTTON_B));
+    }while (!preTerminationRequested && !(keys & KEY_B));
 
     Draw_Unlock();  ///< Keep it locked until we exit the message
     menuLeave();
@@ -505,12 +498,12 @@ u32     DispWarningOnHome(void)
     do
     {
         keys = waitComboWithTimeout(1000);
-    }while (!terminationRequest && !(keys & BUTTON_B));
+    }while (!preTerminationRequested && !(keys & KEY_B));
 
     Draw_Unlock(); ///< Keep it locked until we exit the message
     menuLeave();
 
-    return (keys & BUTTON_UP) > 0;
+    return (keys & KEY_UP) > 0;
 }
 
 
@@ -564,17 +557,17 @@ void    DisplayPluginMenu(u32   *cmdbuf)
         // Wait for input
         u32 pressed = waitInput();
 
-        if (pressed & BUTTON_A)
+        if (pressed & KEY_A)
             states[cursor] = !states[cursor];
 
-        if (pressed & BUTTON_B)
+        if (pressed & KEY_B)
             break;
 
-        if (pressed & BUTTON_DOWN)
+        if (pressed & KEY_DOWN)
             if (++cursor >= nbItems)
                 cursor = 0;
 
-        if (pressed & BUTTON_UP)
+        if (pressed & KEY_UP)
             if (--cursor >= nbItems)
                 cursor = nbItems - 1;
 

sysmodules/rosalina/source/plgloader.c

@@ -590,7 +590,7 @@ void        PluginLoader__ThreadMain(void)
 
         SetKernelConfigurationMemoryFlag(g_process != 0);
 
-    } while(!terminationRequest);
+    } while(!preTerminationRequested);
 
     svcCloseHandle(sessionHandle);
     svcCloseHandle(clientHandle);

sysmodules/rosalina/source/sock_util.c

@@ -191,7 +191,7 @@ void server_run(struct sock_server *serv)
         if (Sleep__Status())
         {
             while (!Wifi__IsConnected()
-                    && serv->running && !terminationRequest)
+                    && serv->running && !preTerminationRequested)
                 svcSleepThread(1000000000ULL);
         }