Merge branch 'master' of file:///Users/Shared/NuttX

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

7 files changed, 70 insertions, 6 deletions

diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig
index 32d127aa4..ea218a592 100644
--- a/nuttx/drivers/Kconfig
+++ b/nuttx/drivers/Kconfig
@@ -151,7 +151,7 @@ config SPI_EXCHANGE
 
 config SPI_CMDDATA
 	bool "SPI CMD/DATA"
-	default y
+	default n
 	---help---
 		Devices on the SPI bus require out-of-band support to distinguish command
 		transfers from data transfers.  Such devices will often support either 9-bit
diff --git a/nuttx/drivers/input/Kconfig b/nuttx/drivers/input/Kconfig
index 1303cfbd0..9fde35ff6 100644
--- a/nuttx/drivers/input/Kconfig
+++ b/nuttx/drivers/input/Kconfig
@@ -6,8 +6,15 @@ config INPUT_TSC2007
 	bool "TI TSC2007 touchscreen controller"
 	default n
 	select I2C
+	---help---
+		Enable support for the TI TSC2007 touchscreen controller
+
 		
 config INPUT_ADS7843E
-	bool "TI ADS7843E touchscreen controller"
+	bool "TI ADS7843/TSC2046 touchscreen controller"
 	default n
 	select SPI
+	---help---
+		Enable support for the TI/Burr-Brown ADS7842 touchscreen controller.  I believe
+		that driver should be compatibile with the TI/Burr-Brown TSC2046 and XPT2046
+		touchscreen controllers as well. 
diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c
index e08a7a728..07e5e515d 100644
--- a/nuttx/drivers/input/ads7843e.c
+++ b/nuttx/drivers/input/ads7843e.c
@@ -9,6 +9,12 @@
  *   "Touch Screen Controller, ADS7843," Burr-Brown Products from Texas
  *    Instruments, SBAS090B, September 2000, Revised May 2002"
  *
+ * See also:
+ *   "Low Voltage I/O Touch Screen Controller, TSC2046," Burr-Brown Products
+ *    from Texas Instruments, SBAS265F, October 2002, Revised August 2007.
+ *
+ *   "XPT2046 Data Sheet," Shenzhen XPTek Technology Co., Ltd, 2007
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h
index 030d1cb33..43b79c7b7 100644
--- a/nuttx/drivers/input/ads7843e.h
+++ b/nuttx/drivers/input/ads7843e.h
@@ -8,6 +8,12 @@
  *   "Touch Screen Controller, ADS7843," Burr-Brown Products from Texas
  *    Instruments, SBAS090B, September 2000, Revised May 2002"
  *
+ * See also:
+ *   "Low Voltage I/O Touch Screen Controller, TSC2046," Burr-Brown Products
+ *    from Texas Instruments, SBAS265F, October 2002, Revised August 2007."
+ *
+ *   "XPT2046 Data Sheet," Shenzhen XPTek Technology Co., Ltd, 2007
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/nuttx/drivers/lcd/Kconfig b/nuttx/drivers/lcd/Kconfig
index 081a79c89..640239e63 100644
--- a/nuttx/drivers/lcd/Kconfig
+++ b/nuttx/drivers/lcd/Kconfig
@@ -2,6 +2,21 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+config LCD_NOGETRUN
+	bool "Write-only LCD"
+	default n
+	---help---
+		Many LCD hardware interfaces provide only minimal graphics capability.  In
+		particulary, many simple LCD interfaces are write only.  That is we, can
+		write graphics data to the LCD device memory, but we cannot read it back.
+		If the LCD hardware does not support reading the graphics memory, then
+		this option should be defined so that the NX layer can taking alternative
+		measures when the LCD is not readable.  For example, if the LCD is not
+		readable, then NX will not attempt to support transparency.
+
+		See also NX_WRITEONLY in the graphics support menu.
+
 config LCD_MAXCONTRAST
 	int "LCD maximum contrast"
 	default 63 if NOKIA6100_S1D15G10
@@ -28,6 +43,7 @@ config LCD_P14201
 		p14201.c.  Driver for RiT P14201 series display with SD1329 IC
 		controller.  This OLED is used with older versions of the
 		TI/Luminary LM3S8962 Evaluation Kit.
+
 if LCD_P14201
 config P14201_NINTERFACES
 	int "Number of physical P14201 devices"
@@ -174,6 +190,33 @@ config LCD_UG9664HSWAG01
 		Technology Inc.  Used with the LPC Xpresso and Embedded Artists
 		base board.
 
+config LCD_SSD1289
+	bool "LCD Based on SSD1289 Controller"
+	default n
+	---help---
+		Enables generic support for any LCD based on the Solomon Systech,
+		Ltd, SSD1289 Controller.  Use of this driver will usually require so
+		detailed customization of the LCD initialization code as necessary
+		for the specific LCD driven by the SSD1289 controller.
+
+if LCD_SSD1289
+
+choice
+	prompt "SSD1289 Initialization Profile"
+	default SSD1289_PROFILE1
+
+config SSD1289_PROFILE1
+	bool "Profile 1"
+
+config SSD1289_PROFILE2
+	bool "Profile 2"
+
+config SSD1289_PROFILE3
+	bool "Profile 3"
+
+endchoice
+endif
+
 choice
 	prompt "LCD Orientation"
 	default LCD_LANDSCAPE
diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c
index 58c606968..3d5ba96d3 100644
--- a/nuttx/drivers/lcd/ssd1289.c
+++ b/nuttx/drivers/lcd/ssd1289.c
@@ -766,7 +766,7 @@ static int ssd1289_getvideoinfo(FAR struct lcd_dev_s *dev,
 {
   DEBUGASSERT(dev && vinfo);
   lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
-          SSD1289_COLORFMT, SSD1289_XRES, SSD1289_XRES);
+          SSD1289_COLORFMT, SSD1289_XRES, SSD1289_YRES);
 
   vinfo->fmt     = SSD1289_COLORFMT;    /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
   vinfo->xres    = SSD1289_XRES;        /* Horizontal resolution in pixel columns */
@@ -925,6 +925,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   uint16_t id;
 #endif
+  int ret;
 
   /* Select the LCD */
 
@@ -1168,19 +1169,20 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
       /* One driver has a 50 msec delay here */
       /* up_mdelay(50); */
 
-      return OK;
+      ret = OK;
     }
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
       lcddbg("Unsupported LCD type\n");
-      return -ENODEV;
+      ret = -ENODEV;
     }
 #endif
 
   /* De-select the LCD */
 
   lcd->deselect(lcd);
+  return ret;
 }
 
  /*************************************************************************************
diff --git a/nuttx/drivers/net/enc28j60.h b/nuttx/drivers/net/enc28j60.h
index 6f7f8f465..6a0553a95 100644
--- a/nuttx/drivers/net/enc28j60.h
+++ b/nuttx/drivers/net/enc28j60.h
@@ -78,7 +78,7 @@
  *
  * The last five locations (0x1b to 0x1f) of all banks point to a common set
  * of registers: EIE, EIR, ESTAT, ECON2 and ECON1. These are key registers
- * usedin controlling and monitoring the operation of the device. Their
+ * used in controlling and monitoring the operation of the device. Their
  * common mapping allows easy access without switching the bank.
  *
  * Control registers for the ENC28J60 are generically grouped as ETH, MAC and