diff options
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/README.txt | 2 | ||||
| -rwxr-xr-x | nuttx/configs/lm3s6965-ek/nx/defconfig | 8 | ||||
| -rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/up_oled.c | 28 | ||||
| -rwxr-xr-x | nuttx/configs/lm3s8962-ek/nx/defconfig | 7 | ||||
| -rwxr-xr-x | nuttx/configs/lm3s8962-ek/src/up_oled.c | 28 | ||||
| -rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/src/Makefile | 3 | ||||
| -rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/src/up_lcd.c | 143 | ||||
| -rwxr-xr-x | nuttx/configs/sam3u-ek/nsh/defconfig | 2 | ||||
| -rwxr-xr-x | nuttx/configs/sam3u-ek/nx/defconfig | 2 | ||||
| -rwxr-xr-x | nuttx/configs/sam3u-ek/ostest/defconfig | 2 | ||||
| -rwxr-xr-x | nuttx/configs/sam3u-ek/src/up_lcd.c | 2 |
11 files changed, 202 insertions, 25 deletions
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index bda94884e..b7d20065a 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -739,7 +739,7 @@ defconfig -- This is a configuration file similar to the Linux 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 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; } diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 4cbdb34b0..5cd426256 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-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 diff --git a/nuttx/configs/lm3s8962-ek/src/up_oled.c b/nuttx/configs/lm3s8962-ek/src/up_oled.c index 1dd024356..55f768894 100755 --- a/nuttx/configs/lm3s8962-ek/src/up_oled.c +++ b/nuttx/configs/lm3s8962-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 "lm3s8962ek_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; } diff --git a/nuttx/configs/olimex-lpc1766stk/src/Makefile b/nuttx/configs/olimex-lpc1766stk/src/Makefile index 4b4df1752..aa89ea9ad 100755 --- a/nuttx/configs/olimex-lpc1766stk/src/Makefile +++ b/nuttx/configs/olimex-lpc1766stk/src/Makefile @@ -45,6 +45,9 @@ endif ifeq ($(CONFIG_APP_DIR),examples/usbstorage) CSRCS += up_usbstrg.c endif +ifeq ($(CONFIG_NX_LCDDRIVER),y) +CSRCS += up_lcd.c +endif AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c new file mode 100755 index 000000000..4f2a9123e --- /dev/null +++ b/nuttx/configs/olimex-lpc1766stk/src/up_lcd.c @@ -0,0 +1,143 @@ +/**************************************************************************** + * config/olimex-lpc1766stk/src/up_lcd.c + * arch/arm/src/board/up_lcd.c + * + * 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 + * POSSPBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdio.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/spi.h> +#include <nuttx/lcd/lcd.h> +#include <nuttx/lcd/nokia6100.h> + +#include "lpc17_internal.h" +#include "lpc17stk_internal.h" + +#ifdef defined(CONFIG_NX_LCDDRIVER) && defined(CONFIG_LCD_NOKIA6100) && defined(CONFIG_LPC17_SSP0) + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/* Define the CONFIG_LCD_NOKIADBG to enable detailed debug output (stuff you + * would never want to see unless you are debugging this file). + * + * Verbose debug must also be enabled + */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_DEBUG_VERBOSE +# undef CONFIG_DEBUG_GRAPHICS +#endif + +#ifndef CONFIG_DEBUG_VERBOSE +# undef CONFIG_LCD_NOKIADBG +#endif + +#ifdef CONFIG_LCD_NOKIADBG +# define lcddbg(format, arg...) vdbg(format, ##arg) +# define lcd_dumpgpio(m) lm3s_dumpgpio(LPC1766STK_LCD_RST, m) +#else +# define lcddbg(x...) +# define lcd_dumpgpio(m) +#endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_nxdrvinit + * + * Description: + * Called NX initialization logic to configure the LCD. + * + ****************************************************************************/ + +FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) +{ + FAR struct spi_dev_s *spi; + FAR struct lcd_dev_s *dev; + + /* Configure the LCD GPIOs */ + + lcd_dumpgpio("up_nxdrvinit: On entry"); + lm3s_configgpio(LPC1766STK_LCD_RST); + lm3s_configgpio(LPC1766STK_LCD_BL); + lcd_dumpgpio("up_nxdrvinit: After GPIO setup"); + + /* Reset the LCD */ + + lpc17_gpiowrite(LPC1766STK_LCD_RST, false); + up_usdelay(10); + lpc17_gpiowrite(LPC1766STK_LCD_RST, true); + up_msdelay(5); + + /* Get the SSP port (configure as a Freescale SPI port) */ + + spi = up_spiinitialize(0); + if (!spi) + { + glldbg("Failed to initialize SSP port 0\n"); + } + else + { + /* Bind the SSP port to the LCD */ + + dev = nokia_lcdinitialize(spi, devno); + if (!dev) + { + glldbg("Failed to bind SSP port 0 to LCD %d: %d\n", devno); + } + else + { + gllvdbg("Bound SSP port 0 to LCD %d\n", devno); + + /* And turn the LCD on (CONFIG_LCD_MAXPOWER should be 1) */ + + (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER); + return dev; + } + } + return NULL; +} + +#endif /* CONFIG_NX_LCDDRIVER && CONFIG_LCD_NOKIA6100 && CONFIG_LPC17_SSP0 */ diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 3bf81b9b4..54b1e368c 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -655,7 +655,7 @@ CONFIG_USBSTRG_REMOVABLE=y # 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 diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 06ed91880..c48cf66bd 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -664,7 +664,7 @@ CONFIG_USBSTRG_REMOVABLE=y # 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 diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index fe9d96cba..475ab094c 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -653,7 +653,7 @@ CONFIG_USBSTRG_REMOVABLE=y # 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 diff --git a/nuttx/configs/sam3u-ek/src/up_lcd.c b/nuttx/configs/sam3u-ek/src/up_lcd.c index 971d8d885..8b0a919f7 100755 --- a/nuttx/configs/sam3u-ek/src/up_lcd.c +++ b/nuttx/configs/sam3u-ek/src/up_lcd.c @@ -119,7 +119,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/lcd.h> +#include <nuttx/lcd/lcd.h> #include <nuttx/rgbcolors.h> #include <arch/irq.h> |