From c5bbc7b71de1a119d7ae65ae3d5e5c190aa6f48a Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 7 May 2012 21:25:24 +0000 Subject: [PATCH] Various fixes for running the NxWM unit test on the STM3240G-EVAL git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4711 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 5 +++++ Documentation/NXGraphicsSubsystem.html | 10 +++++----- Documentation/NuttxPortingGuide.html | 12 ++++++++++++ configs/sim/nx/defconfig | 5 ----- configs/sim/nx11/defconfig | 5 ----- configs/sim/nxwm/defconfig | 5 ----- configs/stm3210e-eval/nsh2/defconfig | 10 +++++----- configs/stm3210e-eval/nx/defconfig | 10 +++++----- configs/stm3210e-eval/nxconsole/defconfig | 10 +++++----- configs/stm3210e-eval/nxlines/defconfig | 10 +++++----- configs/stm3210e-eval/nxtext/defconfig | 10 +++++----- configs/stm3240g-eval/nsh/defconfig | 10 +++++----- configs/stm3240g-eval/nxconsole/defconfig | 10 +++++----- configs/stm3240g-eval/nxwm/defconfig | 10 +++++----- graphics/README.txt | 8 ++++---- graphics/nxconsole/nx_register.c | 6 +++--- graphics/nxconsole/nxcon_internal.h | 2 +- graphics/nxconsole/nxcon_scroll.c | 2 +- graphics/nxconsole/nxtk_register.c | 6 +++--- graphics/nxconsole/nxtool_register.c | 6 +++--- include/nuttx/nx/nx.h | 7 ++++++- include/nuttx/nx/nxconsole.h | 4 ---- 22 files changed, 83 insertions(+), 80 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d30891af5..e6a156b1cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2715,4 +2715,9 @@ * graphics/nxtk/nxtk_toolbarbounds.c: Added an interface to get the toolbar bounding box. * graphics/nxtk/nxtk_drawframe.c: Fix an error in drawing the window frame. + * NX, NxConsole: Replace CONFIG_NXCONSOLE_NOGETRUN to CONFIG_LCD_GETRUN. The + inability to read from the LCD is a property of the LCD, not of NxConsole. + Then add CONFIG_NX_WRITEONLY which is the more generic way of saying that + no NX component should try to read from the underlying graphic device (LCD + or other). diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index 857fcd1a47..2a6e88c9d2 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@

NX Graphics Subsystem

-

Last Updated: May 4, 2012

+

Last Updated: May 7, 2012

