sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into vnc

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-14 16:34:29 -06:00
commit 074d5fdde6
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
graphics/nxbe/nxbe.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* graphics/nxbe/nxbe.h * graphics/nxbe/nxbe.h
* *
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2011, 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -75,27 +75,27 @@ struct nxbe_plane_s
{ {
/* Raster operation callbacks for this bits-per-pixel value */ /* Raster operation callbacks for this bits-per-pixel value */
void (*setpixel)(FAR NX_PLANEINFOTYPE *pinfo, CODE void (*setpixel)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_point_s *pos, FAR const struct nxgl_point_s *pos,
nxgl_mxpixel_t color);
void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect,
nxgl_mxpixel_t color); nxgl_mxpixel_t color);
void (*getrectangle)(FAR NX_PLANEINFOTYPE *pinfo, CODE void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride); nxgl_mxpixel_t color);
void (*filltrapezoid)(FAR NX_PLANEINFOTYPE *pinfo, CODE void (*getrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_trapezoid_s *trap, FAR const struct nxgl_rect_s *rect,
FAR const struct nxgl_rect_s *bounds, FAR void *dest, unsigned int deststride);
nxgl_mxpixel_t color); CODE void (*filltrapezoid)(FAR NX_PLANEINFOTYPE *pinfo,
void (*moverectangle)(FAR NX_PLANEINFOTYPE *pinfo, FAR const struct nxgl_trapezoid_s *trap,
FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_rect_s *bounds,
FAR struct nxgl_point_s *offset); nxgl_mxpixel_t color);
void (*copyrectangle)(FAR NX_PLANEINFOTYPE *pinfo, CODE void (*moverectangle)(FAR NX_PLANEINFOTYPE *pinfo,
FAR const struct nxgl_rect_s *dest, FAR const struct nxgl_rect_s *rect,
FAR const void *src, FAR struct nxgl_point_s *offset);
FAR const struct nxgl_point_s *origin, CODE void (*copyrectangle)(FAR NX_PLANEINFOTYPE *pinfo,
unsigned int srcstride); FAR const struct nxgl_rect_s *dest,
FAR const void *src,
FAR const struct nxgl_point_s *origin,
unsigned int srcstride);
/* Framebuffer plane info describing destination video plane */ /* Framebuffer plane info describing destination video plane */

12
graphics/nxbe/nxbe_configure.c
View File

@ -53,10 +53,6 @@
# define CONFIG_NX_BGCOLOR 0 # define CONFIG_NX_BGCOLOR 0
#endif #endif
/****************************************************************************
* Private Types
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
@ -70,14 +66,6 @@ static const nxgl_mxpixel_t g_bgcolor[CONFIG_NX_NPLANES] =
#endif #endif
}; };
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

4
include/nuttx/ascii.h
View File

@ -90,7 +90,7 @@
#define ASCII_DOLLAR 0x24 /* Dollar sign ($) */ #define ASCII_DOLLAR 0x24 /* Dollar sign ($) */
#define ASCII_PERCENT 0x25 /* Percent sign (%) */ #define ASCII_PERCENT 0x25 /* Percent sign (%) */
#define ASCII_AMPERSAND 0x26 /* Ampersand (&) */ #define ASCII_AMPERSAND 0x26 /* Ampersand (&) */
#define ASCII_RSQUOTE 0x27 /* Closing single quote (') */ #define ASCII_SQUOTE 0x27 /* Single quote (') */
#define ASCII_APOSTROPHE 0x27 /* Apostrophe (') */ #define ASCII_APOSTROPHE 0x27 /* Apostrophe (') */
#define ASCII_LPAREN 0x28 /* Opening parenthesis (() */ #define ASCII_LPAREN 0x28 /* Opening parenthesis (() */
#define ASCII_RPAREN 0x29 /* Closing parenthesis ()) */ #define ASCII_RPAREN 0x29 /* Closing parenthesis ()) */
@ -156,7 +156,7 @@
#define ASCII_CIRCUMFLEX 0x5e /* Circumflex (^) */ #define ASCII_CIRCUMFLEX 0x5e /* Circumflex (^) */
#define ASCII_UNDERSCORE 0x5f /* Underscore (_) */ #define ASCII_UNDERSCORE 0x5f /* Underscore (_) */
#define ASCII_RSQUOT 0x60 /* Closing single quote */ #define ASCII_RSQUOTE 0x60 /* Closing single quote */
#define ASCII_a 0x61 /* Lower case letters */ #define ASCII_a 0x61 /* Lower case letters */
#define ASCII_b 0x62 /* " " " " " " */ #define ASCII_b 0x62 /* " " " " " " */
#define ASCII_c 0x63 /* " " " " " " */ #define ASCII_c 0x63 /* " " " " " " */