From 7bf5930eaf03478dcf8a865dcbf8bf4606fd7df9 Mon Sep 17 00:00:00 2001 From: boburning Date: Sun, 30 Aug 2026 14:08:14 -0400 Subject: [PATCH] fix(shell): keep Wi-Fi polling in SDL event range --- src/bloomShell/main.c | 4 +++- test/shell/bloom_shell_settings.bats | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bloomShell/main.c b/src/bloomShell/main.c index 2a94345f6..a525acedf 100644 --- a/src/bloomShell/main.c +++ b/src/bloomShell/main.c @@ -84,7 +84,9 @@ #define THEME_MEDIA_EVENT_TYPE (SDL_USEREVENT + 5) #define GAME_SWITCHER_WAKE_EVENT_TYPE (SDL_USEREVENT + 6) #define OPERATIONS_EVENT_TYPE (SDL_USEREVENT + 7) -#define WIFI_EVENT_TYPE (SDL_USEREVENT + 8) +#define WIFI_EVENT_TYPE (SDL_USEREVENT + 2) +_Static_assert(WIFI_EVENT_TYPE < SDL_NUMEVENTS, + "Wi-Fi events must fit the SDL 1.2 user-event range"); #define MIXED_LABEL_MAX_BYTES 640 static volatile sig_atomic_t game_switcher_requested = 0; diff --git a/test/shell/bloom_shell_settings.bats b/test/shell/bloom_shell_settings.bats index 835029e51..37134a5fc 100644 --- a/test/shell/bloom_shell_settings.bats +++ b/test/shell/bloom_shell_settings.bats @@ -97,7 +97,8 @@ grep -F 'bloom_shell_wifi_controller_cancel(' "$shell" grep -F 'bloom_shell_wifi_controller_poll(' "$shell" grep -F 'wifi_game_switcher_pending = 1;' "$shell" - grep -F 'WIFI_EVENT_TYPE' "$shell" + grep -F '#define WIFI_EVENT_TYPE (SDL_USEREVENT + 2)' "$shell" + grep -F '_Static_assert(WIFI_EVENT_TYPE < SDL_NUMEVENTS,' "$shell" grep -F 'wifi_focus.selected == 0' "$shell" grep -F 'BLOOM_SHELL_WIFI_CONTROLLER_COMPLETE' "$shell" grep -F 'draw_wifi_profile_form(' "$shell"