Merge branch 'dev'

Author: ducalex

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Retro-Go 1.38 (2023-03-28)
+- GBC: Added support for MBC30 (For Pokemon Crystal romhacks)
+- Launcher: Added a new scroll behavior (Options -> Scroll mode)
+
+
 # Retro-Go 1.37 (2022-12-30)
 - SNES: Fixed controls menu labels
 - GEN: Small performance improvement

base.cmake

@@ -13,7 +13,6 @@ macro(rg_setup_compile_options)
     message("Target: ${RG_TARGET}")
 
     component_compile_options(
-        -DRG_REPLACE_PRINTF_FUNCTIONS
         -D${RG_TARGET}
         -DRETRO_GO
         ${ARGV}

components/retro-go/CMakeLists.txt

@@ -1,10 +1,11 @@
 set(COMPONENT_SRCDIRS ". fonts libs/netplay libs/lodepng")
 set(COMPONENT_ADD_INCLUDEDIRS ". libs/netplay libs/lodepng")
-if($ENV{RG_ENABLE_NETWORKING})
-    set(COMPONENT_REQUIRES "spi_flash fatfs nvs_flash esp_http_client app_update esp_adc_cal esp32 json")
-else()
-    set(COMPONENT_REQUIRES "spi_flash fatfs app_update esp_adc_cal esp32 json")
-endif()
+
+# esp-idf 4.1 - 4.4
+set(COMPONENT_REQUIRES "spi_flash fatfs app_update esp_adc_cal json nvs_flash esp_wifi esp_http_client")
+# esp-idf 5.0 -
+#set(COMPONENT_REQUIRES "spi_flash fatfs app_update esp_adc esp_timer json nvs_flash esp_wifi esp_http_client")
+
 register_component()
 
 # Small size is preferred because of the small cache and most things here aren't performance sensitive!
@@ -13,8 +14,8 @@ register_component()
 component_compile_options(
     -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS
     -DLODEPNG_NO_COMPILE_ERROR_TEXT
-    -DRG_REPLACE_PRINTF_FUNCTIONS
     -Os
+    -Wno-unused-function
 )
 set_source_files_properties(
     rg_audio.c rg_display.c

components/retro-go/config.h

@@ -68,3 +68,7 @@
 #ifndef RG_GPIO_LED
 #define RG_GPIO_LED (-1)
 #endif
+
+#ifndef RG_GAMEPAD_MAP
+#define RG_GAMEPAD_MAP {}
+#endif

components/retro-go/rg_audio.c

@@ -3,13 +3,25 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
-#ifndef RG_TARGET_SDL2
+#ifdef RG_TARGET_SDL2
+#include <SDL2/SDL.h>
+#define CREATE_DEVICE_LOCK()
+#define ACQUIRE_DEVICE(timeout) (1)
+#define RELEASE_DEVICE()
+#else
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
-#else
-#include <SDL2/SDL.h>
+#define CREATE_DEVICE_LOCK() audioDevLock = audioDevLock ?: xSemaphoreCreateMutex()
+#define ACQUIRE_DEVICE(timeout)                        \
+    ({                                                 \
+        int x = xSemaphoreTake(audioDevLock, timeout); \
+        if (!x)                                        \
+            RG_LOGE("Failed to acquire lock!\n");      \
+        x;                                             \
+    })
+#define RELEASE_DEVICE() xSemaphoreGive(audioDevLock)
+static SemaphoreHandle_t audioDevLock;
 #endif
 
 #if RG_AUDIO_USE_INT_DAC || RG_AUDIO_USE_EXT_DAC
@@ -48,35 +60,18 @@ static const rg_audio_sink_t sinks[] = {
 
 static rg_audio_t audio;
 static rg_audio_counters_t counters;
-
-static SemaphoreHandle_t audioDevLock;
 static int64_t dummyBusyUntil = 0;
 
 static const char *SETTING_OUTPUT = "AudioSink";
 static const char *SETTING_VOLUME = "Volume";
 static const char *SETTING_FILTER = "AudioFilter";
 
-#ifndef RG_TARGET_SDL2
-#define ACQUIRE_DEVICE(timeout)                        \
-    ({                                                 \
-        int x = xSemaphoreTake(audioDevLock, timeout); \
-        if (!x)                                        \
-            RG_LOGE("Failed to acquire lock!\n");      \
-        x;                                             \
-    })
-#define RELEASE_DEVICE() xSemaphoreGive(audioDevLock);
-#else
-#define ACQUIRE_DEVICE(timeout) (1)
-#define RELEASE_DEVICE()
-#endif
 
 void rg_audio_init(int sampleRate)
 {
     RG_ASSERT(audio.sink == NULL, "Audio sink already initialized!");
 
-    if (audioDevLock == NULL)
-        audioDevLock = xSemaphoreCreateMutex();
-
+    CREATE_DEVICE_LOCK();
     ACQUIRE_DEVICE(1000);
 
     int sinkType = (int)rg_settings_get_number(NS_GLOBAL, SETTING_OUTPUT, sinks[0].type);