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
This commit is contained in:
patacongo
2011-07-24 20:49:01 +00:00
parent 9d0882c525
commit bc4d0f1167
132 changed files with 415 additions and 400 deletions
+2
View File
@@ -1943,3 +1943,5 @@
program. The bdf-converter program be used to convert fonts in Bitmap 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 Distribution Format (BDF) into fonts that can be used in the NX graphics
system. system.
* include/nuttx/nx: Move all NX header files from include/nuttx to
include/nuttx/nx.
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -46,7 +46,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/fb.h> #include <nuttx/fb.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "up_arch.h" #include "up_arch.h"
#include "dm320_memorymap.h" #include "dm320_memorymap.h"
+13 -13
View File
@@ -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, NX - The tiny NuttX windowing system. This includes both a small-footprint,
single user implementaton (NXSU as described below) and a somewhat single user implementaton (NXSU as described below) and a somewhat
larger multi-user implentation (NXMU as described below). Both 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 are more-or-less interchangable. NX can be used without NXWIDGETS
and without NXTOOLKIT for raw access to window memory. and without NXTOOLKIT for raw access to window memory.
NXGLIB - Low level graphics utilities and direct framebuffer rendering logic. 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 Related Header Files
^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
include/nuttx/nxglib.h -- Describes the NXGLIB C interfaces include/nuttx/nx/nxglib.h -- Describes the NXGLIB C interfaces
include/nuttx/nx.h -- Describes the NX C interfaces include/nuttx/nx/nx.h -- Describes the NX C interfaces
include/nutt/nxtk.h -- Describe the NXTOOLKIT C interfaces include/nuttx/nx/nxtk.h -- Describe the NXTOOLKIT C interfaces
include/nutt/nxfont.h -- Describe sthe NXFONT C interfaces include/nuttx/nx/nxfont.h -- Describe sthe NXFONT C interfaces
include/nuttx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned) include/nuttx/nx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned)
Directories Directories
^^^^^^^^^^^ ^^^^^^^^^^^
@@ -63,14 +63,14 @@ graphics/nxbe
graphics/nxsu graphics/nxsu
This is the NX single user "front end". When combined with the generic "back-end" 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 (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 single user front-end is selected when CONFIG_NX_MULTIUSER is not defined in the
NuttX configuration file. NuttX configuration file.
graphics/nxmu graphics/nxmu
This is the NX multi user "front end". When combined with the generic "back-end" 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 (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; 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 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 queue to serialize window operations from many threads. The multi-user front-end
@@ -78,12 +78,12 @@ graphics/nxmu
graphics/nxfonts graphics/nxfonts
This is where the NXFONTS implementation resides. This is a relatively low- 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 graphics/nxtk
This is where the NXTOOLKIT implementation resides. This toolkit is built on 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 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 graphics/nxwidgets
At one time, I planned to put NXWIDGETS implementation here, but not anymore. 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. 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 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 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 enabled by CONFIG_NXFONT_SANS23X27 is defined and add an ID for your
new font in a similar fashion: 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: default font:
#if defined(CONFIG_NXFONT_SANS23X27) #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 a C source file from the header file that you generated with the
the bdf-converter program. Notice NXFONTS_FONTID=2; this must be the bdf-converter program. Notice NXFONTS_FONTID=2; this must be
set to the same font ID value that you defined in the set to the same font ID value that you defined in the
include/nuttx/nxfonts.h file. include/nuttx/nx/nxfonts.h file.
genfontsources: genfontsources:
ifeq ($(CONFIG_NXFONT_SANS23X27),y) ifeq ($(CONFIG_NXFONT_SANS23X27),y)
+2 -2
View File
@@ -45,8 +45,8 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <nuttx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+1 -1
View File
@@ -42,7 +42,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/**************************************************************************** /****************************************************************************
+1 -1
View File
@@ -44,7 +44,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/**************************************************************************** /****************************************************************************
+1 -1
View File
@@ -43,7 +43,7 @@
#include <assert.h> #include <assert.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/**************************************************************************** /****************************************************************************
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_fill.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
+1 -1
View File
@@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_lower.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <stddef.h> #include <stddef.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/**************************************************************************** /****************************************************************************
+1 -1
View File
@@ -41,7 +41,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_raise.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_redraw.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_setposition.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_setsize.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe_redraw.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+1 -1
View File
@@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdint.h> #include <stdint.h>
#include <nuttx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxfonts_internal.h" #include "nxfonts_internal.h"
+2 -2
View File
@@ -43,8 +43,8 @@
#include <stddef.h> #include <stddef.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include <nuttx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxfonts_internal.h" #include "nxfonts_internal.h"
+2 -2
View File
@@ -43,8 +43,8 @@
#include <stddef.h> #include <stddef.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx/nx.h>
#include <nuttx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
#include "nxfonts_internal.h" #include "nxfonts_internal.h"
+1 -1
View File
@@ -42,7 +42,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
/**************************************************************************** /****************************************************************************
* Pre-processor definitions * Pre-processor definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/fb/nxsglib_copyrectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/fb.h> #include <nuttx/fb.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/fb/nxglib_fillrectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/fb.h> #include <nuttx/fb.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/fb/nxglib_filltrapezoid.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/fb.h> #include <nuttx/fb.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/fb/nxglib_moverectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/fb.h> #include <nuttx/fb.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/lcd/nxsglib_copyrectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <assert.h> #include <assert.h>
#include <nuttx/lcd/lcd.h> #include <nuttx/lcd/lcd.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
#include "nxglib_copyrun.h" #include "nxglib_copyrun.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/lcd/nxglib_fillrectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/lcd/lcd.h> #include <nuttx/lcd/lcd.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
#include "nxglib_fillrun.h" #include "nxglib_fillrun.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/lcd/nxglib_filltrapezoid.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/lcd/lcd.h> #include <nuttx/lcd/lcd.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
#include "nxglib_fillrun.h" #include "nxglib_fillrun.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/lcd/nxglib_moverectangle.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/lcd/lcd.h> #include <nuttx/lcd/lcd.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxglib_bitblit.h" #include "nxglib_bitblit.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxglib_bitblit.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
#include <stdint.h> #include <stdint.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_colorcopy.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectnonintersecting.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_nullrect.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectcopy.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectinside.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectintersect.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectoffset.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_nulloverlap.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxglib_rectsize.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_rectunion.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/color/nxglib_rgb2yuv.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <debug.h> #include <debug.h>
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_runcopy.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_runoffset.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_trapcopy.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_trapoffset.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_vectoradd.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxglib/nxsglib_vectorsubtract.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/color/nxglib_yuv2rgb.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <debug.h> #include <debug.h>
#include <fixedmath.h> #include <fixedmath.h>
#include <nuttx/nxglib.h> #include <nuttx/nx/nxglib.h>
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxmu/nx_bitmap.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx/nx.h>
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxmu/nx_closewindow.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/nx.h> #include <nuttx/nx/nx.h>
#include "nxfe.h" #include "nxfe.h"
/**************************************************************************** /****************************************************************************

Some files were not shown because too many files have changed in this diff Show More