forked from len0rd/rockbox
Convert some more stuff to mylcd_ and support pgfx as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26543 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis
parent
bc26fe7a96
commit
e63e84a5df
16 changed files with 224 additions and 214 deletions
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* Copyright (c) 2010 Michael Sevakis
|
||||
*
|
||||
* Helper defines for writing code for both grey and color targets.
|
||||
* Helper defines for writing code for pgfx, grey and color targets.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
@ -24,63 +24,90 @@
|
|||
#define MYLCD_H
|
||||
|
||||
/***
|
||||
* Most functions are, other than color depth, equivalent between grey, lcd
|
||||
* and xlcd and most of the time the caller need not be concerned with which
|
||||
* is actually called, making code nicer to read and maintain.
|
||||
* Most functions are, other than color depth, equivalent between pgfx, grey,
|
||||
* lcd and xlcd and most of the time the caller need not be concerned with
|
||||
* which is actually called, making code nicer to read and maintain.
|
||||
*
|
||||
* Unbuffered routines revert to standard rb->lcd_XXXX funtions on color
|
||||
* targets. On color, mylcd_ub_update_XXXX refer to the proper update
|
||||
* functions, otherwise they are no-ops.
|
||||
*
|
||||
* lib/playergfx.h or lib/grey.h should be included before including this
|
||||
* header. For bitmap LCD's, defaults to rb->lcd_XXXX otherwise.
|
||||
*/
|
||||
#if defined (HAVE_LCD_CHARCELLS) && defined(__PGFX_H__)
|
||||
#define MYLCD_CFG_PGFX /* using PGFX */
|
||||
#define mylcd_(fn) pgfx_##fn
|
||||
#define mylcd_ub_(fn) pgfx_##fn
|
||||
|
||||
#ifdef HAVE_LCD_COLOR
|
||||
#define mylcd_(fn) rb->lcd_##fn
|
||||
#define myxlcd_(fn) xlcd_##fn
|
||||
#define mylcd_ub_(fn) rb->lcd_##fn
|
||||
#define myxlcd_ub_(fn) xlcd_##fn
|
||||
#else
|
||||
#elif defined (HAVE_LCD_BITMAP) && (LCD_DEPTH < 8) && defined(__GREY_H__)
|
||||
#define MYLCD_CFG_GREYLIB /* using greylib */
|
||||
#define mylcd_(fn) grey_##fn
|
||||
#define myxlcd_(fn) grey_##fn
|
||||
#define mylcd_ub_(fn) grey_ub_##fn
|
||||
#define myxlcd_ub_(fn) grey_ub_##fn
|
||||
#endif
|
||||
|
||||
/* Common colors */
|
||||
#ifdef HAVE_LCD_COLOR
|
||||
#define MYLCD_BLACK LCD_BLACK
|
||||
#define MYLCD_DARKGRAY LCD_DARKGRAY
|
||||
#define MYLCD_LIGHTGRAY LCD_LIGHTGRAY
|
||||
#define MYLCD_WHITE LCD_WHITE
|
||||
#define MYLCD_DEFAULT_FG LCD_DEFAULT_FG
|
||||
#define MYLCD_DEFAULT_BG LCD_DEFAULT_BG
|
||||
#else
|
||||
#define MYLCD_BLACK GREY_BLACK
|
||||
#define MYLCD_DARKGRAY GREY_DARKGRAY
|
||||
#define MYLCD_LIGHTGRAY GREY_LIGHTGRAY
|
||||
#define MYLCD_WHITE GREY_WHITE
|
||||
#define MYLCD_DEFAULT_FG GREY_BLACK
|
||||
#define MYLCD_DEFAULT_BG GREY_WHITE
|
||||
#endif /* HAVE_LCD_COLOR */
|
||||
|
||||
#elif defined (HAVE_LCD_BITMAP)
|
||||
#define MYLCD_CFG_RB_XLCD /* using standard (X)LCD routines */
|
||||
#define mylcd_(fn) rb->lcd_##fn
|
||||
#define myxlcd_(fn) xlcd_##fn
|
||||
#define mylcd_ub_(fn) rb->lcd_##fn
|
||||
#define myxlcd_ub_(fn) xlcd_##fn
|
||||
|
||||
/* Common colors */
|
||||
#define MYLCD_BLACK LCD_BLACK
|
||||
#define MYLCD_DARKGRAY LCD_DARKGRAY
|
||||
#define MYLCD_LIGHTGRAY LCD_LIGHTGRAY
|
||||
#define MYLCD_WHITE LCD_WHITE
|
||||
#define MYLCD_DEFAULT_FG LCD_DEFAULT_FG
|
||||
#define MYLCD_DEFAULT_BG LCD_DEFAULT_BG
|
||||
|
||||
#else
|
||||
#error Configuration not supported! Did you forget to include the correct lib header?
|
||||
#endif /* end LCD type selection */
|
||||
|
||||
/* Update functions */
|
||||
#define mylcd_update mylcd_(update)
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_update_rect mylcd_(update_rect)
|
||||
|
||||
/* Update functions - unbuffered : special handling for these */
|
||||
#ifdef HAVE_LCD_COLOR
|
||||
#define mylcd_ub_update() rb->lcd_update()
|
||||
#define mylcd_ub_update_rect(...) rb->lcd_update_rect(__VA_ARGS__)
|
||||
#else
|
||||
/* Still evaluate args like functions */
|
||||
static inline void mylcd_update_rect(int x, int y, int w, int h)
|
||||
{ (void)x; (void)y; (void)w; (void)h; pgfx_update(); }
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Update functions - unbuffered : special handling for these
|
||||
* It is desirable to still evaluate arguments even if there will
|
||||
* be no function call, just in case they have side-effects.
|
||||
*/
|
||||
#if defined (MYLCD_CFG_PGFX)
|
||||
#define mylcd_ub_update pgfx_update
|
||||
static inline void mylcd_ub_update_rect(int x, int y, int w, int h)
|
||||
{ (void)x; (void)y; (void)w; (void)h; pgfx_update(); }
|
||||
|
||||
#elif defined (MYLCD_CFG_GREYLIB)
|
||||
static inline void mylcd_ub_update(void)
|
||||
{}
|
||||
static inline void mylcd_ub_update_rect(int x, int y, int w, int h)
|
||||
{ (void)x; (void)y; (void)w; (void)h; }
|
||||
|
||||
#else /* color or RB default */
|
||||
#define mylcd_ub_update rb->lcd_update
|
||||
#define mylcd_ub_update_rect rb->lcd_update_rect
|
||||
#endif
|
||||
|
||||
/* Parameter handling */
|
||||
#define mylcd_set_drawmode mylcd_(set_drawmode)
|
||||
#define mylcd_get_drawmode mylcd_(get_drawmode)
|
||||
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_set_foreground mylcd_(set_foreground)
|
||||
#define mylcd_get_foreground mylcd_(get_foreground)
|
||||
#define mylcd_set_background mylcd_(set_background)
|
||||
|
|
@ -88,6 +115,7 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h)
|
|||
#define mylcd_set_drawinfo mylcd_(set_drawinfo)
|
||||
#define mylcd_setfont mylcd_(setfont)
|
||||
#define mylcd_getstringsize mylcd_(getstringsize)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Whole display */
|
||||
#define mylcd_clear_display mylcd_(clear_display)
|
||||
|
|
@ -106,37 +134,50 @@ static inline void mylcd_ub_update_rect(int x, int y, int w, int h)
|
|||
|
||||
/* Filled Primitives */
|
||||
#define mylcd_fillrect mylcd_(fillrect)
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_filltriangle myxlcd_(filltriangle)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Bitmaps */
|
||||
#define mylcd_mono_bitmap_part mylcd_(mono_bitmap_part)
|
||||
#define mylcd_mono_bitmap mylcd_(mono_bitmap)
|
||||
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_gray_bitmap_part myxlcd_(gray_bitmap_part)
|
||||
#define mylcd_gray_bitmap myxlcd_(gray_bitmap)
|
||||
#if 0 /* possible, but not implemented in greylib */
|
||||
#define mylcd_color_bitmap_part myxlcd_(color_bitmap_part)
|
||||
#define mylcd_color_bitmap myxlcd_(color_bitmap)
|
||||
#endif
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Bitmaps - unbuffered */
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_ub_gray_bitmap_part myxlcd_ub_(gray_bitmap_part)
|
||||
#define mylcd_ub_gray_bitmap myxlcd_ub_(gray_bitmap)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Text */
|
||||
/* lcd_putsxyofs is static'ed in the core for now on color */
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_putsxyofs mylcd_(putsxyofs)
|
||||
#define mylcd_putsxy mylcd_(putsxy)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Scrolling */
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_scroll_left myxlcd_(scroll_left)
|
||||
#define mylcd_scroll_right myxlcd_(scroll_right)
|
||||
#define mylcd_scroll_up myxlcd_(scroll_up)
|
||||
#define mylcd_scroll_down myxlcd_(scroll_down)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
/* Scrolling - unbuffered */
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
#define mylcd_ub_scroll_left myxlcd_ub_(scroll_left)
|
||||
#define mylcd_ub_scroll_right myxlcd_ub_(scroll_right)
|
||||
#define mylcd_ub_scroll_up myxlcd_ub_(scroll_up)
|
||||
#define mylcd_ub_scroll_down myxlcd_ub_(scroll_down)
|
||||
#endif /* HAVE_LCD_BITMAP */
|
||||
|
||||
#endif /* MYLCD_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue