diff --git a/graphics/nxbe/nxbe.h b/graphics/nxbe/nxbe.h index 5c48e756a8..5b0743c0d8 100644 --- a/graphics/nxbe/nxbe.h +++ b/graphics/nxbe/nxbe.h @@ -1,7 +1,7 @@ /**************************************************************************** * 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 * * 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 */ - void (*setpixel)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_point_s *pos, - nxgl_mxpixel_t color); - void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_rect_s *rect, + CODE void (*setpixel)(FAR NX_PLANEINFOTYPE *pinfo, + FAR const struct nxgl_point_s *pos, nxgl_mxpixel_t color); - void (*getrectangle)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_rect_s *rect, - FAR void *dest, unsigned int deststride); - void (*filltrapezoid)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_trapezoid_s *trap, - FAR const struct nxgl_rect_s *bounds, - nxgl_mxpixel_t color); - void (*moverectangle)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_rect_s *rect, - FAR struct nxgl_point_s *offset); - void (*copyrectangle)(FAR NX_PLANEINFOTYPE *pinfo, - FAR const struct nxgl_rect_s *dest, - FAR const void *src, - FAR const struct nxgl_point_s *origin, - unsigned int srcstride); + CODE void (*fillrectangle)(FAR NX_PLANEINFOTYPE *pinfo, + FAR const struct nxgl_rect_s *rect, + nxgl_mxpixel_t color); + CODE void (*getrectangle)(FAR NX_PLANEINFOTYPE *pinfo, + FAR const struct nxgl_rect_s *rect, + FAR void *dest, unsigned int deststride); + CODE void (*filltrapezoid)(FAR NX_PLANEINFOTYPE *pinfo, + FAR const struct nxgl_trapezoid_s *trap, + FAR const struct nxgl_rect_s *bounds, + nxgl_mxpixel_t color); + CODE void (*moverectangle)(FAR NX_PLANEINFOTYPE *pinfo, + FAR const struct nxgl_rect_s *rect, + FAR struct nxgl_point_s *offset); + CODE void (*copyrectangle)(FAR NX_PLANEINFOTYPE *pinfo, + 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 */ diff --git a/graphics/nxbe/nxbe_configure.c b/graphics/nxbe/nxbe_configure.c index b8e90f93ab..5dc9b49c19 100644 --- a/graphics/nxbe/nxbe_configure.c +++ b/graphics/nxbe/nxbe_configure.c @@ -53,10 +53,6 @@ # define CONFIG_NX_BGCOLOR 0 #endif -/**************************************************************************** - * Private Types - ****************************************************************************/ - /**************************************************************************** * Private Data ****************************************************************************/ @@ -70,14 +66,6 @@ static const nxgl_mxpixel_t g_bgcolor[CONFIG_NX_NPLANES] = #endif }; -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/include/nuttx/ascii.h b/include/nuttx/ascii.h index 0261481c82..9cb05e1307 100644 --- a/include/nuttx/ascii.h +++ b/include/nuttx/ascii.h @@ -90,7 +90,7 @@ #define ASCII_DOLLAR 0x24 /* Dollar sign ($) */ #define ASCII_PERCENT 0x25 /* Percent sign (%) */ #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_LPAREN 0x28 /* Opening parenthesis (() */ #define ASCII_RPAREN 0x29 /* Closing parenthesis ()) */ @@ -156,7 +156,7 @@ #define ASCII_CIRCUMFLEX 0x5e /* Circumflex (^) */ #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_b 0x62 /* " " " " " " */ #define ASCII_c 0x63 /* " " " " " " */