Replace all uses of PLUGIN_USE_IRAM with USE_IRAM

rockbox-gerrit-noreply--- via rockbox-cvs <[email protected]>
Newsgroups gmane.comp.systems.archos.rockbox.cvs
Message-ID <[email protected]>
commit 2429e117d0f1722adf704b5f83e6ddbfed016d1f
Author: Aidan MacDonald <[email protected]>
Date:   Sun Feb 1 13:21:20 2026 +0000

    Replace all uses of PLUGIN_USE_IRAM with USE_IRAM
    
    PLUGIN_USE_IRAM is almost equivalent to USE_IRAM except
    that USE_IRAM might be defined in core, but not plugins.
    All remaining uses of PLUGIN_USE_IRAM are inside plugins,
    however, so there is no point keeping both defines around.
    
    Change-Id: I6902c85651f3d82b7d19ea32eaa60fc5c19eded7

diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c
index a7f662a823..c5e9e9c22e 100755
--- a/apps/plugins/pacbox/pacbox.c
+++ b/apps/plugins/pacbox/pacbox.c
@@ -387,7 +387,7 @@ static void start_sound(void)
     if (sound_playing)
         return;
 
-#ifndef PLUGIN_USE_IRAM
+#ifndef USE_IRAM
     /* Ensure control of PCM - stopping music itn't obligatory */
     rb->plugin_get_audio_buffer(NULL);
 #endif
diff --git a/apps/plugins/pitch_detector.c b/apps/plugins/pitch_detector.c
index 9840aab325..9bed3ff754 100644
--- a/apps/plugins/pitch_detector.c
+++ b/apps/plugins/pitch_detector.c
@@ -248,7 +248,7 @@ static volatile int audio_tail = 0; /* which of the two buffers to record? */
 #ifndef SIMULATOR
 static int16_t audio_data[2][BUFFER_SIZE] MEM_ALIGN_ATTR;
 static fixed yin_buffer[YIN_BUFFER_SIZE] IBSS_ATTR;
-#ifdef PLUGIN_USE_IRAM
+#ifdef USE_IRAM
 static int16_t iram_audio_data[BUFFER_SIZE] IBSS_ATTR;
 #else
 #define iram_audio_data audio_data[audio_head]
@@ -1047,7 +1047,7 @@ static void record_and_get_pitch(void)
             #ifdef HAVE_SCHEDULER_BOOSTCTRL
                 rb->trigger_cpu_boost();
             #endif
-#ifdef PLUGIN_USE_IRAM
+#ifdef USE_IRAM
                 rb->memcpy(iram_audio_data, audio_data[audio_head],
                            settings.sample_size * sizeof (int16_t));
 #endif
diff --git a/apps/plugins/plugin_crt0.c b/apps/plugins/plugin_crt0.c
index 934f4e9338..4358f65aa9 100644
--- a/apps/plugins/plugin_crt0.c
+++ b/apps/plugins/plugin_crt0.c
@@ -74,7 +74,7 @@ enum plugin_status plugin__start(const void *param)
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 
 /* IRAM must be copied before clearing the BSS ! */
-#ifdef PLUGIN_USE_IRAM
+#ifdef USE_IRAM
     extern char iramcopy[], iramstart[], iramend[], iedata[], iend[];
     size_t iram_size = iramend - iramstart;
     size_t ibss_size = iend - iedata;
@@ -92,7 +92,7 @@ enum plugin_status plugin__start(const void *param)
          */
         asm volatile ("" ::: "memory");
     }
-#endif /* PLUGIN_USE_IRAM */
+#endif /* USE_IRAM */
 
     /* zero out the bss section */
     rb->memset(plugin_bss_start, 0, plugin_end_addr - plugin_bss_start);
diff --git a/apps/plugins/test_mem.c b/apps/plugins/test_mem.c
index 3e5b8283b0..e7eb08608f 100644
--- a/apps/plugins/test_mem.c
+++ b/apps/plugins/test_mem.c
@@ -36,7 +36,7 @@
 static int loop_repeat_dram = LOOP_REPEAT_DRAM;
 static volatile int buf_dram[BUF_SIZE]           MEM_ALIGN_ATTR;
 
-#if defined(PLUGIN_USE_IRAM)
+#if defined(USE_IRAM)
 
 #if PLUGIN_BUFFER_SIZE <= 0x8000
 #define IBUF_SIZE (1<<12) /* 16 KB = (1<<12)*sizeof(int) */
@@ -231,7 +231,7 @@ enum plugin_status plugin_start(const void* parameter)
         ret |= test(buf_dram, BUF_SIZE, loop_repeat_dram, MEMSET);
         ret |= test(buf_dram, BUF_SIZE, loop_repeat_dram, MEMCPY);
         if (ret != 0 && loop_repeat_dram < MAX_REPEAT_DRAM) loop_repeat_dram *= 2;
-#if defined(PLUGIN_USE_IRAM)
+#if defined(USE_IRAM)
         TEST_MEM_PRINTF("IRAM cnt: %d size: %d MB", loop_repeat_iram, 
             (loop_repeat_iram*BUF_SIZE*sizeof(buf_iram[0]))>>20);
         ret = 0;
diff --git a/firmware/export/config.h b/firmware/export/config.h
index cf79b84fe2..040709af3f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1187,12 +1187,10 @@ Lyre prototype 1 */
     (CONFIG_CPU == PNX0101) || \
     (CONFIG_CPU == TCC7801)
 # define USE_IRAM
-# define PLUGIN_USE_IRAM
 
 /* AS3525 +2MB: core, plugins, codecs */
 #elif (CONFIG_CPU == AS3525) && (MEMORYSIZE > 2) && !defined(BOOTLOADER)
 # define USE_IRAM
-# define PLUGIN_USE_IRAM
 
 /* AS3525 2MB: core only */
 #elif (CONFIG_CPU == AS3525) && (MEMORYSIZE <= 2) && !defined(BOOTLOADER) && \
-- 
rockbox-cvs mailing list
[email protected]
https://lists.haxx.se/mailman/listinfo/rockbox-cvs
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.