diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-13 13:48:26 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-13 13:48:26 +0000 |
commit | 2fbf09752d385af861279af195d68f920859202d (patch) | |
tree | 98bf09ebc24217d122b61c2a079337b793c35d9b /apps/plugins/mpegplayer/alloc.c | |
parent | c0d9084d6a5182460da0472a4e88d6d078adb86e (diff) | |
download | rockbox-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/alloc.c')
-rw-r--r-- | apps/plugins/mpegplayer/alloc.c | 5 |
1 files changed, 3 insertions, 2 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 @@ | |||
27 | 27 | ||
28 | #include "plugin.h" | 28 | #include "plugin.h" |
29 | #include "mpegplayer.h" | 29 | #include "mpegplayer.h" |
30 | #include <system.h> | ||
30 | 31 | ||
31 | /* Main allocator */ | 32 | /* Main allocator */ |
32 | static off_t mem_ptr; | 33 | static off_t mem_ptr; |
@@ -132,8 +133,8 @@ bool mpeg_alloc_init(unsigned char *buf, size_t mallocsize) | |||
132 | mem_ptr = 0; | 133 | mem_ptr = 0; |
133 | /* Cache-align buffer or 4-byte align */ | 134 | /* Cache-align buffer or 4-byte align */ |
134 | mallocbuf = buf; | 135 | mallocbuf = buf; |
135 | bufsize = align_buffer(PUN_PTR(void **, &mallocbuf), | 136 | bufsize = mallocsize; |
136 | mallocsize, CACHEALIGN_UP(4)); | 137 | ALIGN_BUFFER(mallocbuf, bufsize, CACHEALIGN_UP(4)); |
137 | 138 | ||
138 | /* Separate allocator for video */ | 139 | /* Separate allocator for video */ |
139 | mpeg2_mem_ptr = 0; | 140 | mpeg2_mem_ptr = 0; |