diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-24 20:49:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-24 20:49:01 +0000 |
| commit | 73624b6e68013b718cee96dc8d3c628cb84431ba (patch) | |
| tree | 2cc60df3d4276714aa0eb4ba5340a8dddffdabc0 | |
| parent | e79139d4ea59a424356d0b6695a2ce841267817d (diff) | |
| download | nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.tar.gz nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.tar.bz2 nuttx-73624b6e68013b718cee96dc8d3c628cb84431ba.zip | |
Move NX header files to include/nuttx/nx
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3816 42af7a65-404d-4744-a932-0658087f49c3
153 files changed, 463 insertions, 446 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index f771b97fa..4ac76ed5c 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -85,4 +85,5 @@ * apps/examples/usbstorage: Can now be built as two NSH "built-in" commands: 'msconn' will connect the USB mass storage device; 'msdis' will disconnect the USB storage device. - + * apps/examples/nx*: All NX header files moved from nuttx/include/nuttx to + nuttx/include/nuttx/nx. diff --git a/apps/examples/README.txt b/apps/examples/README.txt index b241b8f75..52a2d0f58 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -252,7 +252,7 @@ examples/nx ^^^^^^^^^^^ This directory contains a simple test of a subset of the NX APIs - defined in include/nuttx/nx.h. The following configuration options + defined in include/nuttx/nx/nx.h. The following configuration options can be selected: CONFIG_EXAMPLES_NX_BUILTIN -- Build the NX example as a "built-in" @@ -406,7 +406,7 @@ examples/nxtext ^^^^^^^^^^^^^^^ This directory contains another simple test of a subset of the NX APIs - defined in include/nuttx/nx.h. This text focuses on text displays on + defined in include/nuttx/nx/nx.h. This text focuses on text displays on the dispaly background combined with pop-up displays over the text. The text display will continue to update while the pop-up is visible. diff --git a/apps/examples/nx/nx_events.c b/apps/examples/nx/nx_events.c index d1074b419..29fe5fb8a 100644 --- a/apps/examples/nx/nx_events.c +++ b/apps/examples/nx/nx_events.c @@ -47,8 +47,8 @@ #include <debug.h> #include <errno.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nx_internal.h" /**************************************************************************** diff --git a/apps/examples/nx/nx_internal.h b/apps/examples/nx/nx_internal.h index 897c09722..b733a185f 100644 --- a/apps/examples/nx/nx_internal.h +++ b/apps/examples/nx/nx_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * examples/nx/nx_internal.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -45,8 +45,8 @@ #include <stdint.h> #include <stdbool.h> #include <semaphore.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> /**************************************************************************** * Definitions diff --git a/apps/examples/nx/nx_kbdin.c b/apps/examples/nx/nx_kbdin.c index b2a40d352..ebb1ef791 100644 --- a/apps/examples/nx/nx_kbdin.c +++ b/apps/examples/nx/nx_kbdin.c @@ -47,9 +47,9 @@ #include <debug.h> #include <errno.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> +#include <nuttx/nx/nxfonts.h> #include "nx_internal.h" diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index 366ec80a4..d0beda92e 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -58,9 +58,9 @@ #endif #include <nuttx/arch.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> +#include <nuttx/nx/nxfonts.h> #include "nx_internal.h" diff --git a/apps/examples/nx/nx_server.c b/apps/examples/nx/nx_server.c index 8677c0008..a7a305d63 100644 --- a/apps/examples/nx/nx_server.c +++ b/apps/examples/nx/nx_server.c @@ -47,7 +47,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h index b7343a054..93c6d8fac 100644 --- a/apps/examples/nxhello/nxhello.h +++ b/apps/examples/nxhello/nxhello.h @@ -46,8 +46,8 @@ #include <stdbool.h> #include <semaphore.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Definitions diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c index 09beac952..43bfc0516 100644 --- a/apps/examples/nxhello/nxhello_bkgd.c +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -48,9 +48,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nxhello.h" diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c index 38c2e52c2..78a60663e 100644 --- a/apps/examples/nxhello/nxhello_main.c +++ b/apps/examples/nxhello/nxhello_main.c @@ -59,9 +59,9 @@ #endif #include <nuttx/arch.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nxhello.h" diff --git a/apps/examples/nximage/nximage.h b/apps/examples/nximage/nximage.h index 8a335ddc8..117eff671 100755 --- a/apps/examples/nximage/nximage.h +++ b/apps/examples/nximage/nximage.h @@ -46,8 +46,8 @@ #include <stdbool.h> #include <semaphore.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Definitions diff --git a/apps/examples/nximage/nximage_bitmap.c b/apps/examples/nximage/nximage_bitmap.c index f672ce3fe..6b0d13718 100644 --- a/apps/examples/nximage/nximage_bitmap.c +++ b/apps/examples/nximage/nximage_bitmap.c @@ -42,8 +42,8 @@ #include <stdint.h> #include <assert.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> #include "nximage.h" diff --git a/apps/examples/nximage/nximage_bkgd.c b/apps/examples/nximage/nximage_bkgd.c index 1aa74f58f..e724b3a31 100755 --- a/apps/examples/nximage/nximage_bkgd.c +++ b/apps/examples/nximage/nximage_bkgd.c @@ -48,9 +48,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nximage.h" diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c index d07e72a26..3ddfb1c02 100755 --- a/apps/examples/nximage/nximage_main.c +++ b/apps/examples/nximage/nximage_main.c @@ -59,9 +59,9 @@ #endif #include <nuttx/arch.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nximage.h" diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index 37894e20c..a87425112 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -48,8 +48,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxfonts.h> #include "nxtext_internal.h" diff --git a/apps/examples/nxtext/nxtext_internal.h b/apps/examples/nxtext/nxtext_internal.h index eb7543329..98579ffdf 100644 --- a/apps/examples/nxtext/nxtext_internal.h +++ b/apps/examples/nxtext/nxtext_internal.h @@ -45,8 +45,8 @@ #include <stdint.h> #include <stdbool.h> #include <semaphore.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> /**************************************************************************** * Definitions diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index 58d29d33c..2ff941d0c 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -59,9 +59,9 @@ #endif #include <nuttx/arch.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nxtext_internal.h" diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 8cc72a89e..c0c66f4ef 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -47,8 +47,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxfonts.h> #include "nxtext_internal.h" diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index b4e31bb73..5c1749269 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -47,9 +47,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> +#include <nuttx/nx/nxfonts.h> #include "nxtext_internal.h" diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c index 08b3a1a20..2049a3121 100644 --- a/apps/examples/nxtext/nxtext_server.c +++ b/apps/examples/nxtext/nxtext_server.c @@ -47,7 +47,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_LCDDRIVER # include <nuttx/lcd/lcd.h> diff --git a/apps/examples/usbstorage/usbstrg_main.c b/apps/examples/usbstorage/usbstrg_main.c index 76e864fee..2889f60e0 100644 --- a/apps/examples/usbstorage/usbstrg_main.c +++ b/apps/examples/usbstorage/usbstrg_main.c @@ -479,5 +479,6 @@ int msdis_main(int argc, char *argv[]) usbstrg_uninitialize(g_mshandle); g_mshandle = NULL; message("msdis: Disconnected\n"); + return 0; } #endif diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 605c9f767..396f3ae88 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1942,4 +1942,6 @@ * tools/bdf-converter.c. This C file is used to build the bdf-converter program. The bdf-converter program be used to convert fonts in Bitmap Distribution Format (BDF) into fonts that can be used in the NX graphics - system.
\ No newline at end of file + system. + * include/nuttx/nx: Move all NX header files from include/nuttx to + include/nuttx/nx.
\ No newline at end of file diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 99ffda846..1c3305be5 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NX Graphics Subsystem</i> </font></big></h1> - <p>Last Updated: July 23, 2011</p> + <p>Last Updated: July 24, 2011</p> </td> </tr> </table> @@ -332,7 +332,7 @@ graphics memory). NX includes both a small-footprint, single user implementaton (NXSU) and a somewhat larger multi-user implentation (NXMU as described below). - Both conform to the same APIs as defined in <code>include/nuttx/nx.h</code> and, hence, + Both conform to the same APIs as defined in <code>include/nuttx/nx/nx.h</code> and, hence, are interchangable<sup>1</sup>. NX can be used without NXWIDGETS and without NXTOOLKIT for raw window displays. </p> @@ -404,15 +404,15 @@ <h2>2.1 <a name="nxheaders">NX Header Files</a></h2> <ul><dl> - <dt><code>include/nuttx/nxglib.h</code> + <dt><code>include/nuttx/nx/nxglib.h</code> <dd>Describes the NXGLIB C interfaces - <dt><code>include/nuttx/nx.h</code> + <dt><code>include/nuttx/nx/nx.h</code> <dd>Describes the NX C interfaces <dt><code>include/nutt/nxtk.h</code> <dd>Describe the NXTOOLKIT C interfaces <dt><code>include/nutt/nxfont.h</code> <dd>Describe sthe NXFONT C interfaces - <dt><code>include/nuttx/nxwidgets.h</code> + <dt><code>include/nuttx/nx/nxwidgets.h</code> <dd>Will describe the NXWIDGETS classes (no longer planned) </dl></ul> @@ -422,7 +422,7 @@ NXGL provides many APIs, some available for use internally by NX and others for use by applications as well. Only those APIs intended for application usage are documented here - See <code>include/nuttx/nxglib.h</code> for the full set of APIs; + See <code>include/nuttx/nx/nxglib.h</code> for the full set of APIs; those APIs might be of interest if you are rendering directly into framebuffer or LCD memory. </p> @@ -512,7 +512,7 @@ struct nxgl_trapezoid_s <h3>2.2.1 <a name="nxglrgb2yuv"><code>nxgl_rgb2yuv()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8_t *v); </pre></ul> <p> @@ -523,7 +523,7 @@ void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8 <h3>2.2.2 <a name="nxglyuv2rgb"><code>nxgl_yuv2rgb()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b); </pre></ul> <p> @@ -534,7 +534,7 @@ void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8 <h3>2.2.3 <a name="nxglrectcopy"><code>nxgl_rectcopy()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rectcopy(FAR struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *src); </pre></ul> @@ -547,7 +547,7 @@ void nxgl_rectcopy(FAR struct nxgl_rect_s *dest, <h3>2.2.4 <a name="nxglrectoffset"><code>nxgl_rectoffset()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rectoffset(FAR struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *src, nxgl_coord_t dx, nxgl_coord_t dy); @@ -560,7 +560,7 @@ void nxgl_rectoffset(FAR struct nxgl_rect_s *dest, <h3>2.2.5 <a name="nxglvectoradd"><code>nxgl_vectoradd()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_vectoradd(FAR struct nxgl_point_s *dest, FAR const struct nxgl_point_s *v1, FAR const struct nxgl_point_s *v2); @@ -573,7 +573,7 @@ void nxgl_vectoradd(FAR struct nxgl_point_s *dest, <h3>2.2.6 <a name="nxglvectorsubtract"><code>nxgl_vectorsubtract()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_vectsubtract(FAR struct nxgl_point_s *dest, FAR const struct nxgl_point_s *v1, FAR const struct nxgl_point_s *v2); @@ -586,7 +586,7 @@ void nxgl_vectsubtract(FAR struct nxgl_point_s *dest, <h3>2.2.7 <a name="nxglrectintersect"><code>nxgl_rectintersect()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rectintersect(FAR struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *src1, FAR const struct nxgl_rect_s *src2); @@ -599,7 +599,7 @@ void nxgl_rectintersect(FAR struct nxgl_rect_s *dest, <h3>2.2.8 <a name="nxglrectunion"><code>nxgl_rectunion()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rectunion(FAR struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *src1, FAR const struct nxgl_rect_s *src2); @@ -613,7 +613,7 @@ void nxgl_rectunion(FAR struct nxgl_rect_s *dest, <h3>2.2.9 <a name="nxglnonintersecting"><code>nxgl_nonintersecting()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> nxgl_nonintersecting(FAR struct nxgl_rect_s result[4], FAR const struct nxgl_rect_s *rect1, FAR const struct nxgl_rect_s *rect2); @@ -628,7 +628,7 @@ nxgl_nonintersecting(FAR struct nxgl_rect_s result[4], <h3>2.2.10 <a name="nxglrectoverlap"><code>nxgl_rectoverlap()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, FAR struct nxgl_rect_s *rect2); </pre></ul> @@ -640,7 +640,7 @@ bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, <h3>2.2.11 <a name="nxglrectinside"><code>nxgl_rectinside()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *pt); </pre></ul> @@ -652,7 +652,7 @@ bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect, <h3>2.2.12 <a name="nxglrectsize"><code>nxgl_rectsize()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_rectsize(FAR struct nxgl_size_s *size, FAR const struct nxgl_rect_s *rect); </pre></ul> @@ -664,7 +664,7 @@ void nxgl_rectsize(FAR struct nxgl_size_s *size, <h3>2.2.13 <a name="nxglnullrect"><code>nxgl_nullrect()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect); </pre></ul> <p> @@ -675,7 +675,7 @@ bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect); <h3>2.2.14 <a name="nxglrunoffset"><code>nxgl_runoffset()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_runoffset(FAR struct nxgl_run_s *dest, FAR const struct nxgl_run_s *src, nxgl_coord_t dx, nxgl_coord_t dy); @@ -688,7 +688,7 @@ void nxgl_runoffset(FAR struct nxgl_run_s *dest, <h3>2.2.15 <a name="nxglruncopy"><code>nxgl_runcopy()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_runcopy(FAR struct nxgl_run_s *dest, FAR const struct nxgl_run_s *src); </pre></ul> @@ -701,7 +701,7 @@ void nxgl_runcopy(FAR struct nxgl_run_s *dest, <h3>2.2.16 <a name="nxgltrapoffset"><code>nxgl_trapoffset()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_trapoffset(FAR struct nxgl_trapezoid_s *dest, FAR const struct nxgl_trapezoid_s *src, nxgl_coord_t dx, nxgl_coord_t dy); @@ -714,7 +714,7 @@ void nxgl_trapoffset(FAR struct nxgl_trapezoid_s *dest, <h3>2.2.1 <a name="nxgltrapcopy"><code>nxgl_trapcopy()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> void nxgl_trapcopy(FAR struct nxgl_trapezoid_s *dest, FAR const struct nxgl_trapezoid_s *src); </pre></ul> @@ -727,7 +727,7 @@ void nxgl_trapcopy(FAR struct nxgl_trapezoid_s *dest, <h3>2.2.1 <a name="nxglcolorcopy"><code>nxgl_colorcopy</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> nxgl_colorcopy(nxgl_mxpixel_t dest[CONFIG_NX_NPLANES], const nxgl_mxpixel_t src[CONFIG_NX_NPLANES]); </pre></ul> @@ -929,8 +929,8 @@ void (*kbdin)(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg); <h3>2.3.4 <a name="nxruninstance"><code>nx_runinstance()</code> (and <code>nx_run()</code> macro)</a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_MULTIUSER int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb); @@ -970,8 +970,8 @@ int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb); <h3>2.3.5 <a name="nxconnectinstance"><code>nx_connectinstance()</code> (and <code>nx_connect()</code> macro)</a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_MULTIUSER NXHANDLE nx_connectinstance(FAR const char *svrmqname); @@ -1024,8 +1024,8 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname); <h3>2.3.6 <a name="nxopen"><code>nx_open()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifndef CONFIG_NX_MULTIUSER NXHANDLE nx_open(FAR struct fb_vtable_s *dev); @@ -1061,8 +1061,8 @@ NXHANDLE nx_open(FAR struct fb_vtable_s *dev); <h3>2.3.7 <a name="nxdisconnect"><code>nx_disconnect()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_MULTIUSER void nx_disconnect(NXHANDLE handle); @@ -1092,8 +1092,8 @@ void nx_disconnect(NXHANDLE handle); <h3>2.3.8 <a name="nxclose"><code>nx_close()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifndef CONFIG_NX_MULTIUSER void nx_close(NXHANDLE handle); @@ -1121,8 +1121,8 @@ void nx_close(NXHANDLE handle); <h3>2.3.9 <a name="nxeventhandler"><code>nx_eventhandler()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_MULTIUSER int nx_eventhandler(NXHANDLE handle); @@ -1169,8 +1169,8 @@ int nx_eventhandler(NXHANDLE handle); <h3>2.3.10 <a name="nxeventnotify"><code>nx_eventnotify()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #if defined(CONFIG_NX_MULTIUSER) && !defined(CONFIG_DISABLE_SIGNALS) int nx_eventnotify(NXHANDLE handle, int signo); @@ -1215,8 +1215,8 @@ int nx_eventnotify(NXHANDLE handle, int signo); <h3>2.3.11 <a name="nxopenwindow"><code>nx_openwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb, @@ -1248,8 +1248,8 @@ NXWINDOW nx_openwindow(NXHANDLE handle, <h3>2.3.12 <a name="nxclosewindow"><code>nx_closewindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_closewindow(NXWINDOW hwnd); </pre></ul> @@ -1276,8 +1276,8 @@ int nx_closewindow(NXWINDOW hwnd); <h3>2.3.13 <a name="nxrequestbkgd"><code>nx_requestbkgd()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb, @@ -1348,8 +1348,8 @@ int nx_requestbkgd(NXHANDLE handle, <h3>2.3.14 <a name="nxreleasebkgd"><code>nx_releasebkgd()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_releasebkgd(NXWINDOW hwnd); </pre></ul> @@ -1378,8 +1378,8 @@ int nx_releasebkgd(NXWINDOW hwnd); <h3>2.3.15 <a name="nxgetposition"><code>nx_getposition()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_getposition(NXWINDOW hwnd); </pre></ul> @@ -1406,8 +1406,8 @@ int nx_getposition(NXWINDOW hwnd); <h3>2.3.16 <a name="nxsetposition"><code>nx_setposition()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_setposition(NXWINDOW hwnd, FAR struct nxgl_point_s *pos); </pre></ul> @@ -1435,8 +1435,8 @@ int nx_setposition(NXWINDOW hwnd, FAR struct nxgl_point_s *pos); <h3>2.3.17 <a name="nxsetsize"><code>nx_setsize()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_setsize(NXWINDOW hwnd, FAR struct nxgl_size_s *size); </pre></ul> @@ -1463,8 +1463,8 @@ int nx_setsize(NXWINDOW hwnd, FAR struct nxgl_size_s *size); <h3>2.3.18 <a name="nxraise"><code>nx_raise()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_raise(NXWINDOW hwnd); </pre></ul> @@ -1491,8 +1491,8 @@ int nx_raise(NXWINDOW hwnd); <h3>2.3.19 <a name="nxlower"><code>nx_lower()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_lower(NXWINDOW hwnd); </pre></ul> @@ -1519,8 +1519,8 @@ int nx_lower(NXWINDOW hwnd); <h3>2.3.20 <a name="nxfill"><code>nx_fill()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); @@ -1550,8 +1550,8 @@ int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, <h3>2.3.21 <a name="nxfilltrapezoid"><code>nx_filltrapezoid()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip, FAR const struct nxgl_trapezoid_s *trap, @@ -1584,8 +1584,8 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip, <h3>2.3.22 <a name="nxglrgb2yuv"><code>nx_setbgcolor()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_setbgcolor(NXHANDLE handle, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); @@ -1612,8 +1612,8 @@ int nx_setbgcolor(NXHANDLE handle, <h3>2.3.23 <a name="nxmove"><code>nx_move()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -1643,8 +1643,8 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, <h3>2.3.24 <a name="nxbitmap"><code>nx_bitmap()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, FAR const void *src[CONFIG_NX_NPLANES], @@ -1685,8 +1685,8 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, <h3>2.3.25 <a name="nxkbdin"><code>nx_kbdin()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_KBD int nx_kbdchin(NXHANDLE handle, uint8_t ch); @@ -1708,8 +1708,8 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch); <h3>2.3.26 <a name="nxmousein"><code>nx_mousein()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #ifdef CONFIG_NX_MOUSE int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons); @@ -1785,9 +1785,9 @@ typedef FAR void *NXTKWINDOW; <h3>2.4.2 <a name="nxtkopenwindow"><code>nxtk_openwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> NXTKWINDOW nxtk_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb, @@ -1819,9 +1819,9 @@ NXTKWINDOW nxtk_openwindow(NXHANDLE handle, <h3>2.4.3 <a name="nxtkclosewindow"><code>nxtk_closewindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_closewindow(NXTKWINDOW hfwnd); </pre></ul> @@ -1846,9 +1846,9 @@ int nxtk_closewindow(NXTKWINDOW hfwnd); <h3>2.4.4 <a name="nxtkgetposition"><code>nxtk_getposition()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_getposition(NXTKWINDOW hfwnd); </pre></ul> @@ -1875,9 +1875,9 @@ int nxtk_getposition(NXTKWINDOW hfwnd); <h3>2.4.5 <a name="nxtksetposition"><code>nxtk_setposition()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_setposition(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *pos); </pre></ul> @@ -1906,9 +1906,9 @@ int nxtk_setposition(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *pos); <h3>2.4.6 <a name="nxtksetsize"><code>nxtk_setsize()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_setsize(NXTKWINDOW hfwnd, FAR struct nxgl_size_s *size); </pre></ul> @@ -1937,9 +1937,9 @@ int nxtk_setsize(NXTKWINDOW hfwnd, FAR struct nxgl_size_s *size); <h3>2.4.7 <a name="nxtkraise"><code>nxtk_raise()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_raise(NXTKWINDOW hfwnd); </pre></ul> @@ -1968,9 +1968,9 @@ int nxtk_raise(NXTKWINDOW hfwnd); <h3>2.4.8 <a name="nxtklower"><code>nxtk_lower()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_lower(NXTKWINDOW hfwnd); </pre></ul> @@ -1999,9 +1999,9 @@ int nxtk_lower(NXTKWINDOW hfwnd); <h3>2.4.9 <a name="nxtkfillwindow"><code>nxtk_fillwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); @@ -2031,9 +2031,9 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <h3>2.4.10 <a name="nxtkfilltrapwindow"><code>nxtk_filltrapwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_filltrapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap, @@ -2064,9 +2064,9 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd, <h3>2.4.11 <a name="nxtkmovewindow"><code>nxtk_movewindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -2097,9 +2097,9 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <h3>2.4.12 <a name="nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, @@ -2142,9 +2142,9 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, <h3>2.4.13 <a name="nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height, FAR const struct nx_callback_s *cb, @@ -2177,9 +2177,9 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height, <h3>2.4.14 <a name="nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_closetoolbar(NXTKWINDOW hfwnd); </pre></ul> @@ -2206,9 +2206,9 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd); <h3>2.4.15 <a name="nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); @@ -2238,9 +2238,9 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <h3>2.4.16 <a name="nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); @@ -2270,9 +2270,9 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *tr <h3>2.4.17 <a name="nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -2304,9 +2304,9 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <h3>2.4.18 <a name="nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, @@ -2403,7 +2403,7 @@ struct nx_font_s <h3>2.5.2 <a name="nxfgetfonthandle"><code>nxf_getfonthandle()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxfonts.h> NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid); </pre></ul> @@ -2426,8 +2426,8 @@ NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid); <h3>2.5.3 <a name="nxfgetfontset"><code>nxf_getfontset()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> FAR const struct nx_font_s *nxf_getfontset(NXHANDLE handle); </pre></ul> @@ -2450,8 +2450,8 @@ FAR const struct nx_font_s *nxf_getfontset(NXHANDLE handle); <h3>2.5.4 <a name="nxfgetbitmap"><code>nxf_getbitmap()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> FAR const struct nx_fontbitmap_s *nxf_getbitmap(NXHANDLE handle, uint16_t ch); </pre></ul> @@ -2476,8 +2476,8 @@ FAR const struct nx_fontbitmap_s *nxf_getbitmap(NXHANDLE handle, uint16_t ch); <h3>2.5.5 <a name="nxfconvertbpp"><code>nxf_convert_*bpp()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> int nxf_convert_2bpp(FAR uint8_t *dest, uint16_t height, uint16_t width, uint16_t stride, @@ -2595,7 +2595,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, When combined with the generic <i>back-end</i> (<code>nxbe</code>), it implements a single threaded, single user windowing system. The files in this directory present the window APIs described in - <code>include/nuttx/nx.h</code>. + <code>include/nuttx/nx/nx.h</code>. The single user front-end is selected when <code>CONFIG_NX_MULTIUSER</code> is not defined in the NuttX configuration file. @@ -2604,7 +2604,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, When combined with the generic <i>back-end</i> (<code>nxbe</code>), it implements a multi-threaded, multi-user windowing system. The files in this directory present the window APIs described in - <code>include/nuttx/nx.h</code>. + <code>include/nuttx/nx/nx.h</code>. The multi-user front end includes a graphics server that executes on its own thread; multiple graphics clients then communicate with the server via a POSIX message queue to serialize window operations from many threads. @@ -2614,13 +2614,13 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <dt><code>graphics/nxfonts</code> <dd>This is where the NXFONTS implementation resides. This is a relatively low-level set of charset set/glyph management APIs. - See <code>include/nuttx/nxfonts.h</code>. + See <code>include/nuttx/nx/nxfonts.h</code>. <dt><code>graphics/nxtk</code> <dd>This is where the NXTOOLKIT implementation resides. This toolkit is built on top of NX and works with either the single-user or multi-user NX version. - See <code>include/nuttx/nxtk.h</code>. + See <code>include/nuttx/nx/nxtk.h</code>. <dt><code>graphics/nxwidgets</code> <dd>At one time, I planned to put NXWIDGETS implementation here, but not anymore. @@ -2737,17 +2737,29 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, </tr> </table> -<p> +<p><b>The BDF Font Converter</b>. There is a tool called <i>bdf-converter</i> in the directory <code>tools/.</code>. The <i>bdf-converter</i> program be used to convert fonts in Bitmap Distribution Format (BDF) into fonts that can be used in the NX graphics system. + The BDF format most well known as a font format traditionally used for X-11 bitmap fonts. </p> +<blockquote><small> + A Note about Font Copyrights: + My understanding is that the underlying bitmap font data for traditional fonts cannot be copyrighted (the same is not true for scalable fonts). + This is because a copyright covers only the form of delivery of the font and not the underlying font content and, at least for the traditional typefaces, the underlying font designs are ancient. + There could be issues, however, if you convert from modern, trademarked images. + However, remember that I am a programmer not an attorney and that my knowledge of font copyright issues is limited to what I glean by Googling. +</small></blockquote> <p> - Below are general instructions for creating and installing a new font in the NX graphic system: + <b>Font Installation Steps</b>, + Below are general instructions for creating and installing a new font in the NX graphic system. + The first two steps only appy if you are using the BDF font converter program. </p> <ol start="1"> <li> <p> - Locate a font in BDF format, + Locate a font in BDF format. + There are many good BDF bitmap fonts bundled with X-11. + See <a href="http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html">this link</a>, as an example, </p> </li> <li> @@ -2759,7 +2771,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, </li> </ol> <p> - Create a new NuttX configuration variable. + The remaining steps apply however you managed to create the NuttX C font header file. + After you have your C font header file, the next thing to do is to create a new NuttX configuration variable to select the font. For example, suppose you define the following variable: <code>CONFIG_NXFONT_MYFONT</code>. Then you would need to: </p> @@ -2772,14 +2785,14 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, </ol> <p> A font ID number has to be assigned for each new font. - The font ID is defined in the file <code>include/nuttx/nxfonts.h</code>. + The font IDs are defined in the file <code>include/nuttx/nx/nxfonts.h</code>. Those definitions have to be extended to support your new font. Look at how the font ID enabled by <code>CONFIG_NXFONT_SANS23X27</code> is defined and add an ID for yournew font in a similar fashion: </p> <ol start="4"> <li> <p> - <b><code>include/nuttx/nxfonts.h</code></b>. Add you new font as a possible system default font: + <b><code>include/nuttx/nx/nxfonts.h</code></b>. Add you new font as a possible system default font: </p> <ul><pre> #if defined(CONFIG_NXFONT_SANS23X27) @@ -2816,7 +2829,7 @@ enum nx_fontid_e <p> <b><code>nuttx/graphics/Makefile</code></b>. This file needs logic to auto-generate a C source file from the header file that you generated with the the <i>bdf-converter</i> program. - Notice <code>NXFONTS_FONTID=2</code>; this must be set to the same font ID value that you defined in the <code>include/nuttx/nxfonts.h</code> file. + Notice <code>NXFONTS_FONTID=2</code>; this must be set to the same font ID value that you defined in the <code>include/nuttx/nx/nxfonts.h</code> file. </p> <ul><pre> genfontsources: diff --git a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c index 60565deee..fc29fa007 100644 --- a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c +++ b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c @@ -46,7 +46,7 @@ #include <debug.h> #include <nuttx/fb.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "up_arch.h" #include "dm320_memorymap.h" diff --git a/nuttx/graphics/README.txt b/nuttx/graphics/README.txt index 378f71a9d..12ac8ffee 100644 --- a/nuttx/graphics/README.txt +++ b/nuttx/graphics/README.txt @@ -30,7 +30,7 @@ at the present, but here is the longer term roadmap: NX - The tiny NuttX windowing system. This includes both a small-footprint, single user implementaton (NXSU as described below) and a somewhat larger multi-user implentation (NXMU as described below). Both - conform to the same APIs as defined in include/nuttx/nx.h and, hence, + conform to the same APIs as defined in include/nuttx/nx/nx.h and, hence, are more-or-less interchangable. NX can be used without NXWIDGETS and without NXTOOLKIT for raw access to window memory. NXGLIB - Low level graphics utilities and direct framebuffer rendering logic. @@ -39,11 +39,11 @@ at the present, but here is the longer term roadmap: Related Header Files ^^^^^^^^^^^^^^^^^^^^ -include/nuttx/nxglib.h -- Describes the NXGLIB C interfaces -include/nuttx/nx.h -- Describes the NX C interfaces -include/nutt/nxtk.h -- Describe the NXTOOLKIT C interfaces -include/nutt/nxfont.h -- Describe sthe NXFONT C interfaces -include/nuttx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned) +include/nuttx/nx/nxglib.h -- Describes the NXGLIB C interfaces +include/nuttx/nx/nx.h -- Describes the NX C interfaces +include/nuttx/nx/nxtk.h -- Describe the NXTOOLKIT C interfaces +include/nuttx/nx/nxfont.h -- Describe sthe NXFONT C interfaces +include/nuttx/nx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned) Directories ^^^^^^^^^^^ @@ -63,14 +63,14 @@ graphics/nxbe graphics/nxsu This is the NX single user "front end". When combined with the generic "back-end" (nxbe), it implements a single thread, single user windowing system. The files - in this directory present the window APIs described in include/nuttx/nx.h. The + in this directory present the window APIs described in include/nuttx/nx/nx.h. The single user front-end is selected when CONFIG_NX_MULTIUSER is not defined in the NuttX configuration file. graphics/nxmu This is the NX multi user "front end". When combined with the generic "back-end" (nxbe), it implements a multi-threaded, multi-user windowing system. The files - in this directory present the window APIs described in include/nuttx/nx.h. The + in this directory present the window APIs described in include/nuttx/nx/nx.h. The multi-user front end includes a graphics server that executes on its own thread; multiple graphics clients then communicate with the server via a POSIX message queue to serialize window operations from many threads. The multi-user front-end @@ -78,12 +78,12 @@ graphics/nxmu graphics/nxfonts This is where the NXFONTS implementation resides. This is a relatively low- - level set of charset set/glyph management APIs. See include/nuttx/nxfonts.h + level set of charset set/glyph management APIs. See include/nuttx/nx/nxfonts.h graphics/nxtk This is where the NXTOOLKIT implementation resides. This toolkit is built on top of NX and works with either the single-user or multi-user NX version. See - include/nuttx/nxtk.h + include/nuttx/nx/nxtk.h graphics/nxwidgets At one time, I planned to put NXWIDGETS implementation here, but not anymore. @@ -111,12 +111,12 @@ Installing New Fonts 3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file. A font ID number has to be assigned for each new font. The font ID - is defined in the file include/nuttx/nxfonts.h. Those definitions + is defined in the file include/nuttx/nx/nxfonts.h. Those definitions have to be extended to support your new font. Look at how the font ID enabled by CONFIG_NXFONT_SANS23X27 is defined and add an ID for your new font in a similar fashion: - 4. include/nuttx/nxfonts.h. Add you new font as a possible system + 4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system default font: #if defined(CONFIG_NXFONT_SANS23X27) @@ -147,7 +147,7 @@ Installing New Fonts a C source file from the header file that you generated with the the bdf-converter program. Notice NXFONTS_FONTID=2; this must be set to the same font ID value that you defined in the - include/nuttx/nxfonts.h file. + include/nuttx/nx/nxfonts.h file. genfontsources: ifeq ($(CONFIG_NXFONT_SANS23X27),y) diff --git a/nuttx/graphics/nxbe/nxbe.h b/nuttx/graphics/nxbe/nxbe.h index c9e7e6381..d3c3bed82 100644 --- a/nuttx/graphics/nxbe/nxbe.h +++ b/nuttx/graphics/nxbe/nxbe.h @@ -45,8 +45,8 @@ #include <stdint.h> #include <stdbool.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxbe/nxbe_bitmap.c b/nuttx/graphics/nxbe/nxbe_bitmap.c index 6977b97ab..3076b2c84 100644 --- a/nuttx/graphics/nxbe/nxbe_bitmap.c +++ b/nuttx/graphics/nxbe/nxbe_bitmap.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxbe/nxbe_clipper.c b/nuttx/graphics/nxbe/nxbe_clipper.c index d60ee4277..580c8bc4c 100644 --- a/nuttx/graphics/nxbe/nxbe_clipper.c +++ b/nuttx/graphics/nxbe/nxbe_clipper.c @@ -44,7 +44,7 @@ #include <stdlib.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxbe/nxbe_closewindow.c b/nuttx/graphics/nxbe/nxbe_closewindow.c index ea87a97a4..3c583fcfb 100644 --- a/nuttx/graphics/nxbe/nxbe_closewindow.c +++ b/nuttx/graphics/nxbe/nxbe_closewindow.c @@ -43,7 +43,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxbe/nxbe_fill.c b/nuttx/graphics/nxbe/nxbe_fill.c index ebec3c886..f4aec7477 100644 --- a/nuttx/graphics/nxbe/nxbe_fill.c +++ b/nuttx/graphics/nxbe/nxbe_fill.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_fill.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxbe/nxbe_filltrapezoid.c b/nuttx/graphics/nxbe/nxbe_filltrapezoid.c index ed7bf322c..1936aede6 100644 --- a/nuttx/graphics/nxbe/nxbe_filltrapezoid.c +++ b/nuttx/graphics/nxbe/nxbe_filltrapezoid.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <fixedmath.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxbe/nxbe_lower.c b/nuttx/graphics/nxbe/nxbe_lower.c index f2f160e83..0cfcb8f7a 100644 --- a/nuttx/graphics/nxbe/nxbe_lower.c +++ b/nuttx/graphics/nxbe/nxbe_lower.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_lower.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <stddef.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxbe/nxbe_move.c b/nuttx/graphics/nxbe/nxbe_move.c index b5c5cc6b7..c52151421 100644 --- a/nuttx/graphics/nxbe/nxbe_move.c +++ b/nuttx/graphics/nxbe/nxbe_move.c @@ -41,7 +41,7 @@ #include <stdint.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxbe/nxbe_raise.c b/nuttx/graphics/nxbe/nxbe_raise.c index fccc5965e..7dc2113fd 100644 --- a/nuttx/graphics/nxbe/nxbe_raise.c +++ b/nuttx/graphics/nxbe/nxbe_raise.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_raise.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxbe/nxbe_redraw.c b/nuttx/graphics/nxbe/nxbe_redraw.c index e844bb72d..3226ccf32 100644 --- a/nuttx/graphics/nxbe/nxbe_redraw.c +++ b/nuttx/graphics/nxbe/nxbe_redraw.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_redraw.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxbe/nxbe_setposition.c b/nuttx/graphics/nxbe/nxbe_setposition.c index 8535704d6..f407eea3f 100644 --- a/nuttx/graphics/nxbe/nxbe_setposition.c +++ b/nuttx/graphics/nxbe/nxbe_setposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_setposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxbe/nxbe_setsize.c b/nuttx/graphics/nxbe/nxbe_setsize.c index b2597b901..367f5d7dc 100644 --- a/nuttx/graphics/nxbe/nxbe_setsize.c +++ b/nuttx/graphics/nxbe/nxbe_setsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_setsize.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxbe/nxbe_visible.c b/nuttx/graphics/nxbe/nxbe_visible.c index 3b43c70ca..6b8b9291b 100644 --- a/nuttx/graphics/nxbe/nxbe_visible.c +++ b/nuttx/graphics/nxbe/nxbe_visible.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_redraw.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c index edd6703c4..8140e92fc 100644 --- a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c +++ b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <stdint.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxfonts.h> #include "nxfonts_internal.h" diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/graphics/nxfonts/nxfonts_convert.c index b7b99e78a..00cd61a6c 100644 --- a/nuttx/graphics/nxfonts/nxfonts_convert.c +++ b/nuttx/graphics/nxfonts/nxfonts_convert.c @@ -43,8 +43,8 @@ #include <stddef.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxfonts.h> #include "nxfonts_internal.h" diff --git a/nuttx/graphics/nxfonts/nxfonts_getfont.c b/nuttx/graphics/nxfonts/nxfonts_getfont.c index 964a0c26e..b9d77b5a7 100644 --- a/nuttx/graphics/nxfonts/nxfonts_getfont.c +++ b/nuttx/graphics/nxfonts/nxfonts_getfont.c @@ -43,8 +43,8 @@ #include <stddef.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxfonts.h> #include "nxfonts_internal.h" diff --git a/nuttx/graphics/nxfonts/nxfonts_internal.h b/nuttx/graphics/nxfonts/nxfonts_internal.h index 889d573b1..fa7864170 100644 --- a/nuttx/graphics/nxfonts/nxfonts_internal.h +++ b/nuttx/graphics/nxfonts/nxfonts_internal.h @@ -42,7 +42,7 @@ #include <nuttx/config.h> -#include <nuttx/nxfonts.h> +#include <nuttx/nx/nxfonts.h> /**************************************************************************** * Pre-processor definitions diff --git a/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c index 70ff8c329..4ad792a4c 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/fb/nxsglib_copyrectangle.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <stdint.h> #include <nuttx/fb.h> -#include <nuttx/nxglib.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 47fd6096f..62b2718ee 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/fb/nxglib_fillrectangle.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <stdint.h> #include <nuttx/fb.h> -#include <nuttx/nxglib.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 89fd5ed62..dbfdb4780 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/fb/nxglib_filltrapezoid.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <fixedmath.h> #include <nuttx/fb.h> -#include <nuttx/nxglib.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 84e0654c8..d1bcbe7c9 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/fb/nxglib_moverectangle.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <stdint.h> #include <nuttx/fb.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/lcd/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/lcd/nxglib_copyrectangle.c index 084fe5cee..988b6cb94 100755 --- a/nuttx/graphics/nxglib/lcd/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/lcd/nxglib_copyrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/lcd/nxsglib_copyrectangle.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <assert.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" #include "nxglib_copyrun.h" diff --git a/nuttx/graphics/nxglib/lcd/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/lcd/nxglib_fillrectangle.c index ddb7fce03..90271e51c 100755 --- a/nuttx/graphics/nxglib/lcd/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/lcd/nxglib_fillrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/lcd/nxglib_fillrectangle.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <stdint.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" #include "nxglib_fillrun.h" diff --git a/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c index c000febb7..c0e18d116 100755 --- a/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/lcd/nxglib_filltrapezoid.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <fixedmath.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" #include "nxglib_fillrun.h" diff --git a/nuttx/graphics/nxglib/lcd/nxglib_moverectangle.c b/nuttx/graphics/nxglib/lcd/nxglib_moverectangle.c index daea90bf6..f82187ae3 100755 --- a/nuttx/graphics/nxglib/lcd/nxglib_moverectangle.c +++ b/nuttx/graphics/nxglib/lcd/nxglib_moverectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/lcd/nxglib_moverectangle.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <stdint.h> #include <nuttx/lcd/lcd.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> #include "nxglib_bitblit.h" diff --git a/nuttx/graphics/nxglib/nxglib_bitblit.h b/nuttx/graphics/nxglib/nxglib_bitblit.h index 9d04f8c78..a272b284c 100644 --- a/nuttx/graphics/nxglib/nxglib_bitblit.h +++ b/nuttx/graphics/nxglib/nxglib_bitblit.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_bitblit.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include <stdint.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_colorcopy.c b/nuttx/graphics/nxglib/nxglib_colorcopy.c index ecbb3b6fe..f99b99505 100644 --- a/nuttx/graphics/nxglib/nxglib_colorcopy.c +++ b/nuttx/graphics/nxglib/nxglib_colorcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_colorcopy.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_nonintersecting.c b/nuttx/graphics/nxglib/nxglib_nonintersecting.c index 0a77059a0..9cb2ec29c 100644 --- a/nuttx/graphics/nxglib/nxglib_nonintersecting.c +++ b/nuttx/graphics/nxglib/nxglib_nonintersecting.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectnonintersecting.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_nullrect.c b/nuttx/graphics/nxglib/nxglib_nullrect.c index fb0980480..3e3355a45 100644 --- a/nuttx/graphics/nxglib/nxglib_nullrect.c +++ b/nuttx/graphics/nxglib/nxglib_nullrect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_nullrect.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include <stdbool.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectcopy.c b/nuttx/graphics/nxglib/nxglib_rectcopy.c index 561c18e5c..998f5b716 100644 --- a/nuttx/graphics/nxglib/nxglib_rectcopy.c +++ b/nuttx/graphics/nxglib/nxglib_rectcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectcopy.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectinside.c b/nuttx/graphics/nxglib/nxglib_rectinside.c index 864de7fd6..1c1f17a2e 100644 --- a/nuttx/graphics/nxglib/nxglib_rectinside.c +++ b/nuttx/graphics/nxglib/nxglib_rectinside.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectinside.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include <stdbool.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectintersect.c b/nuttx/graphics/nxglib/nxglib_rectintersect.c index b4e04e440..961635710 100644 --- a/nuttx/graphics/nxglib/nxglib_rectintersect.c +++ b/nuttx/graphics/nxglib/nxglib_rectintersect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectintersect.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectoffset.c b/nuttx/graphics/nxglib/nxglib_rectoffset.c index 95502ffc0..93481b0de 100644 --- a/nuttx/graphics/nxglib/nxglib_rectoffset.c +++ b/nuttx/graphics/nxglib/nxglib_rectoffset.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectoffset.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectoverlap.c b/nuttx/graphics/nxglib/nxglib_rectoverlap.c index 84d1cec7b..75d7a4641 100644 --- a/nuttx/graphics/nxglib/nxglib_rectoverlap.c +++ b/nuttx/graphics/nxglib/nxglib_rectoverlap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_nulloverlap.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ #include <stdbool.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectsize.c b/nuttx/graphics/nxglib/nxglib_rectsize.c index 93cc6861e..17a6c9214 100644 --- a/nuttx/graphics/nxglib/nxglib_rectsize.c +++ b/nuttx/graphics/nxglib/nxglib_rectsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_rectsize.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rectunion.c b/nuttx/graphics/nxglib/nxglib_rectunion.c index fa618f3d9..8500c919c 100644 --- a/nuttx/graphics/nxglib/nxglib_rectunion.c +++ b/nuttx/graphics/nxglib/nxglib_rectunion.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectunion.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c index 055598406..c439c4fe0 100644 --- a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c +++ b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/color/nxglib_rgb2yuv.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <debug.h> #include <fixedmath.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_runcopy.c b/nuttx/graphics/nxglib/nxglib_runcopy.c index b5f322c9a..4b5372f14 100644 --- a/nuttx/graphics/nxglib/nxglib_runcopy.c +++ b/nuttx/graphics/nxglib/nxglib_runcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_runcopy.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_runoffset.c b/nuttx/graphics/nxglib/nxglib_runoffset.c index eed9b713f..31d0dd163 100644 --- a/nuttx/graphics/nxglib/nxglib_runoffset.c +++ b/nuttx/graphics/nxglib/nxglib_runoffset.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_runoffset.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ #include <nuttx/config.h> #include <fixedmath.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_trapcopy.c b/nuttx/graphics/nxglib/nxglib_trapcopy.c index cfb27ba30..63bc0ecd8 100644 --- a/nuttx/graphics/nxglib/nxglib_trapcopy.c +++ b/nuttx/graphics/nxglib/nxglib_trapcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_trapcopy.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_trapoffset.c b/nuttx/graphics/nxglib/nxglib_trapoffset.c index 4f409951d..872a31072 100644 --- a/nuttx/graphics/nxglib/nxglib_trapoffset.c +++ b/nuttx/graphics/nxglib/nxglib_trapoffset.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_trapoffset.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_vectoradd.c b/nuttx/graphics/nxglib/nxglib_vectoradd.c index 031d9cd0a..b206effa6 100644 --- a/nuttx/graphics/nxglib/nxglib_vectoradd.c +++ b/nuttx/graphics/nxglib/nxglib_vectoradd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_vectoradd.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_vectsubtract.c b/nuttx/graphics/nxglib/nxglib_vectsubtract.c index a30b5c39a..81ffc86fb 100644 --- a/nuttx/graphics/nxglib/nxglib_vectsubtract.c +++ b/nuttx/graphics/nxglib/nxglib_vectsubtract.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_vectorsubtract.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxglib/nxglib_yuv2rgb.c b/nuttx/graphics/nxglib/nxglib_yuv2rgb.c index 354b18bc8..9a3cb1f22 100644 --- a/nuttx/graphics/nxglib/nxglib_yuv2rgb.c +++ b/nuttx/graphics/nxglib/nxglib_yuv2rgb.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/color/nxglib_yuv2rgb.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <debug.h> #include <fixedmath.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/graphics/nxmu/nx_bitmap.c b/nuttx/graphics/nxmu/nx_bitmap.c index 04bbb0d08..6e16b2c34 100644 --- a/nuttx/graphics/nxmu/nx_bitmap.c +++ b/nuttx/graphics/nxmu/nx_bitmap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_bitmap.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxmu/nx_closewindow.c b/nuttx/graphics/nxmu/nx_closewindow.c index 2b87af87a..22583f41b 100644 --- a/nuttx/graphics/nxmu/nx_closewindow.c +++ b/nuttx/graphics/nxmu/nx_closewindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_closewindow.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_connect.c b/nuttx/graphics/nxmu/nx_connect.c index dcfbd2996..e872f3505 100644 --- a/nuttx/graphics/nxmu/nx_connect.c +++ b/nuttx/graphics/nxmu/nx_connect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_connect.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_disconnect.c b/nuttx/graphics/nxmu/nx_disconnect.c index 82cb318ff..24fb114f4 100644 --- a/nuttx/graphics/nxmu/nx_disconnect.c +++ b/nuttx/graphics/nxmu/nx_disconnect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_disconnect.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_eventhandler.c b/nuttx/graphics/nxmu/nx_eventhandler.c index a8b97ffbb..d59364c2e 100644 --- a/nuttx/graphics/nxmu/nx_eventhandler.c +++ b/nuttx/graphics/nxmu/nx_eventhandler.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_eventhandler.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_eventnotify.c b/nuttx/graphics/nxmu/nx_eventnotify.c index 5ea712a70..189241361 100644 --- a/nuttx/graphics/nxmu/nx_eventnotify.c +++ b/nuttx/graphics/nxmu/nx_eventnotify.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_eventnotify.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/nuttx/graphics/nxmu/nx_fill.c b/nuttx/graphics/nxmu/nx_fill.c index f87ed3004..1b75cd974 100644 --- a/nuttx/graphics/nxmu/nx_fill.c +++ b/nuttx/graphics/nxmu/nx_fill.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_fill.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxmu/nx_filltrapezoid.c b/nuttx/graphics/nxmu/nx_filltrapezoid.c index b573dce19..8708225d3 100644 --- a/nuttx/graphics/nxmu/nx_filltrapezoid.c +++ b/nuttx/graphics/nxmu/nx_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_filltrapezoid.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxmu/nx_getposition.c b/nuttx/graphics/nxmu/nx_getposition.c index a57645da4..d53ddf14b 100644 --- a/nuttx/graphics/nxmu/nx_getposition.c +++ b/nuttx/graphics/nxmu/nx_getposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_getposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_kbdchin.c b/nuttx/graphics/nxmu/nx_kbdchin.c index eb3ed8013..9393e1253 100644 --- a/nuttx/graphics/nxmu/nx_kbdchin.c +++ b/nuttx/graphics/nxmu/nx_kbdchin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_kbdchin.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_KBD diff --git a/nuttx/graphics/nxmu/nx_kbdin.c b/nuttx/graphics/nxmu/nx_kbdin.c index d4951bb13..c265f86c1 100644 --- a/nuttx/graphics/nxmu/nx_kbdin.c +++ b/nuttx/graphics/nxmu/nx_kbdin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_kbdin.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_KBD diff --git a/nuttx/graphics/nxmu/nx_lower.c b/nuttx/graphics/nxmu/nx_lower.c index 4b4a61d1c..6ff57c782 100644 --- a/nuttx/graphics/nxmu/nx_lower.c +++ b/nuttx/graphics/nxmu/nx_lower.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_lower.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_mousein.c b/nuttx/graphics/nxmu/nx_mousein.c index ad3a88a13..10d32afbb 100644 --- a/nuttx/graphics/nxmu/nx_mousein.c +++ b/nuttx/graphics/nxmu/nx_mousein.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_mousein.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_MOUSE diff --git a/nuttx/graphics/nxmu/nx_move.c b/nuttx/graphics/nxmu/nx_move.c index 67f4fc3c1..6159ce0ca 100644 --- a/nuttx/graphics/nxmu/nx_move.c +++ b/nuttx/graphics/nxmu/nx_move.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_move.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_openwindow.c b/nuttx/graphics/nxmu/nx_openwindow.c index 85fec76fe..504d421a3 100644 --- a/nuttx/graphics/nxmu/nx_openwindow.c +++ b/nuttx/graphics/nxmu/nx_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_openwindow.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_raise.c b/nuttx/graphics/nxmu/nx_raise.c index e60122cea..78508d749 100644 --- a/nuttx/graphics/nxmu/nx_raise.c +++ b/nuttx/graphics/nxmu/nx_raise.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_raise.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_releasebkgd.c b/nuttx/graphics/nxmu/nx_releasebkgd.c index 4ad750b66..1326e951e 100644 --- a/nuttx/graphics/nxmu/nx_releasebkgd.c +++ b/nuttx/graphics/nxmu/nx_releasebkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_releasebkgd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_requestbkgd.c b/nuttx/graphics/nxmu/nx_requestbkgd.c index ef1c9987a..e6367a4f7 100644 --- a/nuttx/graphics/nxmu/nx_requestbkgd.c +++ b/nuttx/graphics/nxmu/nx_requestbkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_requestbkgd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_setbgcolor.c b/nuttx/graphics/nxmu/nx_setbgcolor.c index 9c3cc66c4..c2346fb39 100644 --- a/nuttx/graphics/nxmu/nx_setbgcolor.c +++ b/nuttx/graphics/nxmu/nx_setbgcolor.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setbgcolor.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_setposition.c b/nuttx/graphics/nxmu/nx_setposition.c index d5ace394d..d720f00f0 100644 --- a/nuttx/graphics/nxmu/nx_setposition.c +++ b/nuttx/graphics/nxmu/nx_setposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nx_setsize.c b/nuttx/graphics/nxmu/nx_setsize.c index aeb40e11c..5a8a4c582 100644 --- a/nuttx/graphics/nxmu/nx_setsize.c +++ b/nuttx/graphics/nxmu/nx_setsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setsize.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index 14fdfb5b5..340f772a3 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/graphics/nxmu/nxfe.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxfe.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ #include <mqueue.h> #include <semaphore.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxmu/nxmu_constructwindow.c b/nuttx/graphics/nxmu/nxmu_constructwindow.c index ba3b034d0..86df90e28 100644 --- a/nuttx/graphics/nxmu/nxmu_constructwindow.c +++ b/nuttx/graphics/nxmu/nxmu_constructwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_kbdin.c b/nuttx/graphics/nxmu/nxmu_kbdin.c index 1a3ca03ef..334d525c0 100644 --- a/nuttx/graphics/nxmu/nxmu_kbdin.c +++ b/nuttx/graphics/nxmu/nxmu_kbdin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_kbdin.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -44,7 +44,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_KBD diff --git a/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c index f1ee162d1..44ec9918a 100644 --- a/nuttx/graphics/nxmu/nxmu_mouse.c +++ b/nuttx/graphics/nxmu/nxmu_mouse.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu__mouse.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_MOUSE diff --git a/nuttx/graphics/nxmu/nxmu_openwindow.c b/nuttx/graphics/nxmu/nxmu_openwindow.c index da2ec2d6f..4cd6e661c 100644 --- a/nuttx/graphics/nxmu/nxmu_openwindow.c +++ b/nuttx/graphics/nxmu/nxmu_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_openwindow.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_redrawreq.c b/nuttx/graphics/nxmu/nxmu_redrawreq.c index 3c23d4af6..e4f0f7b9e 100644 --- a/nuttx/graphics/nxmu/nxmu_redrawreq.c +++ b/nuttx/graphics/nxmu/nxmu_redrawreq.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_redrawreq.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_releasebkgd.c b/nuttx/graphics/nxmu/nxmu_releasebkgd.c index 3f8f04bdd..3d1f24b79 100644 --- a/nuttx/graphics/nxmu/nxmu_releasebkgd.c +++ b/nuttx/graphics/nxmu/nxmu_releasebkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_releasebkgd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_reportposition.c b/nuttx/graphics/nxmu/nxmu_reportposition.c index ce206a01d..904198b22 100644 --- a/nuttx/graphics/nxmu/nxmu_reportposition.c +++ b/nuttx/graphics/nxmu/nxmu_reportposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_reportposition.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,8 +42,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_requestbkgd.c b/nuttx/graphics/nxmu/nxmu_requestbkgd.c index b8ca3e65d..0e69351e6 100644 --- a/nuttx/graphics/nxmu/nxmu_requestbkgd.c +++ b/nuttx/graphics/nxmu/nxmu_requestbkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_requestbkgd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_semtake.c b/nuttx/graphics/nxmu/nxmu_semtake.c index a08162286..10fd5bd4a 100644 --- a/nuttx/graphics/nxmu/nxmu_semtake.c +++ b/nuttx/graphics/nxmu/nxmu_semtake.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_semtake.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <assert.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 24132a17f..38df277e0 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/graphics/nxmu/nxmu_server.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_server.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -48,7 +48,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_bitmap.c b/nuttx/graphics/nxsu/nx_bitmap.c index 532a6a894..696b94afe 100644 --- a/nuttx/graphics/nxsu/nx_bitmap.c +++ b/nuttx/graphics/nxsu/nx_bitmap.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxsu/nx_close.c b/nuttx/graphics/nxsu/nx_close.c index 550be1063..a3fa9b74d 100644 --- a/nuttx/graphics/nxsu/nx_close.c +++ b/nuttx/graphics/nxsu/nx_close.c @@ -42,7 +42,7 @@ #include <stdlib.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_closewindow.c b/nuttx/graphics/nxsu/nx_closewindow.c index 27b7725d8..c5a2799ea 100644 --- a/nuttx/graphics/nxsu/nx_closewindow.c +++ b/nuttx/graphics/nxsu/nx_closewindow.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_fill.c b/nuttx/graphics/nxsu/nx_fill.c index a2156ed92..9075f82c0 100644 --- a/nuttx/graphics/nxsu/nx_fill.c +++ b/nuttx/graphics/nxsu/nx_fill.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxsu/nx_filltrapezoid.c b/nuttx/graphics/nxsu/nx_filltrapezoid.c index 4c89e3363..869ce3e1a 100644 --- a/nuttx/graphics/nxsu/nx_filltrapezoid.c +++ b/nuttx/graphics/nxsu/nx_filltrapezoid.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxsu/nx_getposition.c b/nuttx/graphics/nxsu/nx_getposition.c index 91bb284e4..8760d84c1 100644 --- a/nuttx/graphics/nxsu/nx_getposition.c +++ b/nuttx/graphics/nxsu/nx_getposition.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_kbdchin.c b/nuttx/graphics/nxsu/nx_kbdchin.c index 51f4d8ce1..7ecea5db9 100644 --- a/nuttx/graphics/nxsu/nx_kbdchin.c +++ b/nuttx/graphics/nxsu/nx_kbdchin.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_KBD diff --git a/nuttx/graphics/nxsu/nx_kbdin.c b/nuttx/graphics/nxsu/nx_kbdin.c index 066c31c8e..9fc8460bd 100644 --- a/nuttx/graphics/nxsu/nx_kbdin.c +++ b/nuttx/graphics/nxsu/nx_kbdin.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #ifdef CONFIG_NX_KBD diff --git a/nuttx/graphics/nxsu/nx_lower.c b/nuttx/graphics/nxsu/nx_lower.c index a5373a429..dbfd278c4 100644 --- a/nuttx/graphics/nxsu/nx_lower.c +++ b/nuttx/graphics/nxsu/nx_lower.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c index 2d4c9bec9..01505ee8b 100644 --- a/nuttx/graphics/nxsu/nx_mousein.c +++ b/nuttx/graphics/nxsu/nx_mousein.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_mousein.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxsu/nx_move.c b/nuttx/graphics/nxsu/nx_move.c index ffce178f5..b16cf3525 100644 --- a/nuttx/graphics/nxsu/nx_move.c +++ b/nuttx/graphics/nxsu/nx_move.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c index 3ba3e6029..f5e07dc5e 100644 --- a/nuttx/graphics/nxsu/nx_open.c +++ b/nuttx/graphics/nxsu/nx_open.c @@ -45,7 +45,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c index f960d1a90..57b47251b 100644 --- a/nuttx/graphics/nxsu/nx_openwindow.c +++ b/nuttx/graphics/nxsu/nx_openwindow.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_raise.c b/nuttx/graphics/nxsu/nx_raise.c index 971e565f0..cf4e38b64 100644 --- a/nuttx/graphics/nxsu/nx_raise.c +++ b/nuttx/graphics/nxsu/nx_raise.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_releasebkgd.c b/nuttx/graphics/nxsu/nx_releasebkgd.c index 38772c3e0..a19b85ac4 100644 --- a/nuttx/graphics/nxsu/nx_releasebkgd.c +++ b/nuttx/graphics/nxsu/nx_releasebkgd.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_requestbkgd.c b/nuttx/graphics/nxsu/nx_requestbkgd.c index cc56e1019..5bd4554bc 100644 --- a/nuttx/graphics/nxsu/nx_requestbkgd.c +++ b/nuttx/graphics/nxsu/nx_requestbkgd.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_setbgcolor.c b/nuttx/graphics/nxsu/nx_setbgcolor.c index 167d51600..d8c2159ef 100644 --- a/nuttx/graphics/nxsu/nx_setbgcolor.c +++ b/nuttx/graphics/nxsu/nx_setbgcolor.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_setposition.c b/nuttx/graphics/nxsu/nx_setposition.c index f54c81fc9..44e66061f 100644 --- a/nuttx/graphics/nxsu/nx_setposition.c +++ b/nuttx/graphics/nxsu/nx_setposition.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nx_setsize.c b/nuttx/graphics/nxsu/nx_setsize.c index 8eafaf3ef..19d20e5d2 100644 --- a/nuttx/graphics/nxsu/nx_setsize.c +++ b/nuttx/graphics/nxsu/nx_setsize.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h index aa9fb49a9..59e5c185d 100644 --- a/nuttx/graphics/nxsu/nxfe.h +++ b/nuttx/graphics/nxsu/nxfe.h @@ -45,7 +45,7 @@ #include <mqueue.h> #include <semaphore.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxsu/nxsu_constructwindow.c b/nuttx/graphics/nxsu/nxsu_constructwindow.c index 5d7fcc040..8ad803005 100644 --- a/nuttx/graphics/nxsu/nxsu_constructwindow.c +++ b/nuttx/graphics/nxsu/nxsu_constructwindow.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nxsu_redrawreq.c b/nuttx/graphics/nxsu/nxsu_redrawreq.c index 627c7f702..9efa828a5 100644 --- a/nuttx/graphics/nxsu/nxsu_redrawreq.c +++ b/nuttx/graphics/nxsu/nxsu_redrawreq.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxsu/nxsu_reportposition.c b/nuttx/graphics/nxsu/nxsu_reportposition.c index 71b76aa63..d87dac0f6 100644 --- a/nuttx/graphics/nxsu/nxsu_reportposition.c +++ b/nuttx/graphics/nxsu/nxsu_reportposition.c @@ -42,7 +42,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" /**************************************************************************** diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index 69d1badf4..6a2063a26 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -42,8 +42,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c index e4670c6f7..a439f5f79 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c @@ -42,8 +42,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxtk.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nxtk.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_closetoolbar.c b/nuttx/graphics/nxtk/nxtk_closetoolbar.c index eaaef83e7..dff621a44 100644 --- a/nuttx/graphics/nxtk/nxtk_closetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_closetoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_closewindow.c b/nuttx/graphics/nxtk/nxtk_closewindow.c index edc9e457d..e921f669e 100644 --- a/nuttx/graphics/nxtk/nxtk_closewindow.c +++ b/nuttx/graphics/nxtk/nxtk_closewindow.c @@ -44,8 +44,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_containerclip.c b/nuttx/graphics/nxtk/nxtk_containerclip.c index 386425de3..3671851f1 100644 --- a/nuttx/graphics/nxtk/nxtk_containerclip.c +++ b/nuttx/graphics/nxtk/nxtk_containerclip.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_drawframe.c b/nuttx/graphics/nxtk/nxtk_drawframe.c index d86d55312..edf3dcac8 100644 --- a/nuttx/graphics/nxtk/nxtk_drawframe.c +++ b/nuttx/graphics/nxtk/nxtk_drawframe.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_drawframe.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -43,9 +43,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nxglib.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_events.c b/nuttx/graphics/nxtk/nxtk_events.c index cbcbabe4b..e778b2736 100644 --- a/nuttx/graphics/nxtk/nxtk_events.c +++ b/nuttx/graphics/nxtk/nxtk_events.c @@ -47,7 +47,7 @@ #include <errno.h> #include <assert.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" /**************************************************************************** diff --git a/nuttx/graphics/nxtk/nxtk_filltoolbar.c b/nuttx/graphics/nxtk/nxtk_filltoolbar.c index f151876ec..c39199e6a 100644 --- a/nuttx/graphics/nxtk/nxtk_filltoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c index d3362fa6f..1f04e9b43 100644 --- a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c index a489364c4..c84c055f8 100644 --- a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_fillwindow.c b/nuttx/graphics/nxtk/nxtk_fillwindow.c index fe0b1c8d4..e971ce06b 100644 --- a/nuttx/graphics/nxtk/nxtk_fillwindow.c +++ b/nuttx/graphics/nxtk/nxtk_fillwindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_getposition.c b/nuttx/graphics/nxtk/nxtk_getposition.c index 24ca26b70..e6cce6026 100644 --- a/nuttx/graphics/nxtk/nxtk_getposition.c +++ b/nuttx/graphics/nxtk/nxtk_getposition.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_internal.h b/nuttx/graphics/nxtk/nxtk_internal.h index fe7792476..f76304b78 100644 --- a/nuttx/graphics/nxtk/nxtk_internal.h +++ b/nuttx/graphics/nxtk/nxtk_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_internal.h * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #include <nuttx/config.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nxtk.h> #include "nxbe.h" #include "nxfe.h" diff --git a/nuttx/graphics/nxtk/nxtk_lower.c b/nuttx/graphics/nxtk/nxtk_lower.c index e0b59f285..256ed27da 100644 --- a/nuttx/graphics/nxtk/nxtk_lower.c +++ b/nuttx/graphics/nxtk/nxtk_lower.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_movetoolbar.c b/nuttx/graphics/nxtk/nxtk_movetoolbar.c index 430e5461e..088611382 100644 --- a/nuttx/graphics/nxtk/nxtk_movetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_movetoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_movewindow.c b/nuttx/graphics/nxtk/nxtk_movewindow.c index 134d1935e..4c45c101c 100644 --- a/nuttx/graphics/nxtk/nxtk_movewindow.c +++ b/nuttx/graphics/nxtk/nxtk_movewindow.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_opentoolbar.c b/nuttx/graphics/nxtk/nxtk_opentoolbar.c index e2de68226..0bcc02fa8 100644 --- a/nuttx/graphics/nxtk/nxtk_opentoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_opentoolbar.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_openwindow.c b/nuttx/graphics/nxtk/nxtk_openwindow.c index c57918869..3716e63ca 100644 --- a/nuttx/graphics/nxtk/nxtk_openwindow.c +++ b/nuttx/graphics/nxtk/nxtk_openwindow.c @@ -43,7 +43,7 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_raise.c b/nuttx/graphics/nxtk/nxtk_raise.c index 33c22b722..1e35f3ab2 100644 --- a/nuttx/graphics/nxtk/nxtk_raise.c +++ b/nuttx/graphics/nxtk/nxtk_raise.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setposition.c b/nuttx/graphics/nxtk/nxtk_setposition.c index 053f74256..dd090e639 100644 --- a/nuttx/graphics/nxtk/nxtk_setposition.c +++ b/nuttx/graphics/nxtk/nxtk_setposition.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setsize.c b/nuttx/graphics/nxtk/nxtk_setsize.c index 07e9e0242..054a62c59 100644 --- a/nuttx/graphics/nxtk/nxtk_setsize.c +++ b/nuttx/graphics/nxtk/nxtk_setsize.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_setsubwindows.c b/nuttx/graphics/nxtk/nxtk_setsubwindows.c index 5ddb2ce03..251008361 100644 --- a/nuttx/graphics/nxtk/nxtk_setsubwindows.c +++ b/nuttx/graphics/nxtk/nxtk_setsubwindows.c @@ -44,7 +44,7 @@ #include <debug.h> #include <errno.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> #include "nxtk_internal.h" /**************************************************************************** diff --git a/nuttx/graphics/nxtk/nxtk_subwindowclip.c b/nuttx/graphics/nxtk/nxtk_subwindowclip.c index 7600074ce..4d453eeca 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowclip.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowclip.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/graphics/nxtk/nxtk_subwindowmove.c b/nuttx/graphics/nxtk/nxtk_subwindowmove.c index f532c6675..ed6a264e7 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowmove.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowmove.c @@ -43,8 +43,8 @@ #include <errno.h> #include <debug.h> -#include <nuttx/nx.h> -#include <nuttx/nxtk.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxtk.h> #include "nxfe.h" #include "nxtk_internal.h" diff --git a/nuttx/include/nuttx/nx.h b/nuttx/include/nuttx/nx/nx.h index 8f08de678..c031a3bf9 100644 --- a/nuttx/include/nuttx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -1,7 +1,7 @@ /**************************************************************************** - * include/nuttx/nx.h + * include/nuttx/nx/nx.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _INCLUDE_NUTTX_NX_H -#define _INCLUDE_NUTTX_NX_H +#ifndef _INCLUDE_NUTTX_NX_NX_H +#define _INCLUDE_NUTTX_NX_NX_H /**************************************************************************** * Included Files @@ -45,7 +45,7 @@ #include <stdint.h> #include <stdbool.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-Processor Definitions @@ -710,5 +710,5 @@ EXTERN int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t b } #endif -#endif /* _INCLUDE_NUTTX_NX_H */ +#endif /* _INCLUDE_NUTTX_NX_NX_H */ diff --git a/nuttx/include/nuttx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h index 94c94e597..4ed62f68e 100644 --- a/nuttx/include/nuttx/nxfonts.h +++ b/nuttx/include/nuttx/nx/nxfonts.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/nxfonts.h + * include/nuttx/nx/nxfonts.h * * Copyright (C) 2008, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NXFONTS_H -#define __INCLUDE_NUTTX_NXFONTS_H +#ifndef __INCLUDE_NUTTX_NX_NXFONTS_H +#define __INCLUDE_NUTTX_NX_NXFONTS_H /**************************************************************************** * Included Files @@ -44,8 +44,8 @@ #include <stdint.h> -#include <nuttx/nx.h> -#include <nuttx/nxglib.h> +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxglib.h> /**************************************************************************** * Pre-processor definitions @@ -242,4 +242,4 @@ EXTERN int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, } #endif -#endif /* __INCLUDE_NUTTX_NXFONTS_H */ +#endif /* __INCLUDE_NUTTX_NX_NXFONTS_H */ diff --git a/nuttx/include/nuttx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h index db07b7743..fe73d2536 100644 --- a/nuttx/include/nuttx/nxglib.h +++ b/nuttx/include/nuttx/nx/nxglib.h @@ -1,7 +1,7 @@ /**************************************************************************** - * include/nuttx/nxglib.h + * include/nuttx/nx/nxglib.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NXGLIB_H -#define __INCLUDE_NUTTX_NXGLIB_H +#ifndef __INCLUDE_NUTTX_NX_NXGLIB_H +#define __INCLUDE_NUTTX_NX_NXGLIB_H /**************************************************************************** * Included Files @@ -552,4 +552,4 @@ EXTERN void nxgl_colorcopy(nxgl_mxpixel_t dest[CONFIG_NX_NPLANES], } #endif -#endif /* __INCLUDE_NUTTX_NXGLIB_H */ +#endif /* __INCLUDE_NUTTX_NX_NXGLIB_H */ diff --git a/nuttx/include/nuttx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h index d4a5decf3..76416ecbb 100644 --- a/nuttx/include/nuttx/nxtk.h +++ b/nuttx/include/nuttx/nx/nxtk.h @@ -1,7 +1,7 @@ /**************************************************************************** - * include/nuttx/nxtk.h + * include/nuttx/nx/nxtk.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NXTK_H -#define __INCLUDE_NUTTX_NXTK_H +#ifndef __INCLUDE_NUTTX_NX_NXTK_H +#define __INCLUDE_NUTTX_NX_NXTK_H /**************************************************************************** * Included Files @@ -42,7 +42,7 @@ #include <nuttx/config.h> -#include <nuttx/nx.h> +#include <nuttx/nx/nx.h> /**************************************************************************** * Pre-processor definitions @@ -420,4 +420,4 @@ EXTERN int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, } #endif -#endif /* __INCLUDE_NUTTX_NXTK_H */ +#endif /* __INCLUDE_NUTTX_NX_NXTK_H */ diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt index 549b6e31a..e6f65081d 100755 --- a/nuttx/tools/README.txt +++ b/nuttx/tools/README.txt @@ -96,12 +96,12 @@ bdf-convert.c 3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file. A font ID number has to be assigned for each new font. The font ID - is defined in the file include/nuttx/nxfonts.h. Those definitions + is defined in the file include/nuttx/nx/nxfonts.h. Those definitions have to be extended to support your new font. Look at how the font ID enabled by CONFIG_NXFONT_SANS23X27 is defined and add an ID for your new font in a similar fashion: - 4. include/nuttx/nxfonts.h. Add you new font as a possible system + 4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system default font: #if defined(CONFIG_NXFONT_SANS23X27) @@ -132,7 +132,7 @@ bdf-convert.c a C source file from the header file that you generated with the the bdf-converter program. Notice NXFONTS_FONTID=2; this must be set to the same font ID value that you defined in the - include/nuttx/nxfonts.h file. + include/nuttx/nx/nxfonts.h file. genfontsources: ifeq ($(CONFIG_NXFONT_SANS23X27),y) |