@@ -3249,6 +3249,10 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
Build in support for mouse input.
CONFIG_NX_KBD:
Build in support of keypad/keyboard input. +
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. @@ -3364,10 +3368,6 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, 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 internal memory allocations used to hold the character data. diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 23c4126790..4c3e93a6ac 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -5371,6 +5371,12 @@ build 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 @@ -5405,6 +5411,12 @@ build Check the README.txt file in each board configuration directory to see if any of these are supported by the board LCD logic.
    • +
  • + CONFIG_LCD_NOGETRUN: + NX components need 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_NX_MOUSE: Build in support for mouse input. diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index e34dadcd87..87b714a94d 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -430,10 +430,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -457,7 +453,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=8 -# CONFIG_NXCONSOLE_NOGETRUN CONFIG_NXCONSOLE_MXCHARS=256 # CONFIG_NXCONSOLE_CACHESIZE # CONFIG_NXCONSOLE_LINESEPARATION diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig index 5b23678d66..aa95af7f8d 100644 --- a/configs/sim/nx11/defconfig +++ b/configs/sim/nx11/defconfig @@ -437,10 +437,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -464,7 +460,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=32 -# CONFIG_NXCONSOLE_NOGETRUN CONFIG_NXCONSOLE_MXCHARS=256 # CONFIG_NXCONSOLE_CACHESIZE # CONFIG_NXCONSOLE_LINESEPARATION diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig index 37281ec7fd..01b152122d 100644 --- a/configs/sim/nxwm/defconfig +++ b/configs/sim/nxwm/defconfig @@ -581,10 +581,6 @@ CONFIG_NXWM_UNITTEST=y # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -608,7 +604,6 @@ CONFIG_NXWM_UNITTEST=y # CONFIG_NXCONSOLE=y CONFIG_NXCONSOLE_BPP=32 -# CONFIG_NXCONSOLE_NOGETRUN CONFIG_NXCONSOLE_MXCHARS=256 # CONFIG_NXCONSOLE_CACHESIZE # CONFIG_NXCONSOLE_LINESEPARATION diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index a71b7bad0f..ebe8fc5be5 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -1062,10 +1062,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -1089,7 +1085,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -1098,6 +1093,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -1117,6 +1116,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight # is provided. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=n CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=y diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index fb45f6e763..5488ae8910 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -912,10 +912,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -939,7 +935,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -948,6 +943,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -967,6 +966,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight # is provided. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=n CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=y diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig index a767968fde..a84fc81344 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxconsole/defconfig @@ -920,10 +920,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -947,7 +943,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=y CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -956,6 +951,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -975,6 +974,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight # is provided. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=y CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=n diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig index 3a52bc1759..b1e4f960a8 100644 --- a/configs/stm3210e-eval/nxlines/defconfig +++ b/configs/stm3210e-eval/nxlines/defconfig @@ -911,10 +911,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -938,7 +934,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -947,6 +942,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -966,6 +965,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight # is provided. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=n CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=y diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index a99456351c..097287fb47 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -911,10 +911,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -938,7 +934,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -947,6 +942,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3210E-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -966,6 +965,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight # is provided. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=n CONFIG_LCD_PORTRAIT=n CONFIG_LCD_RPORTRAIT=y diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 025bef7527..667bc19cf9 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -1207,10 +1207,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -1234,7 +1230,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -1243,6 +1238,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3240G-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # CONFIG_LCD_RLANDSCAPE - Define for 320x240 display "reverse @@ -1257,6 +1256,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # STM3240G-EVAL's LCD ribbon cable is at the top of the display. # Default is 320x240 "landscape" orientation. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=n CONFIG_LCD_RLANDSCAPE=n CONFIG_LCD_PORTRAIT=n diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig index 57ca2b9729..68bc045fbe 100644 --- a/configs/stm3240g-eval/nxconsole/defconfig +++ b/configs/stm3240g-eval/nxconsole/defconfig @@ -1207,10 +1207,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -1234,7 +1230,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # CONFIG_NXCONSOLE=y CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -1243,6 +1238,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3240G-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -1258,6 +1257,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # STM3240G-EVAL's LCD ribbon cable is at the top of the display. # Default is 320x240 "landscape" orientation. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=y CONFIG_LCD_RLANDSCAPE=n CONFIG_LCD_PORTRAIT=n diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index ed47cfe2a7..73686f67fc 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -1272,10 +1272,6 @@ CONFIG_NXWM_UNITTEST=y # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. # Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) -# 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 @@ -1299,7 +1295,6 @@ CONFIG_NXWM_UNITTEST=y # CONFIG_NXCONSOLE=y CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_NOGETRUN=y CONFIG_NXCONSOLE_MXCHARS=256 CONFIG_NXCONSOLE_CACHESIZE=32 # CONFIG_NXCONSOLE_LINESEPARATION @@ -1308,6 +1303,10 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # # STM3240G-EVAL LCD Hardware Configuration # +# CONFIG_LCD_NOGETRUN +# NX components need 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_LCD_LANDSCAPE - Define for 320x240 display "landscape" # support. Default is this 320x240 "landscape" orientation # (this setting is informative only... not used). @@ -1323,6 +1322,7 @@ CONFIG_NXCONSOLE_CACHESIZE=32 # STM3240G-EVAL's LCD ribbon cable is at the top of the display. # Default is 320x240 "landscape" orientation. # +CONFIG_LCD_NOGETRUN=y CONFIG_LCD_LANDSCAPE=y CONFIG_LCD_RLANDSCAPE=n CONFIG_LCD_PORTRAIT=n diff --git a/graphics/README.txt b/graphics/README.txt index 3cd213247e..180c568d8a 100644 --- a/graphics/README.txt +++ b/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/graphics/nxconsole/nx_register.c b/graphics/nxconsole/nx_register.c index c009720347..8ebe0c0d5e 100644 --- a/graphics/nxconsole/nx_register.c +++ b/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/graphics/nxconsole/nxcon_internal.h b/graphics/nxconsole/nxcon_internal.h index 10341f0cfc..3ca84329ba 100644 --- a/graphics/nxconsole/nxcon_internal.h +++ b/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/graphics/nxconsole/nxcon_scroll.c b/graphics/nxconsole/nxcon_scroll.c index 882c99ed8c..c1a0fec950 100755 --- a/graphics/nxconsole/nxcon_scroll.c +++ b/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/graphics/nxconsole/nxtk_register.c b/graphics/nxconsole/nxtk_register.c index 6ea239d742..0a11fc6cfe 100644 --- a/graphics/nxconsole/nxtk_register.c +++ b/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/graphics/nxconsole/nxtool_register.c b/graphics/nxconsole/nxtool_register.c index c5273d5f68..b063d5a613 100644 --- a/graphics/nxconsole/nxtool_register.c +++ b/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) diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h index 0e908f7c51..bba098398f 100644 --- a/include/nuttx/nx/nx.h +++ b/include/nuttx/nx/nx.h @@ -65,13 +65,18 @@ /**************************************************************************** * Public Types ****************************************************************************/ - /* Configuration ************************************************************/ #ifndef CONFIG_NX_NPLANES # define CONFIG_NX_NPLANES 1 /* Max number of color planes supported */ #endif +/* Check if the underlying graphic device supports read operations */ + +#if !defined(CONFIG_NX_WRITEONLY) && defined(CONFIG_NX_LCDDRIVER) && defined(CONFIG_LCD_NOGETRUN) +# define CONFIG_NX_WRITEONLY 1 +#endif + /* Handles ******************************************************************/ /* The interface to the NX server is managed using a opaque handle: */ diff --git a/include/nuttx/nx/nxconsole.h b/include/nuttx/nx/nxconsole.h index 48ac3eacd8..7b4bb5f3df 100644 --- a/include/nuttx/nx/nxconsole.h +++ b/include/nuttx/nx/nxconsole.h @@ -71,10 +71,6 @@ * 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