Turn off LCD reading on Shenzhou board (needs some TLC before it will be usable)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5202 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 37 insertions, 21 deletions

diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index 9c358c5a5..515b487e7 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -702,11 +702,11 @@ Where <subdir> is one of the following:
     This is a special configuration setup for the NxWM window manager
     UnitTest.  The NxWM window manager can be found here:
 
-      trunk/NxWidgets/nxwm
+      nuttx-code/NxWidgets/nxwm
 
     The NxWM unit test can be found at:
 
-      trunk/NxWidgets/UnitTests/nxwm
+      nuttx-code/NxWidgets/UnitTests/nxwm
 
     NOTE:  JP6 selects between the touchscreen interrupt and the MII
     interrupt.  It should be positioned 1-2 to enable the touchscreen
@@ -714,13 +714,13 @@ Where <subdir> is one of the following:
 
     Documentation for installing the NxWM unit test can be found here:
 
-      trunk/NxWidgets/UnitTests/README.txt
+      nuttx-code/NxWidgets/UnitTests/README.txt
 
     Here is the quick summary of the build steps:
 
     1. Intall the nxwm configuration
 
-       $ cd ~/nuttx/trunk/nuttx/tools
+       $ cd ~/nuttx/nuttx-code/tools
        $ ./configure.sh shenzhou/nxwm
 
     2. Make the build context (only)
@@ -732,25 +732,41 @@ Where <subdir> is one of the following:
 
     3. Install the nxwm unit test
 
-       $ cd ~/nuttx/trunk/NxWidgets
-       $ tools/install.sh ~/nuttx/trunk/apps nxwm
+       $ cd ~/nuttx/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx/nuttx-code/apps nxwm
        Creating symbolic link
-        - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
-        - At ~/nuttx/trunk/apps/external
+        - To ~/nuttx/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx/nuttx-code/apps/external
 
     4. Build the NxWidgets library
 
-       $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
-       $ make TOPDIR=~/nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx/nuttx-code
        ...
 
     5. Build the NxWM library
 
-       $ cd ~/nuttx/trunk/NxWidgets/nxwm
-       $ make TOPDIR=~//nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx/nuttx-code
        ...
 
     6. Built NuttX with the installed unit test as the application
 
-       $ cd ~/nuttx/trunk/nuttx
+       $ cd ~/nuttx/nuttx-code
        $ make
+
+    NOTE: Reading from the LCD is not currently supported by this
+    configuration.  The hardware will support reading from the LCD
+    and drivers/lcd/ssd1289.c also supports reading from the LCD.
+    This limits some graphics capabilities.
+
+    If you enable reading from the LCD, you will see some memory
+    corruption.  If you get inspired to debug this problem, you can
+    turn the LCD read functionality back on by setting:
+
+      -CONFIG_LCD_NOGETRUN=y
+      +# CONFIG_LCD_NOGETRUN is not set
+
+      -CONFIG_NX_WRITEONLY=y
+      +# CONFIG_NX_WRITEONLY is not set
+ 
\ No newline at end of file
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 811ba0266..4b84144b6 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -197,7 +197,6 @@ CONFIG_STM32_PHYSR_100FD=0x8000
 CONFIG_STM32_RMII=y
 CONFIG_STM32_RMII_MCO=y
 # CONFIG_STM32_RMII_EXTCLK is not set
-# CONFIG_STM32_ETHMAC_REGDEBUG is not set
 
 #
 # USB Host Configuration
@@ -367,7 +366,7 @@ CONFIG_ADS7843E_THRESHX=39
 CONFIG_ADS7843E_THRESHY=51
 # CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
-# CONFIG_LCD_NOGETRUN is not set
+CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_P14201 is not set
@@ -487,7 +486,7 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_NX=y
 CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
-# CONFIG_NX_WRITEONLY is not set
+CONFIG_NX_WRITEONLY=y
 
 #
 # Supported Pixel Depths
@@ -1075,6 +1074,7 @@ CONFIG_NXWIDGETS_CONTINUE_REPEAT_TIME=200
 CONFIG_NXWIDGETS_DOUBLECLICK_TIME=350
 CONFIG_NXWIDGETS_KBDBUFFER_SIZE=16
 CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
+# CONFIG_NXWIDGET_MEMMONITOR is not set
 CONFIG_NXWM=y
 
 #
diff --git a/nuttx/configs/shenzhou/src/up_ssd1289.c b/nuttx/configs/shenzhou/src/up_ssd1289.c
index 00e0ac0dd..50a99bddf 100644
--- a/nuttx/configs/shenzhou/src/up_ssd1289.c
+++ b/nuttx/configs/shenzhou/src/up_ssd1289.c
@@ -122,7 +122,7 @@ static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg);
 #endif
 
 static void stm32_wrdata(FAR struct stm32_lower_s *priv, uint16_t data);
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv);
 #endif
 
@@ -131,7 +131,7 @@ static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv);
 static void stm32_select(FAR struct ssd1289_lcd_s *dev);
 static void stm32_deselect(FAR struct ssd1289_lcd_s *dev);
 static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index);
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev);
 #endif
 static void stm32_write(FAR struct ssd1289_lcd_s *dev, uint16_t data);
@@ -253,7 +253,7 @@ static struct stm32_lower_s g_lcdlower =
     .select    = stm32_select,
     .deselect  = stm32_deselect,
     .index     = stm32_index,
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
     .read      = stm32_read,
 #endif
     .write     = stm32_write,
@@ -326,7 +326,7 @@ static void stm32_wrdata(FAR struct stm32_lower_s *priv, uint16_t data)
  *
  ************************************************************************************/
 
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static inline uint16_t stm32_rddata(FAR struct stm32_lower_s *priv)
 {
   uint16_t regval;
@@ -407,7 +407,7 @@ static void stm32_index(FAR struct ssd1289_lcd_s *dev, uint8_t index)
  *
  ************************************************************************************/
 
-#ifndef CONFIG_SSD1289_WRONLY
+#ifndef CONFIG_LCD_NOGETRUN
 static uint16_t stm32_read(FAR struct ssd1289_lcd_s *dev)
 {
   FAR struct stm32_lower_s *priv = (FAR struct stm32_lower_s *)dev;