diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-13 02:13:15 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-05-13 02:13:15 +0000 |
commit | c6c6c52fdb8e2fe474563b71437d80f4d3c67e59 (patch) | |
tree | 5b5603b22e87341721d5bcd9c891ec6bf062e2e4 /nuttx/configs/lm3s6965-ek/src | |
parent | a5e540ac16e48b68d8365cfe912d405871beed5f (diff) | |
download | px4-nuttx-c6c6c52fdb8e2fe474563b71437d80f4d3c67e59.tar.gz px4-nuttx-c6c6c52fdb8e2fe474563b71437d80f4d3c67e59.tar.bz2 px4-nuttx-c6c6c52fdb8e2fe474563b71437d80f4d3c67e59.zip |
Add NX config for lm3s6965-ek
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2668 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/lm3s6965-ek/src')
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/Makefile | 4 | ||||
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h | 12 | ||||
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/up_boot.c | 11 | ||||
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/up_oled.c | 121 | ||||
-rwxr-xr-x | nuttx/configs/lm3s6965-ek/src/up_ssi.c | 19 |
5 files changed, 162 insertions, 5 deletions
diff --git a/nuttx/configs/lm3s6965-ek/src/Makefile b/nuttx/configs/lm3s6965-ek/src/Makefile index 103c598e9..dfb59a4ed 100755 --- a/nuttx/configs/lm3s6965-ek/src/Makefile +++ b/nuttx/configs/lm3s6965-ek/src/Makefile @@ -43,6 +43,10 @@ CSRCS = up_boot.c up_leds.c up_ethernet.c up_ssi.c ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif +ifeq ($(CONFIG_NX_LCDDRIVER),y) +CSRCS += up_oled.c +endif + COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h index 2b7514c21..07a0aa3fe 100755 --- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h +++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h @@ -126,6 +126,18 @@ extern void weak_function lm3s_ssiinitialize(void);
+/************************************************************************************
+ * Name: lm3s_oledinitialize
+ *
+ * Description:
+ * Called to configure OLED.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_NX_LCDDRIVER
+extern void weak_function lm3s_oledinitialize(void);
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_LM3S6965_EK_SRC_LM3S6965EK_INTERNAL_H */
diff --git a/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/up_boot.c index 9e1091c4c..3e8f54fbf 100755 --- a/nuttx/configs/lm3s6965-ek/src/up_boot.c +++ b/nuttx/configs/lm3s6965-ek/src/up_boot.c @@ -74,13 +74,22 @@ void lm3s_boardinitialize(void) * lm3s_ssiinitialize() has been brought into the link.
*/
-/* The LM3S6965 Eval Kit microSD CS is on SSI0 */
+ /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 */
#if !defined(CONFIG_SSI0_DISABLE) /* || !defined(CONFIG_SSI1_DISABLE) */
if (lm3s_ssiinitialize)
{
lm3s_ssiinitialize();
}
+
+ /* Configure the OLED for use */
+
+#ifdef CONFIG_NX_LCDDRIVER
+ if (lm3s_oledinitialize)
+ {
+ lm3s_oledinitialize();
+ }
+#endif
#endif
/* Configure on-board LEDs if LED support has been selected. */
diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c new file mode 100755 index 000000000..8c442b0ec --- /dev/null +++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c @@ -0,0 +1,121 @@ +/**************************************************************************** + * config/lm3s6965-ek/src/up_oled.c + * arch/arm/src/board/up_oled.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 + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdio.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/spi.h> +#include <nuttx/p14201.h> + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************************ + * Name: lm3s_oledinitialize + * + * Description: + * Called to configure OLED. + * + ************************************************************************************/ + +void weak_function lm3s_oledinitialize(void); +{ + FAR struct spi_dev_s *spi; + int ret; + + /* Configure the OLED D/Cn GPIO */ + + lm3s_configgpio(OLEDDC_GPIO); + + /* Get the SPI port */ + + spi = up_spiinitialize(0); + if (!spi) + { + glldbg("Failed to initialize SPI port 0\n"); + } + else + { + /* Bind the SPI port to the OLED */ + + ret = rit_initialize(spi, 0); + if (ret < 0) + { + glldbg("Failed to bind SPI port 0 to OLED: %d\n", ret); + } + else + { + gllvdbg("Bound SPI port 0 to OLED\n"); + } + } +} + +/************************************************************************************** + * 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 + * + **************************************************************************************/ + +void rit_seldata(unsigned int devno, bool data) +{ + /* Set GPIO to 1 for data, 0 for command */ + + lm3s_gpiowrite(OLEDDC_GPIO, data); +} diff --git a/nuttx/configs/lm3s6965-ek/src/up_ssi.c b/nuttx/configs/lm3s6965-ek/src/up_ssi.c index c7e2c8f1c..90d24ef78 100755 --- a/nuttx/configs/lm3s6965-ek/src/up_ssi.c +++ b/nuttx/configs/lm3s6965-ek/src/up_ssi.c @@ -106,9 +106,12 @@ void weak_function lm3s_ssiinitialize(void) {
/* Configure the SPI-based microSD CS GPIO */
- ssi_dumpgpio("lm3s_ssiinitialize() before lm3s_configgpio()");
+ ssi_dumpgpio("lm3s_ssiinitialize() Entry)");
lm3s_configgpio(SDCCS_GPIO);
- ssi_dumpgpio("lm3s_ssiinitialize() after lm3s_configgpio()");
+#ifdef CONFIG_NX_LCDDRIVER
+ lm3s_configgpio(OLEDCS_GPIO);
+#endif
+ ssi_dumpgpio("lm3s_ssiinitialize() Exit");
}
/****************************************************************************
@@ -133,14 +136,22 @@ void weak_function lm3s_ssiinitialize(void) void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+ ssi_dumpgpio("lm3s_spiselect() Entry");
if (devid == SPIDEV_MMCSD)
{
/* Assert the CS pin to the card */
- ssi_dumpgpio("lm3s_spiselect() before lm3s_gpiowrite()");
lm3s_gpiowrite(SDCCS_GPIO, !selected);
- ssi_dumpgpio("lm3s_spiselect() after lm3s_gpiowrite()");
}
+#ifdef CONFIG_NX_LCDDRIVER
+ else if (devid == SPIDEV_DISPLAY)
+ {
+ /* Assert the CS pin to the display */
+
+ lm3s_gpiowrite(OLEDCS_GPIO, !selected);
+ }
+#endif
+ ssi_dumpgpio("lm3s_spiselect() Exit");
}
uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
|