From c773eed3e1dcde1d248dac7008cb29cd8aaae288 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 13 Apr 2008 11:57:11 +0000 Subject: The greylib now takes care of the necessary aligment and uncached addressing itself, so simplify the code a bit. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17094 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/stream_mgr.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/apps/plugins/mpegplayer/stream_mgr.c b/apps/plugins/mpegplayer/stream_mgr.c index 24e820b0af..c9601b8593 100644 --- a/apps/plugins/mpegplayer/stream_mgr.c +++ b/apps/plugins/mpegplayer/stream_mgr.c @@ -993,33 +993,19 @@ int stream_init(void) /* Initialize non-allocator blocks first */ #ifndef HAVE_LCD_COLOR - bool success; - long graysize; - void *graymem; - -#ifdef PROC_NEEDS_CACHEALIGN - /* This can run on another processor - align data */ - memsize = CACHEALIGN_BUFFER(&mem, memsize); - graymem = UNCACHED_ADDR(mem); -#else - graymem = mem; -#endif - - success = grey_init(rb, graymem, memsize, GREY_BUFFERED|GREY_ON_COP, - LCD_WIDTH, LCD_HEIGHT, &graysize); - - /* This can run on another processor - align size */ - graysize = CACHEALIGN_UP(graysize); + long greysize; - mem += graysize; - memsize -= graysize; - - if (!success || (ssize_t)memsize <= 0) + /* Greylib init handles all necessary cache alignment */ + if (!grey_init(rb, mem, memsize, GREY_BUFFERED|GREY_ON_COP, + LCD_WIDTH, LCD_HEIGHT, &greysize)) { rb->splash(HZ, "greylib init failed!"); return STREAM_ERROR; } + mem += greysize; + memsize -= greysize; + grey_clear_display(); #endif /* !HAVE_LCD_COLOR */ -- cgit v1.2.3