From c069817f0c91ebbc8baa67cfade692f263a90d05 Mon Sep 17 00:00:00 2001 From: Andrew Hannam Date: Sat, 10 Nov 2012 15:11:39 +1000 Subject: Removed some hardware dependancies in HL drivers Removed some hardware dependancies in high level drivers that had crept in over time. --- include/gdisp.h | 1 + include/gdisp_lld.h | 2 -- include/gwin.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/gdisp.h b/include/gdisp.h index 9be97a12..db865284 100644 --- a/include/gdisp.h +++ b/include/gdisp.h @@ -293,6 +293,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); /* Now obsolete functions */ #define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer) +#define RGB565CONVERT(r,g,b) RGB2COLOR(r,g,b) /* Macro definitions for common gets and sets */ #define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode)) diff --git a/include/gdisp_lld.h b/include/gdisp_lld.h index 8b7dd0e7..1a78e448 100644 --- a/include/gdisp_lld.h +++ b/include/gdisp_lld.h @@ -468,8 +468,6 @@ #define RED_OF(c) (((c) & 0xF800)>>8) #define GREEN_OF(c) (((c)&0x007E)>>3) #define BLUE_OF(c) (((c)&0x001F)<<3) - #define RGB565CONVERT(red, green, blue) (uint16_t)( (( red >> 3 ) << 11 ) | (( green >> 2 ) << 5 ) | ( blue >> 3 )) - #elif GDISP_PIXELFORMAT == GDISP_PIXELFORMAT_RGB888 typedef uint32_t color_t; diff --git a/include/gwin.h b/include/gwin.h index 79b8371c..37fecab4 100644 --- a/include/gwin.h +++ b/include/gwin.h @@ -66,7 +66,7 @@ /* Low Level Driver details and error checks. */ /*===========================================================================*/ -#if !defined(GFX_USE_GDISP) +#if !defined(GFX_USE_GDISP) || !GFX_USE_GDISP #error "GWIN: GFX_USE_GDISP must also be defined" #endif #include "gdisp.h" -- cgit v1.2.3