diff options
121 files changed, 387 insertions, 452 deletions
diff --git a/nuttx/graphics/nxbe/nxbe.h b/nuttx/graphics/nxbe/nxbe.h index 533303928..f9b36c0a3 100644 --- a/nuttx/graphics/nxbe/nxbe.h +++ b/nuttx/graphics/nxbe/nxbe.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,9 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> +#include <stdbool.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -411,8 +413,8 @@ EXTERN void nxbe_redrawbelow(FAR struct nxbe_state_s *be, * ****************************************************************************/ -EXTERN boolean nxbe_visible(FAR struct nxbe_window_s *wnd, - FAR const struct nxgl_point_s *pos); +EXTERN bool nxbe_visible(FAR struct nxbe_window_s *wnd, + FAR const struct nxgl_point_s *pos); /**************************************************************************** * Name: nxbe_clipper @@ -437,7 +439,7 @@ EXTERN boolean nxbe_visible(FAR struct nxbe_window_s *wnd, ****************************************************************************/ EXTERN void nxbe_clipper(FAR struct nxbe_window_s *wnd, - FAR const struct nxgl_rect_s *dest, ubyte order, + FAR const struct nxgl_rect_s *dest, uint8_t order, FAR struct nxbe_clipops_s *cops, FAR struct nxbe_plane_s *plane); diff --git a/nuttx/graphics/nxbe/nxbe_bitmap.c b/nuttx/graphics/nxbe/nxbe_bitmap.c index 293033dc2..6977b97ab 100644 --- a/nuttx/graphics/nxbe/nxbe_bitmap.c +++ b/nuttx/graphics/nxbe/nxbe_bitmap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_bitmap.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_clipper.c b/nuttx/graphics/nxbe/nxbe_clipper.c index c66f74c7b..d60ee4277 100644 --- a/nuttx/graphics/nxbe/nxbe_clipper.c +++ b/nuttx/graphics/nxbe/nxbe_clipper.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_clipper.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <stdlib.h> #include <debug.h> @@ -70,8 +71,8 @@ struct nxbe_cliprect_s struct nxbe_clipstack_s { - uint16 npushed; /* Number of deferred rectangles in stack */ - uint16 mxrects; /* The capacity of the stack */ + uint16_t npushed; /* Number of deferred rectangles in stack */ + uint16_t mxrects; /* The capacity of the stack */ struct nxbe_cliprect_s *stack; /* The stack of deferred rectangles */ }; @@ -79,7 +80,7 @@ struct nxbe_clipstack_s * Private Data ****************************************************************************/ -static const ubyte g_nxcliporder[4][4] = +static const uint8_t g_nxcliporder[4][4] = { { NX_TOP_NDX, NX_LEFT_NDX, NX_RIGHT_NDX, NX_BOTTOM_NDX }, /* index = NX_CLIPORDER_TLRB */ { NX_TOP_NDX, NX_RIGHT_NDX, NX_LEFT_NDX, NX_BOTTOM_NDX }, /* NX_CLIPORDER_TRLB */ @@ -134,18 +135,18 @@ static inline void nxbe_pushrectangle(FAR struct nxbe_clipstack_s *stack, * Name: nxbe_poprectangle ****************************************************************************/ -static inline boolean nxbe_poprectangle(struct nxbe_clipstack_s *stack, - FAR struct nxbe_window_s **wnd, - struct nxgl_rect_s *rect) +static inline bool nxbe_poprectangle(struct nxbe_clipstack_s *stack, + FAR struct nxbe_window_s **wnd, + struct nxgl_rect_s *rect) { if(stack->npushed > 0) { stack->npushed--; *wnd = stack->stack[stack->npushed].wnd; nxgl_rectcopy(rect, &stack->stack[stack->npushed].rect); - return TRUE; + return true; } - return FALSE; + return false; } /**************************************************************************** @@ -175,7 +176,7 @@ static inline boolean nxbe_poprectangle(struct nxbe_clipstack_s *stack, ****************************************************************************/ void nxbe_clipper(FAR struct nxbe_window_s *wnd, - FAR const struct nxgl_rect_s *dest, ubyte order, + FAR const struct nxgl_rect_s *dest, uint8_t order, FAR struct nxbe_clipops_s *cops, FAR struct nxbe_plane_s *plane) { diff --git a/nuttx/graphics/nxbe/nxbe_closewindow.c b/nuttx/graphics/nxbe/nxbe_closewindow.c index 7d7a79eb7..c5c15023c 100644 --- a/nuttx/graphics/nxbe/nxbe_closewindow.c +++ b/nuttx/graphics/nxbe/nxbe_closewindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_closewindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <assert.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_colormap.c b/nuttx/graphics/nxbe/nxbe_colormap.c index 509cf4f45..25a493d1d 100644 --- a/nuttx/graphics/nxbe/nxbe_colormap.c +++ b/nuttx/graphics/nxbe/nxbe_colormap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_colormap.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <errno.h> @@ -85,12 +85,12 @@ int nxbe_colormap(FAR struct fb_vtable_s *fb) { struct fb_cmap_s cmap; - ubyte *alloc; - ubyte *red; - ubyte *green; - ubyte *blue; - ubyte rval; - ubyte gval; + uint8_t *alloc; + uint8_t *red; + uint8_t *green; + uint8_t *blue; + uint8_t rval; + uint8_t gval; int size; int ndx; int ret; @@ -98,8 +98,8 @@ int nxbe_colormap(FAR struct fb_vtable_s *fb) /* Allocate the color map tables */ - size = 3 * CONFIG_NX_NCOLORS * sizeof(uint16); - alloc = (ubyte*)malloc(size); + size = 3 * CONFIG_NX_NCOLORS * sizeof(uint16_t); + alloc = (uint8_t*)malloc(size); if (alloc < 0) { return -ENOMEM; diff --git a/nuttx/graphics/nxbe/nxbe_fbconfigure.c b/nuttx/graphics/nxbe/nxbe_fbconfigure.c index 3bf7f68c6..fb3e51f6c 100644 --- a/nuttx/graphics/nxbe/nxbe_fbconfigure.c +++ b/nuttx/graphics/nxbe/nxbe_fbconfigure.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_fbconfigure.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_fill.c b/nuttx/graphics/nxbe/nxbe_fill.c index fca2445b0..ebec3c886 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <nuttx/nxglib.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxbe/nxbe_filltrapezoid.c b/nuttx/graphics/nxbe/nxbe_filltrapezoid.c index f465abbdd..ed7bf322c 100644 --- a/nuttx/graphics/nxbe/nxbe_filltrapezoid.c +++ b/nuttx/graphics/nxbe/nxbe_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_filltrapezoid.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <fixedmath.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxbe/nxbe_lower.c b/nuttx/graphics/nxbe/nxbe_lower.c index 83ce18c1f..334f50492 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxbe/nxbe_move.c b/nuttx/graphics/nxbe/nxbe_move.c index d0237ec4e..2775565f3 100644 --- a/nuttx/graphics/nxbe/nxbe_move.c +++ b/nuttx/graphics/nxbe/nxbe_move.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_move.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <nuttx/nxglib.h> @@ -59,7 +60,7 @@ struct nxbe_move_s struct nxgl_point_s offset; FAR struct nxbe_window_s *wnd; struct nxgl_rect_s srcrect; - ubyte order; + uint8_t order; }; /**************************************************************************** diff --git a/nuttx/graphics/nxbe/nxbe_raise.c b/nuttx/graphics/nxbe/nxbe_raise.c index b9282ba8f..fccc5965e 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxbe/nxbe_redraw.c b/nuttx/graphics/nxbe/nxbe_redraw.c index 25a8e0ee4..e844bb72d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_redrawbelow.c b/nuttx/graphics/nxbe/nxbe_redrawbelow.c index b5ad2bd37..2716a26bf 100644 --- a/nuttx/graphics/nxbe/nxbe_redrawbelow.c +++ b/nuttx/graphics/nxbe/nxbe_redrawbelow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxbe/nxbe_redraw.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxbe/nxbe_setposition.c b/nuttx/graphics/nxbe/nxbe_setposition.c index 3130a67ec..8535704d6 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxbe/nxbe_setsize.c b/nuttx/graphics/nxbe/nxbe_setsize.c index 133b68b67..b2597b901 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxbe/nxbe_visible.c b/nuttx/graphics/nxbe/nxbe_visible.c index 9132ebf1a..3b43c70ca 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdbool.h> #include <errno.h> #include <debug.h> @@ -59,7 +59,7 @@ struct nxbe_visible_s { struct nxbe_clipops_s cops; - boolean visible; + bool visible; }; /**************************************************************************** @@ -83,7 +83,7 @@ static void nxbe_clipvisible(FAR struct nxbe_clipops_s *cops, FAR const struct nxgl_rect_s *rect) { FAR struct nxbe_visible_s *info = (FAR struct nxbe_visible_s *)cops; - info->visible = TRUE; + info->visible = true; } /**************************************************************************** @@ -99,8 +99,8 @@ static void nxbe_clipvisible(FAR struct nxbe_clipops_s *cops, * ****************************************************************************/ -boolean nxbe_visible(FAR struct nxbe_window_s *wnd, - FAR const struct nxgl_point_s *pos) +bool nxbe_visible(FAR struct nxbe_window_s *wnd, + FAR const struct nxgl_point_s *pos) { struct nxbe_visible_s info; @@ -108,14 +108,14 @@ boolean nxbe_visible(FAR struct nxbe_window_s *wnd, if (!nxgl_rectinside(&wnd->bounds, pos)) { - return FALSE; + return false; } /* If this is the top window, then the psition is visible */ if (!wnd->above) { - return TRUE; + return true; } /* The position within the window range, but the window is not at @@ -125,10 +125,10 @@ boolean nxbe_visible(FAR struct nxbe_window_s *wnd, info.cops.visible = nxbe_clipvisible; info.cops.obscured = nxbe_clipnull; - info.visible = FALSE; + info.visible = false; nxbe_clipper(wnd->above, &wnd->bounds, NX_CLIPORDER_DEFAULT, - &info.cops, &wnd->be->plane[0]); + &info.cops, &wnd->be->plane[0]); return info.visible; } diff --git a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c index ff69f786a..f215260cf 100644 --- a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c +++ b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxfonts/nxfonts_bitmap.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <nuttx/nxfonts.h> #include "nxfonts_internal.h" @@ -60,7 +61,7 @@ #define NXFONT_CONCAT(a,b) a##b #define NXFONT_DEFBITMAP(n) \ -static const ubyte NXFONT_CONCAT(g_bitmap_,n)[] = NXFONT_CONCAT(NXFONT_BITMAP_,n) +static const uint8_t NXFONT_CONCAT(g_bitmap_,n)[] = NXFONT_CONCAT(NXFONT_BITMAP_,n) #define NXFONT_DEFMETRIC(n) \ { NXFONT_CONCAT(NXFONT_METRICS_,n), NXFONT_CONCAT(g_bitmap_,n) } diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/graphics/nxfonts/nxfonts_convert.c index 217605293..0599faa9b 100644 --- a/nuttx/graphics/nxfonts/nxfonts_convert.c +++ b/nuttx/graphics/nxfonts/nxfonts_convert.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxfonts/nxfonts_convert.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <debug.h> #include <nuttx/nxglib.h> @@ -62,35 +63,35 @@ # define NXF_PIXELMASK 0x03 # define NXF_SCALEX(x) ((x) >> 2) -# define NXF_PIXEL_T ubyte -# define NXF_MULTIPIXEL(p) ((ubyte)(p) << 6 | (ubyte)(p) << 4 | (ubyte)(p) << 2 | (p)) +# define NXF_PIXEL_T uint8_t +# define NXF_MULTIPIXEL(p) ((uint8_t)(p) << 6 | (uint8_t)(p) << 4 | (uint8_t)(p) << 2 | (p)) #elif NXFONTS_BITSPERPIXEL == 4 # define NXF_PIXELMASK 0x0f # define NXF_SCALEX(x) ((x) >> 1) -# define NXF_PIXEL_T ubyte -# define NXF_MULTIPIXEL(p) ((ubyte)(p) << 4 | (p)) +# define NXF_PIXEL_T uint8_t +# define NXF_MULTIPIXEL(p) ((uint8_t)(p) << 4 | (p)) #elif NXFONTS_BITSPERPIXEL == 8 # define NXF_SCALEX(x) (x) -# define NXF_PIXEL_T ubyte +# define NXF_PIXEL_T uint8_t #elif NXFONTS_BITSPERPIXEL == 16 # define NXF_SCALEX(x) ((x) << 1) -# define NXF_PIXEL_T uint16 +# define NXF_PIXEL_T uint16_t #elif NXFONTS_BITSPERPIXEL == 24 # define NXF_SCALEX(x) (((x) << 1) + (x)) -# define NXF_PIXEL_T uint32 +# define NXF_PIXEL_T uint32_t #elif NXFONTS_BITSPERPIXEL == 32 # define NXF_SCALEX(x) ((x) << 2) -# define NXF_PIXEL_T uint32 +# define NXF_PIXEL_T uint32_t #endif @@ -137,14 +138,14 @@ ****************************************************************************/ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) -(FAR NXF_PIXEL_T *dest, uint16 height, uint16 width, uint16 stride, +(FAR NXF_PIXEL_T *dest, uint16_t height, uint16_t width, uint16_t stride, FAR const struct nx_fontbitmap_s *bm, nxgl_mxpixel_t color) { - FAR ubyte *line; + FAR uint8_t *line; FAR NXF_PIXEL_T *dptr; - FAR const ubyte *sptr; - ubyte bmbyte; - ubyte bmbit; + FAR const uint8_t *sptr; + uint8_t bmbyte; + uint8_t bmbit; int row; int col; int bmndx; @@ -158,7 +159,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) /* Get the starting position */ - line = (ubyte*)dest + bm->metric.yoffset * stride + NXF_SCALEX(bm->metric.xoffset); + line = (uint8_t*)dest + bm->metric.yoffset * stride + NXF_SCALEX(bm->metric.xoffset); /* Then copy the font */ diff --git a/nuttx/graphics/nxfonts/nxfonts_getfont.c b/nuttx/graphics/nxfonts/nxfonts_getfont.c index c8ae4d018..9fcc57155 100644 --- a/nuttx/graphics/nxfonts/nxfonts_getfont.c +++ b/nuttx/graphics/nxfonts/nxfonts_getfont.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxfonts/nxfonts_getfont.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <debug.h> #include <nuttx/nxfonts.h> @@ -73,7 +74,7 @@ * ****************************************************************************/ -static inline FAR const struct nx_fontset_s *nxf_getglyphset(uint16 ch) +static inline FAR const struct nx_fontset_s *nxf_getglyphset(uint16_t ch) { if (ch < 128) { @@ -133,7 +134,7 @@ FAR const struct nx_font_s *nxf_getfontset(void) * ****************************************************************************/ -FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16 ch) +FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch) { FAR const struct nx_fontset_s *set = nxf_getglyphset(ch); FAR struct nx_fontbitmap_s *bm = NULL; diff --git a/nuttx/graphics/nxfonts/nxfonts_internal.h b/nuttx/graphics/nxfonts/nxfonts_internal.h index 3167f96b1..c8118d169 100644 --- a/nuttx/graphics/nxfonts/nxfonts_internal.h +++ b/nuttx/graphics/nxfonts/nxfonts_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxfonts/nxfonts_internal.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxfonts.h> diff --git a/nuttx/graphics/nxglib/nxglib_bitblit.h b/nuttx/graphics/nxglib/nxglib_bitblit.h index b3deb66dd..27a4ee37d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <nuttx/nxglib.h> @@ -64,41 +65,41 @@ # define NXGL_PIXELSHIFT 3 # define NXGL_PIXELMASK 7 # define NXGL_MULTIPIXEL(p) ((p) ? 0xff : 0x00) -# define NXGL_PIXEL_T ubyte +# define NXGL_PIXEL_T uint8_t #elif NXGLIB_BITSPERPIXEL == 2 # define NXGL_PIXELSHIFT 2 # define NXGL_PIXELMASK 3 -# define NXGL_MULTIPIXEL(p) ((ubyte)(p) << 6 | (ubyte)(p) << 4 | (ubyte)(p) << 2 | (p)) -# define NXGL_PIXEL_T ubyte +# define NXGL_MULTIPIXEL(p) ((uint8_t)(p) << 6 | (uint8_t)(p) << 4 | (uint8_t)(p) << 2 | (p)) +# define NXGL_PIXEL_T uint8_t #elif NXGLIB_BITSPERPIXEL == 4 # define NXGL_PIXELSHIFT 1 # define NXGL_PIXELMASK 1 -# define NXGL_MULTIPIXEL(p) ((ubyte)(p) << 4 | (p)) -# define NXGL_PIXEL_T ubyte +# define NXGL_MULTIPIXEL(p) ((uint8_t)(p) << 4 | (p)) +# define NXGL_PIXEL_T uint8_t #elif NXGLIB_BITSPERPIXEL == 8 # define NXGL_SCALEX(x) (x) -# define NXGL_PIXEL_T ubyte +# define NXGL_PIXEL_T uint8_t #elif NXGLIB_BITSPERPIXEL == 16 # define NXGL_SCALEX(x) ((x) << 1) -# define NXGL_PIXEL_T uint16 +# define NXGL_PIXEL_T uint16_t #elif NXGLIB_BITSPERPIXEL == 24 # define NXGL_SCALEX(x) (((x) << 1) + (x)) -# define NXGL_PIXEL_T uint32 +# define NXGL_PIXEL_T uint32_t #elif NXGLIB_BITSPERPIXEL == 32 # define NXGL_SCALEX(x) ((x) << 2) -# define NXGL_PIXEL_T uint32 +# define NXGL_PIXEL_T uint32_t #endif @@ -110,7 +111,7 @@ # define NXGL_MEMSET(dest,value,width) \ { \ - FAR ubyte *_ptr = (FAR ubyte*)dest; \ + FAR uint8_t *_ptr = (FAR uint8_t*)dest; \ int _nby = NXGL_SCALEX(width); \ while (_nby--) \ { \ @@ -119,8 +120,8 @@ } # define NXGL_MEMCPY(dest,src,width) \ { \ - FAR ubyte *_dptr = (FAR ubyte*)dest; \ - FAR ubyte *_sptr = (FAR ubyte*)src; \ + FAR uint8_t *_dptr = (FAR uint8_t*)dest; \ + FAR uint8_t *_sptr = (FAR uint8_t*)src; \ int _nby = NXGL_SCALEX(width); \ while (_nby--) \ { \ @@ -131,7 +132,7 @@ #elif NXGLIB_BITSPERPIXEL == 24 # define NXGL_MEMSET(dest,value,width) \ { \ - FAR ubyte *_ptr = (FAR ubyte*)dest; \ + FAR uint8_t *_ptr = (FAR uint8_t*)dest; \ nxgl_coord_t _npix = width; \ while (_npix--) \ { \ @@ -142,8 +143,8 @@ } # define NXGL_MEMCPY(dest,src,width) \ { \ - FAR ubyte *_dptr = (FAR ubyte*)dest; \ - FAR ubyte *_sptr = (FAR ubyte*)src; \ + FAR uint8_t *_dptr = (FAR uint8_t*)dest; \ + FAR uint8_t *_sptr = (FAR uint8_t*)src; \ nxgl_coord_t _npix = width; \ while (_npix--) \ { \ diff --git a/nuttx/graphics/nxglib/nxglib_colorcopy.c b/nuttx/graphics/nxglib/nxglib_colorcopy.c index a466640b3..43e348969 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/nxglib_copyrectangle.c index c7026152e..4cb1e182e 100644 --- a/nuttx/graphics/nxglib/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/nxglib_copyrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_copyrectangle.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -83,18 +84,18 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX) FAR const void *src, FAR const struct nxgl_point_s *origin, unsigned int srcstride) { - FAR const ubyte *sline; - FAR ubyte *dline; + FAR const uint8_t *sline; + FAR uint8_t *dline; unsigned int width; unsigned int deststride; unsigned int rows; #if NXGLIB_BITSPERPIXEL < 8 - FAR const ubyte *sptr; - FAR ubyte *dptr; - ubyte leadmask; - ubyte tailmask; - ubyte mask; + FAR const uint8_t *sptr; + FAR uint8_t *dptr; + uint8_t leadmask; + uint8_t tailmask; + uint8_t mask; int lnlen; #endif @@ -116,21 +117,21 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX) * MS byte down. */ - leadmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(dest->pt1.x))); - tailmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(dest->pt2.x-1))); + leadmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(dest->pt1.x))); + tailmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(dest->pt2.x-1))); # else /* Get the mask for pixels that are ordered so that they pack from the * LS byte up. */ - leadmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(dest->pt1.x))); - tailmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(dest->pt1.x-1))); + leadmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(dest->pt1.x))); + tailmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(dest->pt1.x-1))); # endif #endif /* Then copy the image */ - sline = (const ubyte*)src + NXGL_SCALEX(dest->pt1.x - origin->x) + (dest->pt1.y - origin->y) * srcstride; + sline = (const uint8_t*)src + NXGL_SCALEX(dest->pt1.x - origin->x) + (dest->pt1.y - origin->y) * srcstride; dline = pinfo->fbmem + dest->pt1.y * deststride + NXGL_SCALEX(dest->pt1.x); while (rows--) diff --git a/nuttx/graphics/nxglib/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/nxglib_fillrectangle.c index a83025b45..3d0d13285 100644 --- a/nuttx/graphics/nxglib/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/nxglib_fillrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_fillrectangle.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -84,17 +85,17 @@ void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX) (FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color) { - FAR ubyte *line; + FAR uint8_t *line; unsigned int width; unsigned int stride; int rows; #if NXGLIB_BITSPERPIXEL < 8 - FAR ubyte *dest; - ubyte mpixel = NXGL_MULTIPIXEL(color); - ubyte leadmask; - ubyte tailmask; - ubyte mask; + FAR uint8_t *dest; + uint8_t mpixel = NXGL_MULTIPIXEL(color); + uint8_t leadmask; + uint8_t tailmask; + uint8_t mask; int lnlen; #endif @@ -118,15 +119,15 @@ void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX) * MS byte down. */ - leadmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x))); - tailmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(rect->pt2.x-1))); + leadmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x))); + tailmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(rect->pt2.x-1))); # else /* Get the mask for pixels that are ordered so that they pack from the * LS byte up. */ - leadmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(rect->pt1.x))); - tailmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x-1))); + leadmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(rect->pt1.x))); + tailmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x-1))); # endif #endif diff --git a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/nxglib_filltrapezoid.c index dde0a6036..4fd94fe82 100644 --- a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/nxglib_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_filltrapezoid.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,8 +39,9 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <fixedmath.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -92,7 +93,7 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)( { unsigned int stride; unsigned int width; - FAR ubyte *line; + FAR uint8_t *line; int nrows; b16_t x1; b16_t x2; @@ -102,9 +103,9 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)( b16_t dx2dy; #if NXGLIB_BITSPERPIXEL < 8 - FAR ubyte *dest; - ubyte mpixel = NXGL_MULTIPIXEL(color); - ubyte mask; + FAR uint8_t *dest; + uint8_t mpixel = NXGL_MULTIPIXEL(color); + uint8_t mask; int lnlen; #endif @@ -196,9 +197,9 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)( /* Handle masking of the fractional initial byte */ #ifdef CONFIG_NX_PACKEDMSFIRST - mask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(ix1)); + mask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(ix1)); #else - mask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(ix1))); + mask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(ix1))); #endif dest = line; lnlen = width; @@ -214,9 +215,9 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)( /* Handle masking of the fractional final byte */ #ifdef CONFIG_NX_PACKEDMSFIRST - mask &= (ubyte)(0xff << (8 - NXGL_REMAINDERX(ix2))); + mask &= (uint8_t)(0xff << (8 - NXGL_REMAINDERX(ix2))); #else - mask &= (ubyte)(0xff >> (8 - NXGL_REMAINDERX(ix2))); + mask &= (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(ix2))); #endif if (lnlen > 0 && mask) { diff --git a/nuttx/graphics/nxglib/nxglib_moverectangle.c b/nuttx/graphics/nxglib/nxglib_moverectangle.c index a13a32986..dc1ec00cd 100644 --- a/nuttx/graphics/nxglib/nxglib_moverectangle.c +++ b/nuttx/graphics/nxglib/nxglib_moverectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_moverectangle.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -70,13 +71,13 @@ ****************************************************************************/ #if NXGLIB_BITSPERPIXEL < 8 -static inline void nxgl_lowresmemcpy(FAR ubyte *dline, FAR const ubyte *sline, +static inline void nxgl_lowresmemcpy(FAR uint8_t *dline, FAR const uint8_t *sline, unsigned int width, - ubyte leadmask, ubyte tailmask) + uint8_t leadmask, uint8_t tailmask) { - FAR const ubyte *sptr; - FAR ubyte *dptr; - ubyte mask; + FAR const uint8_t *sptr; + FAR uint8_t *dptr; + uint8_t mask; int lnlen; /* Handle masking of the fractional initial byte */ @@ -130,15 +131,15 @@ void NXGL_FUNCNAME(nxgl_moverectangle,NXGLIB_SUFFIX) (FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect, FAR struct nxgl_point_s *offset) { - FAR const ubyte *sline; - FAR ubyte *dline; + FAR const uint8_t *sline; + FAR uint8_t *dline; unsigned int width; unsigned int stride; unsigned int rows; #if NXGLIB_BITSPERPIXEL < 8 - ubyte leadmask; - ubyte tailmask; + uint8_t leadmask; + uint8_t tailmask; #endif /* Get the width of the framebuffer in bytes */ @@ -159,15 +160,15 @@ void NXGL_FUNCNAME(nxgl_moverectangle,NXGLIB_SUFFIX) * MS byte down. */ - leadmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x))); - tailmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(rect->pt2.x-1))); + leadmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x))); + tailmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(rect->pt2.x-1))); # else /* Get the mask for pixels that are ordered so that they pack from the * LS byte up. */ - leadmask = (ubyte)(0xff << (8 - NXGL_REMAINDERX(rect->pt1.x))); - tailmask = (ubyte)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x-1))); + leadmask = (uint8_t)(0xff << (8 - NXGL_REMAINDERX(rect->pt1.x))); + tailmask = (uint8_t)(0xff >> (8 - NXGL_REMAINDERX(rect->pt1.x-1))); # endif #endif diff --git a/nuttx/graphics/nxglib/nxglib_nonintersecting.c b/nuttx/graphics/nxglib/nxglib_nonintersecting.c index 1aa06c0a2..fd5cddfb3 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_nullrect.c b/nuttx/graphics/nxglib/nxglib_nullrect.c index dad690cf0..c472dc50b 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -71,11 +72,11 @@ * Name: nxgl_nullrect * * Description: - * Return TRUE if the area of the retangle is <= 0. + * Return true if the area of the retangle is <= 0. * ****************************************************************************/ -boolean nxgl_nullrect(FAR const struct nxgl_rect_s *rect) +bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect) { return (rect->pt1.x > rect->pt2.x || rect->pt1.y > rect->pt2.y); } diff --git a/nuttx/graphics/nxglib/nxglib_rectcopy.c b/nuttx/graphics/nxglib/nxglib_rectcopy.c index bf266f263..53fb18cbf 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_rectinside.c b/nuttx/graphics/nxglib/nxglib_rectinside.c index aa09eb2d7..615646e70 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -71,12 +72,12 @@ * Name: nxgl_rectinside * * Description: - * Return TRUE if the point pt lies within rect. + * Return true if the point pt lies within rect. * ****************************************************************************/ -boolean nxgl_rectinside(FAR const struct nxgl_rect_s *rect, - FAR const struct nxgl_point_s *pt) +bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect, + FAR const struct nxgl_point_s *pt) { return (pt->x >= rect->pt1.x && pt->x <= rect->pt2.x && pt->y >= rect->pt1.y && pt->y <= rect->pt2.y); diff --git a/nuttx/graphics/nxglib/nxglib_rectintersect.c b/nuttx/graphics/nxglib/nxglib_rectintersect.c index b4f1bd611..1f41898c7 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_rectoffset.c b/nuttx/graphics/nxglib/nxglib_rectoffset.c index 622def5dc..e4775cdcc 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_rectoverlap.c b/nuttx/graphics/nxglib/nxglib_rectoverlap.c index 4b741e798..57414b2c8 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> + #include <nuttx/fb.h> #include <nuttx/nxglib.h> @@ -71,20 +72,20 @@ * Name: nxgl_rectoverlap * * Description: - * Return TRUE if the two rectangles overlap + * Return true if the two rectangles overlap * ****************************************************************************/ -boolean nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, - FAR struct nxgl_rect_s *rect2) +bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, + FAR struct nxgl_rect_s *rect2) { /* The neither is wholly above, below, right, or left of the other, then * the two rectangles overlap in some fashion. */ - return (rect1->pt1.x <= rect2->pt2.x) && /* FALSE: rect1 is wholly to the right */ - (rect2->pt1.x <= rect1->pt2.x) && /* FALSE: rect2 is wholly to the right */ - (rect1->pt1.y <= rect2->pt2.y) && /* FALSE: rect1 is wholly below rect2 */ - (rect2->pt1.y <= rect1->pt2.y); /* FALSE: rect2 is wholly below rect1 */ + return (rect1->pt1.x <= rect2->pt2.x) && /* false: rect1 is wholly to the right */ + (rect2->pt1.x <= rect1->pt2.x) && /* false: rect2 is wholly to the right */ + (rect1->pt1.y <= rect2->pt2.y) && /* false: rect1 is wholly below rect2 */ + (rect2->pt1.y <= rect1->pt2.y); /* false: rect2 is wholly below rect1 */ } diff --git a/nuttx/graphics/nxglib/nxglib_rectsize.c b/nuttx/graphics/nxglib/nxglib_rectsize.c index f41a7b9c9..c1fb68f8e 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_rectunion.c b/nuttx/graphics/nxglib/nxglib_rectunion.c index 4f1c8177b..6f8951886 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c index 49a29ca67..055598406 100644 --- a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c +++ b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include <fixedmath.h> @@ -87,7 +87,8 @@ * ****************************************************************************/ -void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v) +void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, + uint8_t *y, uint8_t *u, uint8_t *v) { /* Per the JFIF specification: * @@ -96,7 +97,7 @@ void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v) * V = 128 + (0.5000 * R) - (0.4187 * G) - (0.0813 * B); */ - *y = (ubyte)b16toi(b16muli(b16_P2990, r) + b16muli(b16_P5870, g) + b16muli(b16_P1140, b)); - *u = (ubyte)b16toi(b16_128P0 - b16muli(b16_P1687, r) - b16muli(b16_P3313, g) + b16muli(b16_P5000, b)); - *v = (ubyte)b16toi(b16_128P0 + b16muli(b16_P5000, r) - b16muli(b16_P4187, g) - b16muli(b16_P0813, b)); + *y = (uint8_t)b16toi(b16muli(b16_P2990, r) + b16muli(b16_P5870, g) + b16muli(b16_P1140, b)); + *u = (uint8_t)b16toi(b16_128P0 - b16muli(b16_P1687, r) - b16muli(b16_P3313, g) + b16muli(b16_P5000, b)); + *v = (uint8_t)b16toi(b16_128P0 + b16muli(b16_P5000, r) - b16muli(b16_P4187, g) - b16muli(b16_P0813, b)); } diff --git a/nuttx/graphics/nxglib/nxglib_runcopy.c b/nuttx/graphics/nxglib/nxglib_runcopy.c index 4d4b1abc5..70320599d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_runoffset.c b/nuttx/graphics/nxglib/nxglib_runoffset.c index 02aaab894..eed9b713f 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <fixedmath.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_trapcopy.c b/nuttx/graphics/nxglib/nxglib_trapcopy.c index 94b8a4d28..d50f13568 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_trapoffset.c b/nuttx/graphics/nxglib/nxglib_trapoffset.c index 4c6f1cffa..4f409951d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_vectoradd.c b/nuttx/graphics/nxglib/nxglib_vectoradd.c index fe854ece1..7259fc04f 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_vectsubtract.c b/nuttx/graphics/nxglib/nxglib_vectsubtract.c index 22ebcaa61..7cff66ef0 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/fb.h> #include <nuttx/nxglib.h> diff --git a/nuttx/graphics/nxglib/nxglib_yuv2rgb.c b/nuttx/graphics/nxglib/nxglib_yuv2rgb.c index 72002d8af..354b18bc8 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <debug.h> #include <fixedmath.h> @@ -83,7 +83,8 @@ * ****************************************************************************/ -void nxgl_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b) +void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, + uint8_t *r, uint8_t *g, uint8_t *b) { b16_t vm128 = itob16(v) - b16_128P0; b16_t um128 = itob16(u) - b16_128P0; @@ -95,7 +96,7 @@ void nxgl_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b) * B = Y + 1.77200 * (U - 128.0) */ - *r = (ubyte)b16toi(itob16(y) + b16muli(b16_1P402, vm128)); - *g = (ubyte)b16toi(itob16(y) - b16muli(b16_P3441, um128) - b16muli(b16_P7141, vm128)); - *b = (ubyte)b16toi(itob16(y) + b16muli(b16_1P772, um128)); + *r = (uint8_t)b16toi(itob16(y) + b16muli(b16_1P402, vm128)); + *g = (uint8_t)b16toi(itob16(y) - b16muli(b16_P3441, um128) - b16muli(b16_P7141, vm128)); + *b = (uint8_t)b16toi(itob16(y) + b16muli(b16_1P772, um128)); } diff --git a/nuttx/graphics/nxmu/nx_bitmap.c b/nuttx/graphics/nxmu/nx_bitmap.c index 43dc6acde..04bbb0d08 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_closewindow.c b/nuttx/graphics/nxmu/nx_closewindow.c index efda4643c..2b87af87a 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_connect.c b/nuttx/graphics/nxmu/nx_connect.c index ac09fd9d4..dcfbd2996 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> @@ -71,8 +71,8 @@ * NOTE: that client ID 0 is reserved for the server(s) themselves */ -static sem_t g_nxlibsem = { 1 }; -static uint32 g_nxcid = 1; +static sem_t g_nxlibsem = { 1 }; +static uint32_t g_nxcid = 1; /**************************************************************************** * Public Data diff --git a/nuttx/graphics/nxmu/nx_disconnect.c b/nuttx/graphics/nxmu/nx_disconnect.c index efce1279a..82cb318ff 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_eventhandler.c b/nuttx/graphics/nxmu/nx_eventhandler.c index 2b7891766..a8b97ffbb 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <mqueue.h> #include <assert.h> @@ -135,7 +135,7 @@ int nx_eventhandler(NXHANDLE handle) FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_s *msg; struct nxbe_window_s *wnd; - ubyte buffer[NX_MXCLIMSGLEN]; + uint8_t buffer[NX_MXCLIMSGLEN]; int nbytes; /* Get the next message from our incoming message queue */ diff --git a/nuttx/graphics/nxmu/nx_eventnotify.c b/nuttx/graphics/nxmu/nx_eventnotify.c index e722c0dce..5ea712a70 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <mqueue.h> #include <assert.h> diff --git a/nuttx/graphics/nxmu/nx_fill.c b/nuttx/graphics/nxmu/nx_fill.c index b92aef537..f87ed3004 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_filltrapezoid.c b/nuttx/graphics/nxmu/nx_filltrapezoid.c index c55497bc2..b573dce19 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <string.h> #include <mqueue.h> #include <errno.h> diff --git a/nuttx/graphics/nxmu/nx_getposition.c b/nuttx/graphics/nxmu/nx_getposition.c index 21bb985aa..a57645da4 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_kbdchin.c b/nuttx/graphics/nxmu/nx_kbdchin.c index e83c9a0a2..eb3ed8013 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -82,7 +82,7 @@ * ****************************************************************************/ -int nx_kbdchin(NXHANDLE handle, ubyte ch) +int nx_kbdchin(NXHANDLE handle, uint8_t ch) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_kbdin_s outmsg; diff --git a/nuttx/graphics/nxmu/nx_kbdin.c b/nuttx/graphics/nxmu/nx_kbdin.c index e9665e89b..d4951bb13 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <errno.h> #include <debug.h> @@ -83,7 +83,7 @@ * ****************************************************************************/ -int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch) +int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; FAR struct nxsvrmsg_kbdin_s *outmsg; diff --git a/nuttx/graphics/nxmu/nx_lower.c b/nuttx/graphics/nxmu/nx_lower.c index d5156cf80..4b4a61d1c 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_mousein.c b/nuttx/graphics/nxmu/nx_mousein.c index 3d22392c3..ad3a88a13 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -82,7 +82,7 @@ * ****************************************************************************/ -int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, ubyte buttons) +int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_mousein_s outmsg; diff --git a/nuttx/graphics/nxmu/nx_move.c b/nuttx/graphics/nxmu/nx_move.c index 084a08d0d..67f4fc3c1 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_openwindow.c b/nuttx/graphics/nxmu/nx_openwindow.c index a05251546..85fec76fe 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_raise.c b/nuttx/graphics/nxmu/nx_raise.c index 494eb779c..e60122cea 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_releasebkgd.c b/nuttx/graphics/nxmu/nx_releasebkgd.c index 1e6001000..4ad750b66 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_requestbkgd.c b/nuttx/graphics/nxmu/nx_requestbkgd.c index f9aaf86ff..ef1c9987a 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setbgcolor.c b/nuttx/graphics/nxmu/nx_setbgcolor.c index 302c20549..9c3cc66c4 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setposition.c b/nuttx/graphics/nxmu/nx_setposition.c index 9ffa51e9d..d5ace394d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setsize.c b/nuttx/graphics/nxmu/nx_setsize.c index 36169a222..aeb40e11c 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index b808e5bf3..e449dc10e 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/graphics/nxmu/nxfe.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxfe.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <mqueue.h> #include <semaphore.h> @@ -103,17 +104,17 @@ struct nxfe_conn_s { /* This number uniquely identifies the client */ - int cid; /* Client ID (CID) */ - ubyte state; /* See enum nx_clistate_e */ + int cid; /* Client ID (CID) */ + uint8_t state; /* See enum nx_clistate_e */ /* These are only usable on the client side of the connection */ - mqd_t crdmq; /* MQ to read from the server (may be non-blocking) */ - mqd_t cwrmq; /* MQ to write to the server (blocking) */ + mqd_t crdmq; /* MQ to read from the server (may be non-blocking) */ + mqd_t cwrmq; /* MQ to write to the server (blocking) */ /* These are only usable on the server side of the connection */ - mqd_t swrmq; /* MQ to write to the client */ + mqd_t swrmq; /* MQ to write to the client */ }; /* Server state structure ***************************************************/ @@ -182,21 +183,21 @@ enum nxmsg_e struct nxclimsg_s { - uint32 msgid; /* Any of nxclimsg_e */ + uint32_t msgid; /* Any of nxclimsg_e */ }; /* The server is now connected */ struct nxclimsg_connected_s { - uint32 msgid; /* NX_CLIMSG_REDRAW_CONNECTED */ + uint32_t msgid; /* NX_CLIMSG_REDRAW_CONNECTED */ }; /* The server is now disconnected */ struct nxclimsg_disconnected_s { - uint32 msgid; /* NX_CLIMSG_REDRAW_DISCONNECTED */ + uint32_t msgid; /* NX_CLIMSG_REDRAW_DISCONNECTED */ }; /* This message is received when a requested window has been opened. If wnd is NULL @@ -205,17 +206,17 @@ struct nxclimsg_disconnected_s struct nxclimsg_redraw_s { - uint32 msgid; /* NX_CLIMSG_REDRAW */ + uint32_t msgid; /* NX_CLIMSG_REDRAW */ FAR struct nxbe_window_s *wnd; /* The handle to the window to redraw in */ FAR struct nxgl_rect_s rect; /* The rectangle to be redrawn */ - boolean more; /* TRUE: more redraw messages follow */ + bool more; /* true: more redraw messages follow */ }; /* This message informs the client of the new size or position of the window */ struct nxclimsg_newposition_s { - uint32 msgid; /* NX_CLIMSG_NEWPOSITION */ + uint32_t msgid; /* NX_CLIMSG_NEWPOSITION */ FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ FAR struct nxgl_size_s size; /* The current window size */ FAR struct nxgl_point_s pos; /* The current window position */ @@ -227,10 +228,10 @@ struct nxclimsg_newposition_s #ifdef CONFIG_NX_MOUSE struct nxclimsg_mousein_s { - uint32 msgid; /* NX_SVRMSG_MOUSEIN */ + uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ FAR struct nxbe_window_s *wnd; /* The handle of window receiving mouse input */ struct nxgl_point_s pos; /* Mouse X/Y position */ - ubyte buttons; /* Mouse button set */ + uint8_t buttons; /* Mouse button set */ }; #endif @@ -239,10 +240,10 @@ struct nxclimsg_mousein_s #ifdef CONFIG_NX_KBD struct nxclimsg_kbdin_s { - uint32 msgid; /* NX_CLIMSG_KBDIN */ + uint32_t msgid; /* NX_CLIMSG_KBDIN */ FAR struct nxbe_window_s *wnd; /* The handle of window receiving keypad input */ - ubyte nch; /* Number of characters received */ - ubyte ch[1]; /* Array of received characters */ + uint8_t nch; /* Number of characters received */ + uint8_t ch[1]; /* Array of received characters */ }; #endif @@ -253,94 +254,94 @@ struct nxclimsg_kbdin_s * NX_SVRMSG_CONNECT and NX_SVRMSG_DISCONNECT. */ -struct nxsvrmsg_s /* Generic server message */ +struct nxsvrmsg_s /* Generic server message */ { - uint32 msgid; /* One of enum nxsvrmsg_e */ - FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ + uint32_t msgid; /* One of enum nxsvrmsg_e */ + FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ }; /* This message requests the server to create a new window */ struct nxsvrmsg_openwindow_s { - uint32 msgid; /* NX_SVRMSG_OPENWINDOW */ - FAR struct nxbe_window_s *wnd; /* The pre-allocated window structure */ + uint32_t msgid; /* NX_SVRMSG_OPENWINDOW */ + FAR struct nxbe_window_s *wnd; /* The pre-allocated window structure */ }; /* This message informs the server that client wishes to close a window */ struct nxsvrmsg_closewindow_s { - uint32 msgid; /* NX_SVRMSG_CLOSEWINDOW */ - FAR struct nxbe_window_s *wnd; /* The window to be closed */ + uint32_t msgid; /* NX_SVRMSG_CLOSEWINDOW */ + FAR struct nxbe_window_s *wnd; /* The window to be closed */ }; /* This message requests the server to create a new window */ struct nxsvrmsg_requestbkgd_s { - uint32 msgid; /* NX_SVRMSG_REQUESTBKGD */ - FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ + uint32_t msgid; /* NX_SVRMSG_REQUESTBKGD */ + FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ FAR const struct nx_callback_s *cb; /* Event handling callbacks */ - FAR void *arg; /* Client argument used with callbacks */ + FAR void *arg; /* Client argument used with callbacks */ }; /* This message informs the server that client wishes to close a window */ struct nxsvrmsg_releasebkgd_s { - uint32 msgid; /* NX_SVRMSG_RELEASEBKGD */ + uint32_t msgid; /* NX_SVRMSG_RELEASEBKGD */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_setposition_s { - uint32 msgid; /* NX_SVRMSG_SETPOSITION */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ - FAR struct nxgl_point_s pos; /* The new window position */ + uint32_t msgid; /* NX_SVRMSG_SETPOSITION */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + FAR struct nxgl_point_s pos; /* The new window position */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_setsize_s { - uint32 msgid; /* NX_SVRMSG_SETSIZE */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ - FAR struct nxgl_size_s size; /* The new window size */ + uint32_t msgid; /* NX_SVRMSG_SETSIZE */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + FAR struct nxgl_size_s size; /* The new window size */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_getposition_s { - uint32 msgid; /* NX_SVRMSG_FETPOSITION */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + uint32_t msgid; /* NX_SVRMSG_FETPOSITION */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ }; /* This message informs the server to raise this window to the top of the display */ struct nxsvrmsg_raise_s { - uint32 msgid; /* NX_SVRMSG_RAISE */ - FAR struct nxbe_window_s *wnd; /* The window to be raised */ + uint32_t msgid; /* NX_SVRMSG_RAISE */ + FAR struct nxbe_window_s *wnd; /* The window to be raised */ }; /* This message informs the server to lower this window to the bottom of the display */ struct nxsvrmsg_lower_s { - uint32 msgid; /* NX_SVRMSG_LOWER */ - FAR struct nxbe_window_s *wnd; /* The window to be lowered */ + uint32_t msgid; /* NX_SVRMSG_LOWER */ + FAR struct nxbe_window_s *wnd; /* The window to be lowered */ }; /* Fill a rectangle in the window with a color */ struct nxsvrmsg_fill_s { - uint32 msgid; /* NX_SVRMSG_FILL */ - FAR struct nxbe_window_s *wnd; /* The window to fill */ - struct nxgl_rect_s rect; /* The rectangle in the window to fill */ + uint32_t msgid; /* NX_SVRMSG_FILL */ + FAR struct nxbe_window_s *wnd; /* The window to fill */ + struct nxgl_rect_s rect; /* The rectangle in the window to fill */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the fill */ }; @@ -348,10 +349,10 @@ struct nxsvrmsg_fill_s struct nxsvrmsg_filltrapezoid_s { - uint32 msgid; /* NX_SVRMSG_FILLTRAP */ - FAR struct nxbe_window_s *wnd; /* The window to fill */ - FAR struct nxgl_rect_s clip; /* The clipping window */ - struct nxgl_trapezoid_s trap; /* The trapezoidal region in the window to fill */ + uint32_t msgid; /* NX_SVRMSG_FILLTRAP */ + FAR struct nxbe_window_s *wnd; /* The window to fill */ + FAR struct nxgl_rect_s clip; /* The clipping window */ + struct nxgl_trapezoid_s trap; /* The trapezoidal region in the window to fill */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the fill */ }; @@ -359,29 +360,29 @@ struct nxsvrmsg_filltrapezoid_s struct nxsvrmsg_move_s { - uint32 msgid; /* NX_SVRMSG_MOVE */ - FAR struct nxbe_window_s *wnd; /* The window within which the move is done */ - struct nxgl_rect_s rect; /* Describes the rectangular region to move */ - struct nxgl_point_s offset; /* The offset to move the region */ + uint32_t msgid; /* NX_SVRMSG_MOVE */ + FAR struct nxbe_window_s *wnd; /* The window within which the move is done */ + struct nxgl_rect_s rect; /* Describes the rectangular region to move */ + struct nxgl_point_s offset; /* The offset to move the region */ }; /* Copy a rectangular bitmap into the window */ struct nxsvrmsg_bitmap_s { - uint32 msgid; /* NX_SVRMSG_BITMAP */ - FAR struct nxbe_window_s *wnd; /* The window with will receive the bitmap image */ - struct nxgl_rect_s dest; /* Destination location of the bitmap in the window */ + uint32_t msgid; /* NX_SVRMSG_BITMAP */ + FAR struct nxbe_window_s *wnd; /* The window with will receive the bitmap image */ + struct nxgl_rect_s dest; /* Destination location of the bitmap in the window */ FAR const void *src[CONFIG_NX_NPLANES]; /* The start of the source image. */ - struct nxgl_point_s origin; /* Offset into the source image data */ - unsigned int stride; /* The width of the full source image in pixels. */ + struct nxgl_point_s origin; /* Offset into the source image data */ + unsigned int stride; /* The width of the full source image in pixels. */ }; /* Set the color of the background */ struct nxsvrmsg_setbgcolor_s { - uint32 msgid; /* NX_SVRMSG_SETBGCOLOR */ + uint32_t msgid; /* NX_SVRMSG_SETBGCOLOR */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the background */ }; @@ -393,9 +394,9 @@ struct nxsvrmsg_setbgcolor_s #ifdef CONFIG_NX_MOUSE struct nxsvrmsg_mousein_s { - uint32 msgid; /* NX_SVRMSG_MOUSEIN */ - struct nxgl_point_s pt; /* Mouse X/Y position */ - ubyte buttons; /* Mouse button set */ + uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ + struct nxgl_point_s pt; /* Mouse X/Y position */ + uint8_t buttons; /* Mouse button set */ }; #endif @@ -407,9 +408,9 @@ struct nxsvrmsg_mousein_s #ifdef CONFIG_NX_KBD struct nxsvrmsg_kbdin_s { - uint32 msgid; /* NX_SVRMSG_KBDIN */ - ubyte nch ; /* Number of characters received */ - ubyte ch[1]; /* Array of received characters */ + uint32_t msgid; /* NX_SVRMSG_KBDIN */ + uint8_t nch ; /* Number of characters received */ + uint8_t ch[1]; /* Array of received characters */ }; #endif @@ -613,7 +614,7 @@ EXTERN int nxmu_mousein(FAR struct nxfe_state_s *fe, ****************************************************************************/ #ifdef CONFIG_NX_KBD -EXTERN void nxmu_kbdin(FAR struct nxfe_state_s *fe, ubyte nch, FAR ubyte *ch); +EXTERN void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch); #endif #undef EXTERN diff --git a/nuttx/graphics/nxmu/nxmu_constructwindow.c b/nuttx/graphics/nxmu/nxmu_constructwindow.c index f7e62f711..ba3b034d0 100644 --- a/nuttx/graphics/nxmu/nxmu_constructwindow.c +++ b/nuttx/graphics/nxmu/nxmu_constructwindow.c @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_kbdin.c b/nuttx/graphics/nxmu/nxmu_kbdin.c index 903533357..1a3ca03ef 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <errno.h> #include <debug.h> @@ -83,7 +83,7 @@ * ****************************************************************************/ -void nxmu_kbdin(FAR struct nxfe_state_s *fe, ubyte nch, FAR ubyte *ch) +void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch) { FAR struct nxclimsg_kbdin_s *outmsg; int size; diff --git a/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c index 0bcb09a34..f1ee162d1 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -63,7 +63,7 @@ static struct nxgl_point_s g_mpos; static struct nxgl_point_s g_mrange; -static ubyte g_mbutton; +static uint8_t g_mbutton; /**************************************************************************** * Public Data diff --git a/nuttx/graphics/nxmu/nxmu_openwindow.c b/nuttx/graphics/nxmu/nxmu_openwindow.c index 706d00a2d..a25df0ce5 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxmu/nxmu_redrawreq.c b/nuttx/graphics/nxmu/nxmu_redrawreq.c index 3f25e1ebf..3c23d4af6 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdbool.h> #include <errno.h> #include <debug.h> @@ -85,7 +85,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s outmsg.msgid = NX_CLIMSG_REDRAW; outmsg.wnd = wnd; - outmsg.more = FALSE; + outmsg.more = false; nxgl_rectoffset(&outmsg.rect, rect, -wnd->bounds.pt1.x, -wnd->bounds.pt1.y); ret = mq_send(wnd->conn->swrmq, &outmsg, sizeof(struct nxclimsg_redraw_s), NX_CLIMSG_PRIO); diff --git a/nuttx/graphics/nxmu/nxmu_releasebkgd.c b/nuttx/graphics/nxmu/nxmu_releasebkgd.c index 521892b7c..3f8f04bdd 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_reportposition.c b/nuttx/graphics/nxmu/nxmu_reportposition.c index 858f3ab82..ce206a01d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_requestbkgd.c b/nuttx/graphics/nxmu/nxmu_requestbkgd.c index 7214c235f..b8ca3e65d 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_semtake.c b/nuttx/graphics/nxmu/nxmu_semtake.c index 079844621..a08162286 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <assert.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 4b18a7580..d9ff97534 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <semaphore.h> @@ -301,7 +301,7 @@ int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb) { struct nxfe_state_s fe; FAR struct nxsvrmsg_s *msg; - ubyte buffer[NX_MXSVRMSGLEN]; + uint8_t buffer[NX_MXSVRMSGLEN]; int nbytes; int ret; diff --git a/nuttx/graphics/nxsu/nx_bitmap.c b/nuttx/graphics/nxsu/nx_bitmap.c index f2f6859da..532a6a894 100644 --- a/nuttx/graphics/nxsu/nx_bitmap.c +++ b/nuttx/graphics/nxsu/nx_bitmap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_bitmap.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_close.c b/nuttx/graphics/nxsu/nx_close.c index 578631eb9..550be1063 100644 --- a/nuttx/graphics/nxsu/nx_close.c +++ b/nuttx/graphics/nxsu/nx_close.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_close.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_closewindow.c b/nuttx/graphics/nxsu/nx_closewindow.c index 36f83ee3a..27b7725d8 100644 --- a/nuttx/graphics/nxsu/nx_closewindow.c +++ b/nuttx/graphics/nxsu/nx_closewindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_closewindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_fill.c b/nuttx/graphics/nxsu/nx_fill.c index b9102d136..a2156ed92 100644 --- a/nuttx/graphics/nxsu/nx_fill.c +++ b/nuttx/graphics/nxsu/nx_fill.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_fill.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_filltrapezoid.c b/nuttx/graphics/nxsu/nx_filltrapezoid.c index ac105bd39..4c89e3363 100644 --- a/nuttx/graphics/nxsu/nx_filltrapezoid.c +++ b/nuttx/graphics/nxsu/nx_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_filltrapezoid.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_getposition.c b/nuttx/graphics/nxsu/nx_getposition.c index 8eaac940d..91bb284e4 100644 --- a/nuttx/graphics/nxsu/nx_getposition.c +++ b/nuttx/graphics/nxsu/nx_getposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_getposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_kbdchin.c b/nuttx/graphics/nxsu/nx_kbdchin.c index 27e588e8d..03db76f48 100644 --- a/nuttx/graphics/nxsu/nx_kbdchin.c +++ b/nuttx/graphics/nxsu/nx_kbdchin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_kbdchin.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -82,7 +82,7 @@ * ****************************************************************************/ -int nx_kbdchin(NXHANDLE handle, ubyte ch) +int nx_kbdchin(NXHANDLE handle, uint8_t ch) { FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle; FAR struct nxbe_window_s *wnd = fe->be.topwnd; diff --git a/nuttx/graphics/nxsu/nx_kbdin.c b/nuttx/graphics/nxsu/nx_kbdin.c index 54081d662..4a1b93d09 100644 --- a/nuttx/graphics/nxsu/nx_kbdin.c +++ b/nuttx/graphics/nxsu/nx_kbdin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_kbdin.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -81,7 +81,7 @@ * ****************************************************************************/ -int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch) +int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch) { FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle; FAR struct nxbe_window_s *wnd = fe->be.topwnd; diff --git a/nuttx/graphics/nxsu/nx_lower.c b/nuttx/graphics/nxsu/nx_lower.c index 4c0683968..a5373a429 100644 --- a/nuttx/graphics/nxsu/nx_lower.c +++ b/nuttx/graphics/nxsu/nx_lower.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_lower.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c index f5ea76476..d83da90b0 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -64,7 +64,7 @@ static struct nxgl_point_s g_mpos; static struct nxgl_point_s g_mrange; -static ubyte g_mbutton; +static uint8_t g_mbutton; /**************************************************************************** * Public Data @@ -144,7 +144,7 @@ int nxsu_mousereport(struct nxbe_window_s *wnd) * ****************************************************************************/ -int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, ubyte buttons) +int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) { FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle; struct nxbe_window_s *wnd; diff --git a/nuttx/graphics/nxsu/nx_move.c b/nuttx/graphics/nxsu/nx_move.c index ee9dab928..ffce178f5 100644 --- a/nuttx/graphics/nxsu/nx_move.c +++ b/nuttx/graphics/nxsu/nx_move.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_move.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c index 901b77109..cde501f15 100644 --- a/nuttx/graphics/nxsu/nx_open.c +++ b/nuttx/graphics/nxsu/nx_open.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_open.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -62,7 +62,7 @@ static void nxsu_bkgdredraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean more, FAR void *arg); + bool more, FAR void *arg); /**************************************************************************** * Private Data @@ -94,7 +94,7 @@ const struct nx_callback_s g_bkgdcb = static void nxsu_bkgdredraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean more, FAR void *arg) + bool more, FAR void *arg) { FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd; FAR struct nxbe_state_s *be = wnd->be; diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c index 2d73feaef..f960d1a90 100644 --- a/nuttx/graphics/nxsu/nx_openwindow.c +++ b/nuttx/graphics/nxsu/nx_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_raise.c b/nuttx/graphics/nxsu/nx_raise.c index 8021271af..971e565f0 100644 --- a/nuttx/graphics/nxsu/nx_raise.c +++ b/nuttx/graphics/nxsu/nx_raise.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_raise.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_releasebkgd.c b/nuttx/graphics/nxsu/nx_releasebkgd.c index 7c4b4e1cf..38772c3e0 100644 --- a/nuttx/graphics/nxsu/nx_releasebkgd.c +++ b/nuttx/graphics/nxsu/nx_releasebkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_releasebkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_requestbkgd.c b/nuttx/graphics/nxsu/nx_requestbkgd.c index 5ac83a428..cc56e1019 100644 --- a/nuttx/graphics/nxsu/nx_requestbkgd.c +++ b/nuttx/graphics/nxsu/nx_requestbkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_requestbkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_setbgcolor.c b/nuttx/graphics/nxsu/nx_setbgcolor.c index 4bc02be10..167d51600 100644 --- a/nuttx/graphics/nxsu/nx_setbgcolor.c +++ b/nuttx/graphics/nxsu/nx_setbgcolor.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_setbgcolor.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_setposition.c b/nuttx/graphics/nxsu/nx_setposition.c index 3371de699..f54c81fc9 100644 --- a/nuttx/graphics/nxsu/nx_setposition.c +++ b/nuttx/graphics/nxsu/nx_setposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_setposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nx_setsize.c b/nuttx/graphics/nxsu/nx_setsize.c index c15150ae1..8eafaf3ef 100644 --- a/nuttx/graphics/nxsu/nx_setsize.c +++ b/nuttx/graphics/nxsu/nx_setsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_setsize.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h index 9cecef7ed..acfa5e122 100644 --- a/nuttx/graphics/nxsu/nxfe.h +++ b/nuttx/graphics/nxsu/nxfe.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nxfe.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <semaphore.h> diff --git a/nuttx/graphics/nxsu/nxsu_constructwindow.c b/nuttx/graphics/nxsu/nxsu_constructwindow.c index d7a6df0a6..5d7fcc040 100644 --- a/nuttx/graphics/nxsu/nxsu_constructwindow.c +++ b/nuttx/graphics/nxsu/nxsu_constructwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nx_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxsu/nxsu_redrawreq.c b/nuttx/graphics/nxsu/nxsu_redrawreq.c index 8cd2e8aa2..627c7f702 100644 --- a/nuttx/graphics/nxsu/nxsu_redrawreq.c +++ b/nuttx/graphics/nxsu/nxsu_redrawreq.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nxsu_redrawreq.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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 <sys/types.h> +#include <stdbool.h> #include <errno.h> #include <debug.h> @@ -97,7 +97,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s /* And request the redraw */ - wnd->cb->redraw((NXWINDOW)wnd, &relrect, FALSE, wnd->arg); + wnd->cb->redraw((NXWINDOW)wnd, &relrect, false, wnd->arg); } } diff --git a/nuttx/graphics/nxsu/nxsu_reportposition.c b/nuttx/graphics/nxsu/nxsu_reportposition.c index e5236ddfc..f7fc1d800 100644 --- a/nuttx/graphics/nxsu/nxsu_reportposition.c +++ b/nuttx/graphics/nxsu/nxsu_reportposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxsu/nxsu_reportposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index 4e3aa2e9c..69d1badf4 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_bitmaptoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c index c923ed964..27c364b63 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_bitmapwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_closetoolbar.c b/nuttx/graphics/nxtk/nxtk_closetoolbar.c index e7557aeba..eaaef83e7 100644 --- a/nuttx/graphics/nxtk/nxtk_closetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_closetoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_closetoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_containerclip.c b/nuttx/graphics/nxtk/nxtk_containerclip.c index 0538cc31e..386425de3 100644 --- a/nuttx/graphics/nxtk/nxtk_containerclip.c +++ b/nuttx/graphics/nxtk/nxtk_containerclip.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_containerclip.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_drawframe.c b/nuttx/graphics/nxtk/nxtk_drawframe.c index 53f6c2831..d86d55312 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_events.c b/nuttx/graphics/nxtk/nxtk_events.c index 52323a751..45ab1e8a5 100644 --- a/nuttx/graphics/nxtk/nxtk_events.c +++ b/nuttx/graphics/nxtk/nxtk_events.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_events.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <stdlib.h> #include <semaphore.h> #include <debug.h> @@ -62,17 +63,18 @@ ****************************************************************************/ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean morem, FAR void *arg); + bool morem, FAR void *arg); static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); #ifdef CONFIG_NX_MOUSE static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, - ubyte buttons, FAR void *arg); + uint8_t buttons, FAR void *arg); #endif #ifdef CONFIG_NX_KBD -static void nxtk_kbdin(NXWINDOW hwnd, ubyte nch, const ubyte *ch, FAR void *arg); +static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, + FAR void *arg); #endif /**************************************************************************** @@ -104,7 +106,7 @@ const struct nx_callback_s g_nxtkcb = ****************************************************************************/ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, - boolean more, FAR void *arg) + bool more, FAR void *arg) { FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; struct nxgl_rect_s intersection; @@ -135,7 +137,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (!nxgl_nullrect(&intersection)) { - fwnd->fwcb->redraw((NXTKWINDOW)fwnd, &intersection, FALSE, fwnd->fwarg); + fwnd->fwcb->redraw((NXTKWINDOW)fwnd, &intersection, false, fwnd->fwarg); } } @@ -158,7 +160,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (!nxgl_nullrect(&intersection)) { - fwnd->tbcb->redraw((NXTKWINDOW)fwnd, &intersection, FALSE, fwnd->tbarg); + fwnd->tbcb->redraw((NXTKWINDOW)fwnd, &intersection, false, fwnd->tbarg); } } @@ -212,7 +214,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, #ifdef CONFIG_NX_MOUSE static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, - ubyte buttons, FAR void *arg) + uint8_t buttons, FAR void *arg) { FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; struct nxgl_point_s relpos; @@ -252,7 +254,8 @@ static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, ****************************************************************************/ #ifdef CONFIG_NX_KBD -static void nxtk_kbdin(NXWINDOW hwnd, ubyte nch, const ubyte *ch, FAR void *arg) +static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, + FAR void *arg) { FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; diff --git a/nuttx/graphics/nxtk/nxtk_filltoolbar.c b/nuttx/graphics/nxtk/nxtk_filltoolbar.c index 946cfd076..f151876ec 100644 --- a/nuttx/graphics/nxtk/nxtk_filltoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_filltoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c index 03e9c749c..d3362fa6f 100644 --- a/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_filltraptoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_filltraptoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c index 02e86e9b7..a489364c4 100644 --- a/nuttx/graphics/nxtk/nxtk_filltrapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_filltrapwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_filltrapwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_fillwindow.c b/nuttx/graphics/nxtk/nxtk_fillwindow.c index f8a645302..fe0b1c8d4 100644 --- a/nuttx/graphics/nxtk/nxtk_fillwindow.c +++ b/nuttx/graphics/nxtk/nxtk_fillwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_fillwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_getposition.c b/nuttx/graphics/nxtk/nxtk_getposition.c index ec5231c0d..24ca26b70 100644 --- a/nuttx/graphics/nxtk/nxtk_getposition.c +++ b/nuttx/graphics/nxtk/nxtk_getposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_getposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_internal.h b/nuttx/graphics/nxtk/nxtk_internal.h index aee0fa6a5..b02bb94ce 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 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nxtk.h> #include "nxbe.h" diff --git a/nuttx/graphics/nxtk/nxtk_lower.c b/nuttx/graphics/nxtk/nxtk_lower.c index 2c66c1185..e0b59f285 100644 --- a/nuttx/graphics/nxtk/nxtk_lower.c +++ b/nuttx/graphics/nxtk/nxtk_lower.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_lower.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_movetoolbar.c b/nuttx/graphics/nxtk/nxtk_movetoolbar.c index 6e464c375..430e5461e 100644 --- a/nuttx/graphics/nxtk/nxtk_movetoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_movetoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_movetoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_movewindow.c b/nuttx/graphics/nxtk/nxtk_movewindow.c index 15f3c05c6..134d1935e 100644 --- a/nuttx/graphics/nxtk/nxtk_movewindow.c +++ b/nuttx/graphics/nxtk/nxtk_movewindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_movewindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_opentoolbar.c b/nuttx/graphics/nxtk/nxtk_opentoolbar.c index 64525b766..e2de68226 100644 --- a/nuttx/graphics/nxtk/nxtk_opentoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_opentoolbar.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_opentoolbar.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_openwindow.c b/nuttx/graphics/nxtk/nxtk_openwindow.c index 89b6faddc..c57918869 100644 --- a/nuttx/graphics/nxtk/nxtk_openwindow.c +++ b/nuttx/graphics/nxtk/nxtk_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_raise.c b/nuttx/graphics/nxtk/nxtk_raise.c index f435c95c3..33c22b722 100644 --- a/nuttx/graphics/nxtk/nxtk_raise.c +++ b/nuttx/graphics/nxtk/nxtk_raise.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_raise.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_setposition.c b/nuttx/graphics/nxtk/nxtk_setposition.c index 89a034f37..053f74256 100644 --- a/nuttx/graphics/nxtk/nxtk_setposition.c +++ b/nuttx/graphics/nxtk/nxtk_setposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_setposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_setsize.c b/nuttx/graphics/nxtk/nxtk_setsize.c index f91aa7e0e..07e9e0242 100644 --- a/nuttx/graphics/nxtk/nxtk_setsize.c +++ b/nuttx/graphics/nxtk/nxtk_setsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_setsize.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_setsubwindows.c b/nuttx/graphics/nxtk/nxtk_setsubwindows.c index 8925ebf47..5ddb2ce03 100644 --- a/nuttx/graphics/nxtk/nxtk_setsubwindows.c +++ b/nuttx/graphics/nxtk/nxtk_setsubwindows.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_setsubwindows.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <semaphore.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_subwindowclip.c b/nuttx/graphics/nxtk/nxtk_subwindowclip.c index e5495683c..7600074ce 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowclip.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowclip.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_subwindowclip.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxtk/nxtk_subwindowmove.c b/nuttx/graphics/nxtk/nxtk_subwindowmove.c index 8408465d2..f532c6675 100644 --- a/nuttx/graphics/nxtk/nxtk_subwindowmove.c +++ b/nuttx/graphics/nxtk/nxtk_subwindowmove.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxtk/nxtk_subwindowmove.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 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,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> |