From a0cd6e1b6bdebe67f157c01ccbd02c63f30b6d6a 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 --- 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 +++++----- 11 files changed, 40 insertions(+), 55 deletions(-) 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