8 files changed, 10 insertions, 25 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 66d614ec58..151cb1d04d 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -308,7 +308,6 @@ static const struct plugin_api rockbox_api = {
     mutex_init,
     mutex_lock,
     mutex_unlock,
-    align_buffer,
 #endif
 
     reset_poweroff_timer,
diff --git a/apps/plugin.h b/apps/plugin.h
index 6b198686f2..7bb1c7fc5f 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -126,12 +126,12 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 135
+#define PLUGIN_API_VERSION 136
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 135
+#define PLUGIN_MIN_API_VERSION 136
 
 /* plugin return codes */
 enum plugin_status {
@@ -419,7 +419,6 @@ struct plugin_api {
     void (*mutex_init)(struct mutex *m);
     void (*mutex_lock)(struct mutex *m);
     void (*mutex_unlock)(struct mutex *m);
-    size_t (*align_buffer)(void **start, size_t size, size_t align);
 #endif
 
     void (*reset_poweroff_timer)(void);
@@ -884,13 +883,5 @@ enum plugin_status plugin_start(const struct plugin_api* rockbox, const void* pa
 
 #endif /* CACHE_FUNCTION_WRAPPERS */
 
-#ifndef ALIGN_BUFFER_WRAPPER
-#define ALIGN_BUFFER_WRAPPER(api) \
-        size_t align_buffer(void **start, size_t size, size_t align) \
-        { \
-            return (api)->align_buffer(start, size, align); \
-        }
-#endif /* ALIGN_BUFFER_WRAPPER */
-
 #endif /* __PCTOOL__ */
 #endif
diff --git a/apps/plugins/lib/wrappers.h b/apps/plugins/lib/wrappers.h
index 2eb4ea025e..385cd5d613 100644
--- a/apps/plugins/lib/wrappers.h
+++ b/apps/plugins/lib/wrappers.h
@@ -36,9 +36,6 @@
 #define cpu_boost rb->cpu_boost
 #endif
 #define yield rb->yield
-#if CONFIG_CODEC == SWCODEC
-#define align_buffer rb->align_buffer
-#endif
 
 #endif
 
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c
index c4f936ee14..6b50b8f24c 100644
--- a/apps/plugins/mpegplayer/alloc.c
+++ b/apps/plugins/mpegplayer/alloc.c
@@ -27,6 +27,7 @@
 
 #include "plugin.h"
 #include "mpegplayer.h"
+#include <system.h>
 
 /* Main allocator */
 static off_t mem_ptr;
@@ -132,8 +133,8 @@ bool mpeg_alloc_init(unsigned char *buf, size_t mallocsize)
     mem_ptr = 0;
     /* Cache-align buffer or 4-byte align */
     mallocbuf = buf;
-    bufsize = align_buffer(PUN_PTR(void **, &mallocbuf),
-                           mallocsize, CACHEALIGN_UP(4));
+    bufsize = mallocsize;
+    ALIGN_BUFFER(mallocbuf, bufsize, CACHEALIGN_UP(4));
 
     /* Separate allocator for video */
     mpeg2_mem_ptr = 0;
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c
index c008139356..defd8ef81d 100644
--- a/apps/plugins/mpegplayer/disk_buf.c
+++ b/apps/plugins/mpegplayer/disk_buf.c
@@ -22,6 +22,7 @@
  ****************************************************************************/
 #include "plugin.h"
 #include "mpegplayer.h"
+#include <system.h>
 
 static struct mutex disk_buf_mtx SHAREDBSS_ATTR;
 static struct event_queue disk_buf_queue SHAREDBSS_ATTR;
@@ -859,7 +860,7 @@ bool disk_buf_init(void)
         return false;
 
 #ifdef PROC_NEEDS_CACHEALIGN
-    disk_buf.size = CACHEALIGN_BUFFER(&disk_buf.start, disk_buf.size);
+    CACHEALIGN_BUFFER(disk_buf.start, disk_buf.size);
     disk_buf.start = UNCACHED_ADDR(disk_buf.start);
 #endif
     disk_buf.size -= DISK_GUARDBUF_SIZE;
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index cb5d4edb76..0b5bb518fe 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -283,7 +283,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 const struct plugin_api* rb;
 
 CACHE_FUNCTION_WRAPPERS(rb);
-ALIGN_BUFFER_WRAPPER(rb);
 
 /* One thing we can do here for targets with remotes is having a display
  * always on the remote instead of always forcing a popup on the main display */
diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c
index 83ab1ddef0..a3552836fa 100644
--- a/apps/plugins/pictureflow.c
+++ b/apps/plugins/pictureflow.c
@@ -2144,8 +2144,7 @@ enum plugin_status plugin_start(const struct plugin_api *api,
     rb->cpu_boost(true);
 #endif
     plugin_buf = rb->plugin_get_buffer(&plugin_buf_size);
-    plugin_buf_size = rb->align_buffer(PUN_PTR(void**,&plugin_buf),
-                                       plugin_buf_size, 4);
+    ALIGN_BUFFER(plugin_buf, plugin_buf_size, 4);
     ret = main();
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
     rb->cpu_boost(false);
diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c
index 99ccc84d55..2e6c3ff266 100644
--- a/apps/recorder/resize.c
+++ b/apps/recorder/resize.c
@@ -31,6 +31,7 @@
  *
  ****************************************************************************/
 
+#include <system.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -616,10 +617,7 @@ int resize_on_load(struct bitmap *bm, bool dither, struct dim *src,
     uint8_t sc_buf[(needed <= len  || needed > MAX_SC_STACK_ALLOC) ?
                    0 : needed];
 #endif
-#if CONFIG_CODEC == SWCODEC
-    len = (unsigned int)align_buffer(PUN_PTR(void**, &buf), len,
-                                         sizeof(uint32_t));
-#endif
+    ALIGN_BUFFER(buf, len, sizeof(uint32_t));
     if (needed > len)
     {
 #if MAX_SC_STACK_ALLOC