diff options
| author | Tectu <joel@unormal.org> | 2012-08-02 06:56:54 -0700 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-08-02 06:56:54 -0700 |
| commit | 09390d919c668cef03918f6d333ece63db7f45f8 (patch) | |
| tree | 5cecfd47bb155b355561e18a6ad4774e8d26d1c9 /halext/include | |
| parent | 837c444c4f03317f6ec13aa069c65de424e6832a (diff) | |
| parent | af3abeebad264a1284b27efd10819bc7f94071f1 (diff) | |
| download | uGFX-09390d919c668cef03918f6d333ece63db7f45f8.tar.gz uGFX-09390d919c668cef03918f6d333ece63db7f45f8.tar.bz2 uGFX-09390d919c668cef03918f6d333ece63db7f45f8.zip | |
Merge pull request #26 from inmarket/master
New low level driver gdispNokia6610, removed dud Nokia6100, small syntax fix for some pixel formats
Diffstat (limited to 'halext/include')
| -rw-r--r-- | halext/include/gdisp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/halext/include/gdisp.h b/halext/include/gdisp.h index 12f9995c..1d1e71bc 100644 --- a/halext/include/gdisp.h +++ b/halext/include/gdisp.h @@ -209,7 +209,7 @@ #elif defined(GDISP_PIXELFORMAT_RGB888) typedef uint32_t color_t; - #define COLOR(c) ((color_t)(((c) & 0xFFFFFF)) + #define COLOR(c) ((color_t)(((c) & 0xFFFFFF))) #define MASKCOLOR TRUE #define RGB2COLOR(r,g,b) ((color_t)((((r) & 0xFF)<<16) | (((g) & 0xFF) << 8) | ((b) & 0xFF))) #define HTML2COLOR(h) ((color_t)(h)) @@ -219,10 +219,10 @@ #elif defined(GDISP_PIXELFORMAT_RGB444) typedef uint16_t color_t; - #define COLOR(c) ((color_t)(((c) & 0x0FFF)) + #define COLOR(c) ((color_t)(((c) & 0x0FFF))) #define MASKCOLOR TRUE - #define RGB2COLOR(r,g,b) ((color_t)((((r) & 0xF0)<<4) | ((g) & 0xF0) | (((b) & 0xF0)>>4)) - #define HTML2COLOR(h) ((color_t)((((h) & 0xF00000)>>12) | (((h) & 0x00F000)>>8) | (((h) & 0x0000F0)>>4)) + #define RGB2COLOR(r,g,b) ((color_t)((((r) & 0xF0)<<4) | ((g) & 0xF0) | (((b) & 0xF0)>>4))) + #define HTML2COLOR(h) ((color_t)((((h) & 0xF00000)>>12) | (((h) & 0x00F000)>>8) | (((h) & 0x0000F0)>>4))) #define RED_OF(c) (((c) & 0x0F00)>>4) #define GREEN_OF(c) ((c)&0x00F0) #define BLUE_OF(c) (((c)&0x000F)<<4) @@ -231,15 +231,15 @@ typedef uint8_t color_t; #define COLOR(c) ((color_t)(c)) #define MASKCOLOR FALSE - #define RGB2COLOR(r,g,b) ((color_t)(((r) & 0xE0) | (((g) & 0xE0)>>3) | (((b) & 0xC0)>>6)) - #define HTML2COLOR(h) ((color_t)((((h) & 0xE00000)>>16) | (((h) & 0x00E000)>>11) | (((h) & 0x0000C0)>>6)) + #define RGB2COLOR(r,g,b) ((color_t)(((r) & 0xE0) | (((g) & 0xE0)>>3) | (((b) & 0xC0)>>6))) + #define HTML2COLOR(h) ((color_t)((((h) & 0xE00000)>>16) | (((h) & 0x00E000)>>11) | (((h) & 0x0000C0)>>6))) #define RED_OF(c) ((c) & 0xE0) #define GREEN_OF(c) (((c)&0x1C)<<3) #define BLUE_OF(c) (((c)&0x03)<<6) #elif defined(GDISP_PIXELFORMAT_RGB666) typedef uint32_t color_t; - #define COLOR(c) ((color_t)(((c) & 0x03FFFF)) + #define COLOR(c) ((color_t)(((c) & 0x03FFFF))) #define MASKCOLOR TRUE #define RGB2COLOR(r,g,b) ((color_t)((((r) & 0xFC)<<10) | (((g) & 0xFC)<<4) | (((b) & 0xFC)>>2))) #define HTML2COLOR(h) ((color_t)((((h) & 0xFC0000)>>6) | (((h) & 0x00FC00)>>4) | (((h) & 0x0000FC)>>2))) |