From 25123570c76f2055d3ae05d79741038c0e23c536 Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Fri, 4 Sep 2009 00:46:24 +0000 Subject: Fix STRIDE macro for multiscreen and add stride support for picture lib. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/lcd.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 3d391d6685..3f3d8f875f 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -306,13 +306,25 @@ static inline unsigned lcd_color_to_native(unsigned color) #endif /* HAVE_LCD_COLOR */ +enum screen_type { + SCREEN_MAIN +#ifdef HAVE_REMOTE_LCD + ,SCREEN_REMOTE +#endif +}; + /* Frame buffer stride */ +#define STRIDE_REMOTE(w, h) (w) + #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE -#define STRIDE(w, h) (h) +#define STRIDE_MAIN(w, h) (h) #else -#define STRIDE(w, h) (w) +#define STRIDE_MAIN(w, h) (w) #endif +#define STRIDE(screen, w, h) (screen==SCREEN_MAIN?STRIDE_MAIN((w), \ + (h)):STRIDE_REMOTE((w),(h))) + /* Frame buffer dimensions */ #if LCD_DEPTH == 1 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING -- cgit v1.2.3