Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2350 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-12-15 18:12:29 +00:00
parent 99b0163fba
commit 23931c39e6
121 changed files with 387 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe.h
+7 -5
View File
@@ -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);
graphics/nxbe/nxbe_bitmap.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_clipper.c
+12 -11
View File
@@ -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)
{
graphics/nxbe/nxbe_closewindow.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_colormap.c
+10 -10
View File
@@ -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;
graphics/nxbe/nxbe_fbconfigure.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_fill.c
+2 -2
View File
@@ -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"
graphics/nxbe/nxbe_filltrapezoid.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_lower.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_move.c
+4 -3
View File
@@ -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;
};
/****************************************************************************
graphics/nxbe/nxbe_raise.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_redraw.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_redrawbelow.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_setposition.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_setsize.c
+1 -2
View File
@@ -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>
graphics/nxbe/nxbe_visible.c
+10 -10
View File
@@ -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;
}
graphics/nxfonts/nxfonts_bitmaps.c
+4 -3
View File
@@ -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) }
graphics/nxfonts/nxfonts_convert.c
+17 -16
View File
@@ -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 */
graphics/nxfonts/nxfonts_getfont.c
+5 -4
View File
@@ -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;
graphics/nxfonts/nxfonts_internal.h
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_bitblit.h
+18 -17
View File
@@ -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--) \
{ \
graphics/nxglib/nxglib_colorcopy.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_copyrectangle.c
+15 -14
View File
@@ -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--)
graphics/nxglib/nxglib_fillrectangle.c
+13 -12
View File
@@ -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
graphics/nxglib/nxglib_filltrapezoid.c
+11 -10
View File
@@ -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)
{
graphics/nxglib/nxglib_moverectangle.c
+16 -15
View File
@@ -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
graphics/nxglib/nxglib_nonintersecting.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_nullrect.c
+5 -4
View File
@@ -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);
}
graphics/nxglib/nxglib_rectcopy.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_rectinside.c
+6 -5
View File
@@ -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);
graphics/nxglib/nxglib_rectintersect.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_rectoffset.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_rectoverlap.c
+10 -9
View File
@@ -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 */
}
graphics/nxglib/nxglib_rectsize.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_rectunion.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_rgb2yuv.c
+6 -5
View File
@@ -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));
}
graphics/nxglib/nxglib_runcopy.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_runoffset.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_trapcopy.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_trapoffset.c
+1 -2
View File
@@ -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>
/****************************************************************************
graphics/nxglib/nxglib_vectoradd.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_vectsubtract.c
+1 -2
View File
@@ -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>
graphics/nxglib/nxglib_yuv2rgb.c
+7 -6
View File
@@ -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));
}
graphics/nxmu/nx_bitmap.c
+1 -2
View File
@@ -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>
graphics/nxmu/nx_closewindow.c
+1 -2
View File
@@ -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>
graphics/nxmu/nx_connect.c
+4 -4
View File
@@ -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
graphics/nxmu/nx_disconnect.c
+1 -2
View File
@@ -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>
graphics/nxmu/nx_eventhandler.c
+3 -3
View File
@@ -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 */
graphics/nxmu/nx_eventnotify.c
+1 -2
View File
@@ -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>
graphics/nxmu/nx_fill.c
+1 -2
View File
@@ -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>

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