diff options
72 files changed, 81 insertions, 79 deletions
diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx index ec2a6baf0..acff11f6a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx index 6b3e8ee92..5a00ecca9 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx index 74763a6fd..e80966ab7 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx index 9ec840d43..ee9add5b2 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx index 967963347..e7cabef29 100644 --- a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx index 663e601f0..29281e9df 100644 --- a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx index 681c17445..1068b7e45 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx index 250d2455e..7be6a50b2 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include "nxconfig.hxx" #include "cbitmap.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx index 5b9c18b78..bbf37ddcd 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_control.cxx b/NxWidgets/libnxwidgets/src/glyph_control.cxx index ffbdf965b..028a7197c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_control.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_control.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx index d706adddb..4b0adac84 100644 --- a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx index bd6d280b9..e4f043936 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx index 174c69355..68c081a28 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx index a9e4d6708..58888194d 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx index 029b93896..4fc90a333 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx index 242f6f373..b634af053 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_return.cxx b/NxWidgets/libnxwidgets/src/glyph_return.cxx index 47314f65c..7a8eba024 100644 --- a/NxWidgets/libnxwidgets/src/glyph_return.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_return.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx index c3f0e15ee..495c68cda 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx index e4574a367..b5c389f9c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx index 253ad6afb..d775d0e50 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx index 63b58a4a6..7f412345f 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_shift.cxx b/NxWidgets/libnxwidgets/src/glyph_shift.cxx index 193fd1719..48515b13c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_shift.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_shift.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx index 3a60aa137..0600d2537 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx index d75b7d676..195002630 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx index f5d67e968..b182a861c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx @@ -78,7 +78,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "nxconfig.hxx" diff --git a/NxWidgets/nxwm/src/glyph_calculator.cxx b/NxWidgets/nxwm/src/glyph_calculator.cxx index 3d8bb97bd..e10bce74f 100644 --- a/NxWidgets/nxwm/src/glyph_calculator.cxx +++ b/NxWidgets/nxwm/src/glyph_calculator.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_calibration.cxx b/NxWidgets/nxwm/src/glyph_calibration.cxx index fab2902fe..be9d8de0a 100644 --- a/NxWidgets/nxwm/src/glyph_calibration.cxx +++ b/NxWidgets/nxwm/src/glyph_calibration.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_cmd.cxx b/NxWidgets/nxwm/src/glyph_cmd.cxx index 816c888c5..a424fe6f3 100644 --- a/NxWidgets/nxwm/src/glyph_cmd.cxx +++ b/NxWidgets/nxwm/src/glyph_cmd.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_mediaplayer.cxx b/NxWidgets/nxwm/src/glyph_mediaplayer.cxx index e7b55a74e..77e933915 100644 --- a/NxWidgets/nxwm/src/glyph_mediaplayer.cxx +++ b/NxWidgets/nxwm/src/glyph_mediaplayer.cxx @@ -47,7 +47,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx index 4dd95f9f2..0c45a2f77 100644 --- a/NxWidgets/nxwm/src/glyph_minimize.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx index 4f6a387c1..505d87733 100644 --- a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx +++ b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx @@ -47,7 +47,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx index 69bccd344..5fa464854 100644 --- a/NxWidgets/nxwm/src/glyph_nsh.cxx +++ b/NxWidgets/nxwm/src/glyph_nsh.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_play24x24.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx index 7ccce5e89..e16e3b505 100644 --- a/NxWidgets/nxwm/src/glyph_play24x24.cxx +++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx index e7937faea..db2ffaf94 100644 --- a/NxWidgets/nxwm/src/glyph_start.cxx +++ b/NxWidgets/nxwm/src/glyph_start.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx index a60b75ce8..df7e02268 100644 --- a/NxWidgets/nxwm/src/glyph_stop.cxx +++ b/NxWidgets/nxwm/src/glyph_stop.cxx @@ -44,7 +44,7 @@ #include <stdbool.h> #include <nuttx/nx/nxglib.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/rgbcolors.h> #include "crlepalettebitmap.hxx" diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index 147994ebb..92328d2a1 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -54,7 +54,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nx/nx_server.c b/apps/examples/nx/nx_server.c index 7f3ee5dfc..0cf3066de 100644 --- a/apps/examples/nx/nx_server.c +++ b/apps/examples/nx/nx_server.c @@ -52,7 +52,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include "nx_internal.h" diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 41d8efd19..02546750e 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -54,7 +54,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nxconsole/nxcon_server.c b/apps/examples/nxconsole/nxcon_server.c index ccd000ec0..e42271c1f 100644 --- a/apps/examples/nxconsole/nxcon_server.c +++ b/apps/examples/nxconsole/nxcon_server.c @@ -52,7 +52,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include "nxcon_internal.h" diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c index 6ee6c69b2..23288da7d 100644 --- a/apps/examples/nxhello/nxhello_main.c +++ b/apps/examples/nxhello/nxhello_main.c @@ -55,7 +55,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c index c432d8a73..a32ea2a89 100644 --- a/apps/examples/nximage/nximage_main.c +++ b/apps/examples/nximage/nximage_main.c @@ -55,7 +55,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nxlines/nxlines_main.c b/apps/examples/nxlines/nxlines_main.c index e4632bb21..93e0436d8 100644 --- a/apps/examples/nxlines/nxlines_main.c +++ b/apps/examples/nxlines/nxlines_main.c @@ -53,7 +53,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index 2a1b50355..9bb94dcb8 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -55,7 +55,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include <nuttx/arch.h> diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c index a464628e1..119c1a412 100644 --- a/apps/examples/nxtext/nxtext_server.c +++ b/apps/examples/nxtext/nxtext_server.c @@ -52,7 +52,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif #include "nxtext_internal.h" diff --git a/apps/graphics/screenshot/Kconfig b/apps/graphics/screenshot/Kconfig index 48cd367a6..642e75768 100644 --- a/apps/graphics/screenshot/Kconfig +++ b/apps/graphics/screenshot/Kconfig @@ -28,7 +28,7 @@ config SCREENSHOT_FORMAT int "Screenshot color format" default 9 ---help--- - See inlcude/nuttx/fb.h for a list of color formats. The default + See inlcude/nuttx/video/fb.h for a list of color formats. The default value of 9 corresponds to FB_FMT_RGB16_565 endif diff --git a/apps/include/tiff.h b/apps/include/tiff.h index 378af9fe0..e4567641f 100644 --- a/apps/include/tiff.h +++ b/apps/include/tiff.h @@ -298,7 +298,7 @@ struct tiff_info_s * * colorfmt - Specifies the form of the color data that will be provided * in the strip data. These are the FB_FMT_* definitions - * provided in include/nuttx/fb.h. Only the following values + * provided in include/nuttx/video/fb.h. Only the following values * are supported: * * FB_FMT_Y1 BPP=1, monochrome, 0=black @@ -316,7 +316,7 @@ struct tiff_info_s FAR const char *tmpfile1; /* Full path to first temporary file */ FAR const char *tmpfile2; /* Full path to second temporary file */ - uint8_t colorfmt; /* See FB_FMT_* definitions in include/nuttx/fb.h */ + uint8_t colorfmt; /* See FB_FMT_* definitions in include/nuttx/video/fb.h */ nxgl_coord_t rps; /* TIFF RowsPerStrip */ nxgl_coord_t imgwidth; /* TIFF ImageWidth, Number of columns in the image */ nxgl_coord_t imgheight; /* TIFF ImageLength, Number of rows in the image */ diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 174876fc2..c6c3819a4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1465,7 +1465,7 @@ Dean Camera. * examples/nsh: Correct an usage of getopt(): If you stop calling getopt() before all parameters are parsed, you can leave getopt() in a strange state. - * include/nuttx/fb.h: Restore missing RGB type that was accidentally removed + * include/nuttx/video/fb.h: Restore missing RGB type that was accidentally removed when Nokia 6100 support was added. * Rename arch/pjrc-8051 to arch/8051 * configs/ne64badge: Add a configuration for the Future Electronics Group @@ -6185,4 +6185,6 @@ ISI peripheral usign the OV2640 camera (2013-12-9). * arch/arm/src/a1x/chip/a1x_uart.h: A10 UART register definition header file (2013-12-9). + * include/nuttx/video/fb.h: Move fb.h to include/nuttx/video/ + (2013-12-10). diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 4f7833acd..7da1c86f7 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -282,7 +282,7 @@ <ul> <li> Any device with random accesss video memory using the NuttX framebuffer driver interface - (see <code>include/nuttx/fb.h</code>). + (see <code>include/nuttx/video/fb.h</code>). </li> <li> Any LCD-like device than can accept raster line <i>runs</i> through a parallel or serial interface @@ -3235,7 +3235,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <dd>If a pixel depth of less than 8-bits is used, then NX needs to know if the pixels pack from the MS to LS or from LS to MS <dt><code>CONFIG_NX_LCDDRIVER</code>: - <dd>By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>). + <dd>By default, NX builds to use a framebuffer driver (see <code>include/nuttx/video/fb.h</code>). If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd/lcd.h</code>). </li> </dl> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 89f9ff35f..55b6978ff 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -3085,7 +3085,7 @@ extern void up_ledoff(int led); <ul> <li> <p> - <b><code>include/nuttx/fb.h</code></b>. + <b><code>include/nuttx/video/fb.h</code></b>. All structures and APIs needed to work with frame buffer drivers are provided in this header file. </p> </li> @@ -3147,7 +3147,7 @@ extern void up_ledoff(int led); <p> <b><code>include/nuttx/lcd/lcd.h</code></b>. Structures and APIs needed to work with LCD drivers are provided in this header file. - This header file also depends on some of the same definitions used for the frame buffer driver as privided in <code>include/nuttx/fb.h</code>. + This header file also depends on some of the same definitions used for the frame buffer driver as privided in <code>include/nuttx/video/fb.h</code>. </p> </li> <li> @@ -6550,7 +6550,7 @@ int ret = sigaction(SIGCHLD, &sa, NULL); </li> <li> <code>CONFIG_NX_LCDDRIVER</code>: - By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>). + By default, NX builds to use a framebuffer driver (see <code>include/nuttx/video/fb.h</code>). If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd/lcd.h</code>). </li> <li> diff --git a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c index 8b5aec444..0b118e4df 100644 --- a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c +++ b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c @@ -45,7 +45,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/kmalloc.h> #include <nuttx/nx/nxglib.h> diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c index d022390ed..36c6dfdbe 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <arch/board/board.h> #include "up_arch.h" diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.h b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.h index 2b560bb47..99daa2006 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_lcd.h @@ -163,7 +163,7 @@ * Public Functions ************************************************************************************/ /* The LPC17 LCD driver uses the common framebuffer interfaces declared in - * include/nuttx/fb.h. + * include/nuttx/video/fb.h. */ /************************************************************************************ diff --git a/nuttx/arch/arm/src/sama5/sam_lcd.c b/nuttx/arch/arm/src/sama5/sam_lcd.c index 166239cc5..d2c2cf92f 100644 --- a/nuttx/arch/arm/src/sama5/sam_lcd.c +++ b/nuttx/arch/arm/src/sama5/sam_lcd.c @@ -53,7 +53,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/kmalloc.h> #include <arch/board/board.h> diff --git a/nuttx/arch/arm/src/sama5/sam_lcd.h b/nuttx/arch/arm/src/sama5/sam_lcd.h index 58e49fd2a..d16a2ec6f 100644 --- a/nuttx/arch/arm/src/sama5/sam_lcd.h +++ b/nuttx/arch/arm/src/sama5/sam_lcd.h @@ -80,7 +80,7 @@ * Public Functions ************************************************************************************/ /* The SAMA5 LCD driver uses the common framebuffer interfaces declared in - * include/nuttx/fb.h. + * include/nuttx/video/fb.h. */ /************************************************************************************ diff --git a/nuttx/arch/arm/src/stm32/stm32_ltdc.c b/nuttx/arch/arm/src/stm32/stm32_ltdc.c index 879ff18a2..d9cf1f7f4 100644 --- a/nuttx/arch/arm/src/stm32/stm32_ltdc.c +++ b/nuttx/arch/arm/src/stm32/stm32_ltdc.c @@ -47,7 +47,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/kmalloc.h> #include <arch/board/board.h> diff --git a/nuttx/arch/arm/src/stm32/stm32_ltdc.h b/nuttx/arch/arm/src/stm32/stm32_ltdc.h index ab70b779b..007f03b52 100644 --- a/nuttx/arch/arm/src/stm32/stm32_ltdc.h +++ b/nuttx/arch/arm/src/stm32/stm32_ltdc.h @@ -66,7 +66,7 @@ * Public Functions ************************************************************************************/ /* The STM32 LTDC driver uses the common framebuffer interfaces declared in - * include/nuttx/fb.h. + * include/nuttx/video/fb.h. */ /************************************************************************************ diff --git a/nuttx/arch/sim/src/up_framebuffer.c b/nuttx/arch/sim/src/up_framebuffer.c index 35329b9d8..bf80e99a1 100644 --- a/nuttx/arch/sim/src/up_framebuffer.c +++ b/nuttx/arch/sim/src/up_framebuffer.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include "up_internal.h" /**************************************************************************** diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 2867cb336..559bfcd66 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -1589,7 +1589,7 @@ architecture/board-specific settings). to know if the pixels pack from the MS to LS or from LS to MS CONFIG_NX_LCDDRIVER By default, NX builds to use a framebuffer driver (see - include/nuttx/fb.h). If this option is defined, NX will + include/nuttx/video/fb.h). If this option is defined, NX will build to use an LCD driver (see include/nuttx/lcd/lcd.h). CONFIG_LCD_MAXPOWER - The full-on power setting for an LCD device. diff --git a/nuttx/configs/compal_e99/src/ssd1783.c b/nuttx/configs/compal_e99/src/ssd1783.c index 41bbe11f5..f5029caa1 100644 --- a/nuttx/configs/compal_e99/src/ssd1783.c +++ b/nuttx/configs/compal_e99/src/ssd1783.c @@ -41,7 +41,7 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <sys/types.h> #include <assert.h> diff --git a/nuttx/configs/sama5d3x-ek/src/sam_ov2640.c b/nuttx/configs/sama5d3x-ek/src/sam_ov2640.c index 4a5cc2c78..579a6a9e2 100644 --- a/nuttx/configs/sama5d3x-ek/src/sam_ov2640.c +++ b/nuttx/configs/sama5d3x-ek/src/sam_ov2640.c @@ -43,7 +43,7 @@ #include <debug.h> #include <nuttx/i2c.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/video/ov2640.h> #include "up_arch.h" diff --git a/nuttx/configs/sim/src/up_touchscreen.c b/nuttx/configs/sim/src/up_touchscreen.c index c951c5c69..0c102f212 100644 --- a/nuttx/configs/sim/src/up_touchscreen.c +++ b/nuttx/configs/sim/src/up_touchscreen.c @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/input/touchscreen.h> #include <nuttx/nx/nx.h> #include <nuttx/nx/nxglib.h> diff --git a/nuttx/drivers/lcd/README.txt b/nuttx/drivers/lcd/README.txt index d45f72b0e..cde6eff8a 100644 --- a/nuttx/drivers/lcd/README.txt +++ b/nuttx/drivers/lcd/README.txt @@ -22,7 +22,7 @@ LCD Header files Structures and APIs needed to work with LCD drivers are provided in this header file. This header file also depends on some of the same definitions used for the frame buffer driver as privided in - include/nuttx/fb.h. + include/nuttx/video/fb.h. struct lcd_dev_s diff --git a/nuttx/graphics/Kconfig b/nuttx/graphics/Kconfig index 64e348175..7d34b872d 100644 --- a/nuttx/graphics/Kconfig +++ b/nuttx/graphics/Kconfig @@ -17,7 +17,7 @@ config NX_LCDDRIVER depends on LCD ---help--- By default, the NX graphics system uses the frame buffer driver interface - defined in include/nuttx/fb.h. However, if LCD is support is enabled, + defined in include/nuttx/video/fb.h. However, if LCD is support is enabled, this this option is provide to select, instead, the LCD driver interface defined in include/nuttx/lcd/lcd.h. diff --git a/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c index bf9812ac3..52b16eaa2 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c index 777a906a4..9e6a61afb 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c index f183ac54a..cf2dafe22 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c @@ -42,7 +42,7 @@ #include <stdint.h> #include <fixedmath.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/fb/nxglib_getrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_getrectangle.c index 82e541ec5..1edf8f1e5 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_getrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_getrectangle.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c index d8e52250c..7b64e1304 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/fb/nxglib_setpixel.c b/nuttx/graphics/nxglib/fb/nxglib_setpixel.c index 7079b7e57..c83953e67 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_setpixel.c +++ b/nuttx/graphics/nxglib/fb/nxglib_setpixel.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> #include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/include/nuttx/lcd/lcd.h b/nuttx/include/nuttx/lcd/lcd.h index 45eb03b0d..6cf614bad 100644 --- a/nuttx/include/nuttx/lcd/lcd.h +++ b/nuttx/include/nuttx/lcd/lcd.h @@ -42,7 +42,7 @@ #include <sys/types.h> #include <stdint.h> -#include <nuttx/fb.h> +#include <nuttx/video/fb.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/nuttx/nx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h index 4dec40070..77d5af71b 100644 --- a/nuttx/include/nuttx/nx/nxglib.h +++ b/nuttx/include/nuttx/nx/nxglib.h @@ -49,7 +49,7 @@ #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> #else -# include <nuttx/fb.h> +# include <nuttx/video/fb.h> #endif /**************************************************************************** diff --git a/nuttx/include/nuttx/fb.h b/nuttx/include/nuttx/video/fb.h index 4c38c8d64..5cd006546 100644 --- a/nuttx/include/nuttx/fb.h +++ b/nuttx/include/nuttx/video/fb.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/fb.h + * include/nuttx/video/fb.h * * Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _INCLUDE_NUTTX_FB_H -#define _INCLUDE_NUTTX_FB_H +#ifndef _INCLUDE_NUTTX_VIDEO_FB_H +#define _INCLUDE_NUTTX_VIDEO_FB_H /**************************************************************************** * Included Files @@ -356,4 +356,4 @@ void fb_uninitialize(void); } #endif -#endif /* _INCLUDE_NUTTX_FB_H */ +#endif /* _INCLUDE_NUTTX_VIDEO_FB_H */ |