From beda9787b46ab94251642a2fa9c5878027430046 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 10 Dec 2013 09:29:20 -0600 Subject: [PATCH] Move rgbcolors.h to include/nuttx/video --- ChangeLog | 6 ++++-- configs/sam3u-ek/src/up_lcd.c | 2 +- include/nuttx/{ => video}/rgbcolors.h | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) rename include/nuttx/{ => video}/rgbcolors.h (98%) diff --git a/ChangeLog b/ChangeLog index c6c3819a4a..9928ba3e50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2172,7 +2172,7 @@ interfaces to read from graphics memory * graphics/nxbe/nxbe_bitmap.c: Fix an error in the error handling that can cause valid bitmaps to fail to render. - * include/nuttx/rgbcolors.h: Fix errors in some 16- and 8-bit color + * include/nuttx/video/rgbcolors.h: Fix errors in some 16- and 8-bit color conversion macros. * tools/incdir.sh: Fix issues when g++ is used as the compiler. It was not being recognized and handled properly. @@ -2192,7 +2192,7 @@ supports using "clusters" of AT24 pages as blocks. This allows bigger block sizes and more efficient use of EEPROM when the AT24 is used to support a file system (such as NXFFS). (Contributed by Hal Glenn). - * include/nuttx/rgbcolors.h: More fixes to RGB color conversion + * include/nuttx/video/rgbcolors.h: More fixes to RGB color conversion macros. * arch/arm/src/common/up_createstack.c and up_usestack.c: For ARM EABI the stack must be aligned to 8-byte boundaries. This is necessary for @@ -6187,4 +6187,6 @@ header file (2013-12-9). * include/nuttx/video/fb.h: Move fb.h to include/nuttx/video/ (2013-12-10). + * include/nuttx/video/rgbcolors.h: Move rgbcolors.h to include/nuttx/video. + (2013-12-10). diff --git a/configs/sam3u-ek/src/up_lcd.c b/configs/sam3u-ek/src/up_lcd.c index 6cfb087200..780abe0490 100644 --- a/configs/sam3u-ek/src/up_lcd.c +++ b/configs/sam3u-ek/src/up_lcd.c @@ -119,7 +119,7 @@ #include #include -#include +#include #include diff --git a/include/nuttx/rgbcolors.h b/include/nuttx/video/rgbcolors.h similarity index 98% rename from include/nuttx/rgbcolors.h rename to include/nuttx/video/rgbcolors.h index b4b8826d49..a4a9e4ff6f 100644 --- a/include/nuttx/rgbcolors.h +++ b/include/nuttx/video/rgbcolors.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/rgbcolors.h + * include/nuttx/video/rgbcolors.h * User-friendly RGB color definitions * * Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_RGBCOLOR_H -#define __INCLUDE_NUTTX_RGBCOLOR_H +#ifndef __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H +#define __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H /**************************************************************************** * Included Files @@ -313,4 +313,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_RGBCOLOR_H */ +#endif /* __INCLUDE_NUTTX_VIDEO_RGBCOLOR_H */