phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Move rgbcolors.h to include/nuttx/video

This commit is contained in:
Gregory Nutt 2013-12-10 09:29:20 -06:00
parent d9a577eb09
commit 9a62492625
42 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
View File

@ -47,7 +47,7 @@
#include <fixedmath.h>
#include <debug.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxglib.h>
#include "nxconfig.hxx"

2
NxWidgets/libnxwidgets/include/nxconfig.hxx
View File

@ -45,7 +45,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxfonts.h>
/****************************************************************************

2
NxWidgets/libnxwidgets/src/cgraphicsport.cxx
View File

@ -80,7 +80,7 @@
#include <debug.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "inxwindow.hxx"

2
NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_arrowright.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_arrowup.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_backspace.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_capslock.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_control.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_cycle.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "crlepalettebitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "crlepalettebitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_return.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_shift.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_windowclose.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx
View File

@ -79,7 +79,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "nxconfig.hxx"
#include "cbitmap.hxx"

2
NxWidgets/nxwm/src/glyph_calculator.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_calibration.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_cmd.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_mediaplayer.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_minimize.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_nsh.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_play24x24.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_start.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
NxWidgets/nxwm/src/glyph_stop.cxx
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/fb.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include "crlepalettebitmap.hxx"

2
apps/examples/nxconsole/nxcon_internal.h
View File

@ -46,7 +46,7 @@
#include <stdbool.h>
#include <semaphore.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>

2
apps/examples/nxlines/nxlines.h
View File

@ -48,7 +48,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
/****************************************************************************
* Definitions

6
nuttx/ChangeLog
View File

@ -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).

2
nuttx/configs/sam3u-ek/src/up_lcd.c
View File

@ -119,7 +119,7 @@
#include <nuttx/arch.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/rgbcolors.h>
#include <nuttx/video/rgbcolors.h>
#include <arch/irq.h>

8
nuttx/include/nuttx/rgbcolors.h → nuttx/include/nuttx/video/rgbcolors.h
View File

@ -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 */