From 6d7eb8c5a9d70621ae3343d8a7a681057969a060 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 8 Mar 2023 23:39:22 +0100
Subject: [PATCH] Implement libmobile changes

---
 source/main.c         | 23 +++++++----------------
 subprojects/libmobile |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/source/main.c b/source/main.c
index 9b1d047..fb56b2a 100644
--- a/source/main.c
+++ b/source/main.c
@@ -416,19 +416,10 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
 }
 #endif
 
-static enum mobile_action filter_actions(enum mobile_action action)
+static enum mobile_action filter_actions(enum mobile_action actions)
 {
-    // Turns actions that aren't relevant to the emulator into
-    //   MOBILE_ACTION_NONE
-
-    switch (action) {
-    // In an emulator, serial can't desync
-    case MOBILE_ACTION_RESET_SERIAL:
-        return MOBILE_ACTION_NONE;
-
-    default:
-        return action;
-    }
+    // Filter out the actions that aren't relevant to this emulator
+    return actions & ~MOBILE_ACTION_RESET_SERIAL;
 }
 
 static void *thread_mobile_loop(void *user)
@@ -454,12 +445,12 @@ static void *thread_mobile_loop(void *user)
         // Fetch action if none exists
         if (mobile->action == MOBILE_ACTION_NONE) {
             mobile->action =
-                filter_actions(mobile_action_get(mobile->adapter));
+                filter_actions(mobile_actions_get(mobile->adapter));
         }
 
         // Process action
         if (mobile->action != MOBILE_ACTION_NONE) {
-            mobile_action_process(mobile->adapter, mobile->action);
+            mobile_actions_process(mobile->adapter, mobile->action);
 
             // Sleep 10ms to avoid busylooping too hard
             struct timespec to = now;
@@ -472,7 +463,7 @@ static void *thread_mobile_loop(void *user)
 
             // Fetch next action
             mobile->action =
-                filter_actions(mobile_action_get(mobile->adapter));
+                filter_actions(mobile_actions_get(mobile->adapter));
         }
     }
     return NULL;
@@ -486,7 +477,7 @@ static void bgb_loop_action(struct mobile_user *mobile)
     // If the thread isn't doing anything, queue up the next action.
     if (pthread_mutex_trylock(&mobile->mutex_cond) != 0) return;
     if (mobile->action == MOBILE_ACTION_NONE) {
-        mobile->action = filter_actions(mobile_action_get(mobile->adapter));
+        mobile->action = filter_actions(mobile_actions_get(mobile->adapter));
     }
     if (mobile->action != MOBILE_ACTION_NONE) {
         pthread_cond_broadcast(&mobile->cond);
diff --git a/subprojects/libmobile b/subprojects/libmobile
index 92ab170..d01092e 160000
--- a/subprojects/libmobile
+++ b/subprojects/libmobile
@@ -1 +1 @@
-Subproject commit 92ab17008a4ca1b2f55a555b6774744487a07d69
+Subproject commit d01092e433ce5d4d8d56634ca0379a9fc555459a