P14201 driver now uses new SPI cmddata method

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

2 files changed, 26 insertions, 10 deletions

diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index f1c020a00..5b9c03e2e 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -215,6 +215,11 @@ CONFIG_RAW_BINARY=y
 CONFIG_HAVE_LIBM=n
 
 #
+# General SPI interface configuration
+#
+CONFIG_SPI_CMDDATA=y
+
+#
 # General OS setup
 #
 # CONFIG_APP_DIR - Identifies the relative path to the directory
@@ -526,7 +531,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
 # CONFIG_NX_LCDDRIVER
 #   By default, NX builds to use a framebuffer driver (see
 #   include/nuttx/fb.h). If this option is defined, NX will
-#   build to use an LCD driver (see include/nuttx/lcd.h).
+#   build to use an LCD driver (see include/nuttx/lcd/lcd.h).
 # CONFIG_LCD_MAXPOWER - The full-on power setting for an LCD device.
 # CONFIG_LCD_MAXCONTRAST - The maximum contrast value for an LCD device.
 # CONFIG_NX_MOUSE
@@ -590,6 +595,7 @@ CONFIG_NX_BLOCKING=y
 CONFIG_NX_MXSERVERMSGS=32
 CONFIG_NX_MXCLIENTMSGS=16
 
+#
 # RiT P14201 OLED Driver Configuration
 #
 # CONFIG_LCD_P14201 - Enable P14201 support
diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c
index 0493ce475..e508de8de 100755
--- a/nuttx/configs/lm3s6965-ek/src/up_oled.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c
@@ -45,8 +45,8 @@
 #include <errno.h>
 
 #include <nuttx/spi.h>
-#include <nuttx/lcd.h>
-#include <nuttx/p14201.h>
+#include <nuttx/lcd/lcd.h>
+#include <nuttx/lcd/p14201.h>
 
 #include "lm3s_internal.h"
 #include "lm3s6965ek_internal.h"
@@ -137,26 +137,36 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno)
 }
 
 /******************************************************************************
- * Name:  rit_seldata
+ * Name:  lm3s_spicmddata
  *
  * Description:
  *   Set or clear the SD1329 D/Cn bit to select data (true) or command
  *   (false).  This function must be provided by platform-specific logic.
+ *   This is an implementation of the cmddata method of the SPI
+ *   interface defined by struct spi_ops_s (see include/nuttx/spi.h).
  *
  * Input Parameters:
  *
- *   devno - A value in the range of 0 throuh CONFIG_P14201_NINTERFACES-1.
- *           This allows support for multiple OLED devices.
- *   data - true: select data; false: select command
+ *   spi - SPI device that controls the bus the device that requires the CMD/
+ *         DATA selection.
+ *   devid - If there are multiple devices on the bus, this selects which one
+ *         to select cmd or data.  NOTE:  This design restricts, for example,
+ *         one one SPI display per SPI bus.
+ *   cmd - true: select command; false: select data
  *
  * Returned Value:
  *   None
  *
  ******************************************************************************/
 
-void rit_seldata(unsigned int devno, bool data)
+int lm3s_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
-  /* Set GPIO to 1 for data, 0 for command */
+  if (devid == SPIDEV_DISPLAY)
+    {
+      /* Set GPIO to 1 for data, 0 for command */
 
-  lm3s_gpiowrite(OLEDDC_GPIO, data);
+      lm3s_gpiowrite(OLEDDC_GPIO, !cmd);
+      return OK;
+    }
+  return -ENODEV;
 }