summaryrefslogtreecommitdiffstats
path: root/apps/plugins/mpegplayer
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-01-13 13:48:26 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-01-13 13:48:26 +0000
commit2fbf09752d385af861279af195d68f920859202d (patch)
tree98bf09ebc24217d122b61c2a079337b793c35d9b /apps/plugins/mpegplayer
parentc0d9084d6a5182460da0472a4e88d6d078adb86e (diff)
downloadrockbox-2fbf09752d385af861279af195d68f920859202d.tar.gz
rockbox-2fbf09752d385af861279af195d68f920859202d.zip
remove align_buffer from firmare/general.c, replacing with ALIGN_BUFFER macro, and replace all uses of it (only resize.c in core, and pictureflow and mpegplayer plugins), remove it from plugin_api,
and remove wrapper for it from plugin.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19758 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r--apps/plugins/mpegplayer/alloc.c5
-rw-r--r--apps/plugins/mpegplayer/disk_buf.c3
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c1
3 files changed, 5 insertions, 4 deletions
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 */