From f08f0709b3bb317be95f73755a042fd58198e163 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 7 May 2012 21:25:24 +0000 Subject: Various fixes for running the NxWM unit test on the STM3240G-EVAL git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4711 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/graphics/README.txt | 8 ++++---- nuttx/graphics/nxconsole/nx_register.c | 6 +++--- nuttx/graphics/nxconsole/nxcon_internal.h | 2 +- nuttx/graphics/nxconsole/nxcon_scroll.c | 2 +- nuttx/graphics/nxconsole/nxtk_register.c | 6 +++--- nuttx/graphics/nxconsole/nxtool_register.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'nuttx/graphics') diff --git a/nuttx/graphics/README.txt b/nuttx/graphics/README.txt index 3cd213247..180c568d8 100644 --- a/nuttx/graphics/README.txt +++ b/nuttx/graphics/README.txt @@ -240,6 +240,10 @@ CONFIG_NX_NPLANES Some YUV color formats requires support for multiple planes, one for each color component. Unless you have such special hardware, this value should be undefined or set to 1. +CONFIG_NX_WRITEONLY + Define if the underlying graphics device does not support read operations. + Automatically defined if CONFIG_NX_LCDDRIVER and CONFIG_LCD_NOGETRUN are + defined. CONFIG_NX_DISABLE_1BPP, CONFIG_NX_DISABLE_2BPP, CONFIG_NX_DISABLE_4BPP, CONFIG_NX_DISABLE_8BPP, CONFIG_NX_DISABLE_16BPP, CONFIG_NX_DISABLE_24BPP, and @@ -331,10 +335,6 @@ CONFIG_NXCONSOLE_BPP Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) CONFIG_NXCONSOLE_CURSORCHAR The bitmap code to use as the cursor. Default '_' -CONFIG_NXCONSOLE_NOGETRUN - NxConsole needs to know if it can read from the LCD or not. If reading - from the LCD is supported, then NxConsole can do more efficient - scrolling. Default: Supported CONFIG_NXCONSOLE_MXCHARS NxConsole needs to remember every character written to the console so that it can redraw the window. This setting determines the size of some diff --git a/nuttx/graphics/nxconsole/nx_register.c b/nuttx/graphics/nxconsole/nx_register.c index c00972034..8ebe0c0d5 100644 --- a/nuttx/graphics/nxconsole/nx_register.c +++ b/nuttx/graphics/nxconsole/nx_register.c @@ -55,7 +55,7 @@ static int nxcon_fill(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]); -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxcon_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -73,7 +73,7 @@ static int nxcon_bitmap(FAR struct nxcon_state_s *priv, static const struct nxcon_operations_s g_nxops = { nxcon_fill, -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY nxcon_move, #endif nxcon_bitmap @@ -123,7 +123,7 @@ static int nxcon_fill(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxcon_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) diff --git a/nuttx/graphics/nxconsole/nxcon_internal.h b/nuttx/graphics/nxconsole/nxcon_internal.h index 10341f0cf..3ca84329b 100644 --- a/nuttx/graphics/nxconsole/nxcon_internal.h +++ b/nuttx/graphics/nxconsole/nxcon_internal.h @@ -99,7 +99,7 @@ struct nxcon_operations_s int (*fill)(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]); -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY int (*move)(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); diff --git a/nuttx/graphics/nxconsole/nxcon_scroll.c b/nuttx/graphics/nxconsole/nxcon_scroll.c index 882c99ed8..c1a0fec95 100755 --- a/nuttx/graphics/nxconsole/nxcon_scroll.c +++ b/nuttx/graphics/nxconsole/nxcon_scroll.c @@ -87,7 +87,7 @@ * only. ****************************************************************************/ -#ifdef CONFIG_NXCONSOLE_NOGETRUN +#ifdef CONFIG_NX_WRITEONLY static inline void nxcon_movedisplay(FAR struct nxcon_state_s *priv, int bottom, int scrollheight) { diff --git a/nuttx/graphics/nxconsole/nxtk_register.c b/nuttx/graphics/nxconsole/nxtk_register.c index 6ea239d74..0a11fc6cf 100644 --- a/nuttx/graphics/nxconsole/nxtk_register.c +++ b/nuttx/graphics/nxconsole/nxtk_register.c @@ -55,7 +55,7 @@ static int nxtkcon_fill(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]); -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxtkcon_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -73,7 +73,7 @@ static int nxtkcon_bitmap(FAR struct nxcon_state_s *priv, static const struct nxcon_operations_s g_nxtkops = { nxtkcon_fill, -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY nxtkcon_move, #endif nxtkcon_bitmap @@ -123,7 +123,7 @@ static int nxtkcon_fill(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxtkcon_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) diff --git a/nuttx/graphics/nxconsole/nxtool_register.c b/nuttx/graphics/nxconsole/nxtool_register.c index c5273d5f6..b063d5a61 100644 --- a/nuttx/graphics/nxconsole/nxtool_register.c +++ b/nuttx/graphics/nxconsole/nxtool_register.c @@ -55,7 +55,7 @@ static int nxtool_fill(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES]); -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxtool_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset); @@ -73,7 +73,7 @@ static int nxtool_bitmap(FAR struct nxcon_state_s *priv, static const struct nxcon_operations_s g_nxtoolops = { nxtool_fill, -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY nxtool_move, #endif nxtool_bitmap @@ -123,7 +123,7 @@ static int nxtool_fill(FAR struct nxcon_state_s *priv, * ****************************************************************************/ -#ifndef CONFIG_NXCONSOLE_NOGETRUN +#ifndef CONFIG_NX_WRITEONLY static int nxtool_move(FAR struct nxcon_state_s *priv, FAR const struct nxgl_rect_s *rect, FAR const struct nxgl_point_s *offset) -- cgit v1.2.3