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

include/nuttx/lcd/lcd.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/lcd.h
+ * include/nuttx/lcd/lcd.h
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

include/nuttx/lcd/nokia6100.h

@@ -0,0 +1,112 @@
+/****************************************************************************
+ * include/nuttx/lcd/nokia6100.h
+ * Application interface to the Nokia 6100 LCD display
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_NOKIA6100_H
+#define __INCLUDE_NUTTX_NOKIA6100_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdbool.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Nokia 6100 Configuration Settings:
+ *
+ * CONFIG_NOKIA6100_SPIMODE - Controls the SPI mode
+ * CONFIG_NOKIA6100_FREQUENCY - Define to use a different bus frequency
+ * CONFIG_NOKIA6100_NINTERFACES - Specifies the number of physical Nokia 6100 devices that
+ *   will be supported.
+ *
+ * Required LCD driver settings:
+ * CONFIG_LCD_NOKIA6100 - Enable Nokia 6100 support
+ * CONFIG_LCD_MAXCONTRAST should be 255, but any value >0 and <=255 will be accepted.
+ * CONFIG_LCD_MAXPOWER must be 1
+ */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/**************************************************************************************
+ * Name:  nokia_lcdinitialize
+ *
+ * Description:
+ *   Initialize the NOKIA6100 video hardware.  The initial state of the LCD is fully
+ *   initialized, display memory cleared, and the LCD ready to use, but with the power
+ *   setting at 0 (full off == sleep mode).
+ *
+ * Input Parameters:
+ *
+ *   spi - A reference to the SPI driver instance.
+ *   devno - A value in the range of 0 throuh CONFIG_NOKIA6100_NINTERFACES-1.  This
+ *     allows support for multiple LCD devices.
+ *
+ * Returned Value:
+ *
+ *   On success, this function returns a reference to the LCD object for the specified
+ *   LCD.  NULL is returned on any failure.
+ *
+ **************************************************************************************/
+
+struct lcd_dev_s; /* see nuttx/lcd.h */
+struct spi_dev_s; /* see nuttx/spi.h */
+EXTERN FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned int devno);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __INCLUDE_NUTTX_NOKIA6100_H */

include/nuttx/lcd/p14201.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/p14201.h
+ * include/nuttx/lcd/p14201.h
  * Application interface to the RiT P14201 OLED driver
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
@@ -67,6 +67,9 @@
  * CONFIG_LCD_P14201 - Enable P14201 support
  * CONFIG_LCD_MAXCONTRAST should be 255, but any value >0 and <=255 will be accepted.
  * CONFIG_LCD_MAXPOWER must be 1
+ *
+ * Required SPI driver settings:
+ * CONFIG_SPI_CMDDATA - Include support for cmd/data selection.
  */
 
 /* Some important "colors" */
@@ -118,26 +121,6 @@ struct lcd_dev_s; /* see nuttx/lcd.h */
 struct spi_dev_s; /* see nuttx/spi.h */
 EXTERN FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int devno);
 
-/**************************************************************************************
- * Name:  rit_seldata
- *
- * 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.
- *
- * 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
- *
- * Returned Value:
- *   None
- *
- **************************************************************************************/
-
-EXTERN void rit_seldata(unsigned int devno, bool data);
-
 #undef EXTERN
 #ifdef __cplusplus
 }

include/nuttx/nxglib.h

@@ -47,7 +47,7 @@
 #include <fixedmath.h>
 
 #ifdef CONFIG_NX_LCDDRIVER
-#  include <nuttx/lcd.h>
+#  include <nuttx/lcd/lcd.h>
 #else
 #  include <nuttx/fb.h>
 #endif

include/nuttx/spi.h

@@ -211,7 +211,7 @@
  *
  ****************************************************************************/
 
-#ifndef CONFIG_SPI_CMDDATA
+#ifdef CONFIG_SPI_CMDDATA
 #  define SPI_CMDDATA(d,id,cmd) ((d)->ops->cmddata(d,id,cmd))
 #endif
 
@@ -376,7 +376,7 @@ struct spi_ops_s
   void     (*setmode)(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
   void     (*setbits)(FAR struct spi_dev_s *dev, int nbits);
   uint8_t  (*status)(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-#ifndef CONFIG_SPI_CMDDATA
+#ifdef CONFIG_SPI_CMDDATA
   int      (*cmddata)(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
   uint16_t (*send)(FAR struct spi_dev_s *dev, uint16_t wd);