summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-28 13:17:22 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-28 13:17:22 +0000
commit468a080619ed5c3efd1ad29a72bdf8ed48cbc92d (patch)
tree9e4ea042820e45f73840b75cebb6eefaa664b59d
parent22f5d323fa5ffcea62a3fd3658ae1412c0f7445a (diff)
downloadpx4-nuttx-468a080619ed5c3efd1ad29a72bdf8ed48cbc92d.tar.gz
px4-nuttx-468a080619ed5c3efd1ad29a72bdf8ed48cbc92d.tar.bz2
px4-nuttx-468a080619ed5c3efd1ad29a72bdf8ed48cbc92d.zip
SSD1289 fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4776 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/configs/stm32f4discovery/src/up_ssd1289.c2
-rw-r--r--nuttx/drivers/lcd/ssd1289.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
index d7f949557..50086205c 100644
--- a/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
+++ b/nuttx/configs/stm32f4discovery/src/up_ssd1289.c
@@ -184,7 +184,7 @@ static const uint32_t g_lcdconfig[] =
{
/* PC6(RESET), FSMC_A16, FSMC_NOE, FSMC_NWE, and FSMC_NE1 */
- GPIO_LCD_RESET, GPIO_FSMC_A16, GPIO_FSMC_NOE, GPIO_FSMC_NWE, GPIO_FSMC_NE3
+ GPIO_LCD_RESET, GPIO_FSMC_A16, GPIO_FSMC_NOE, GPIO_FSMC_NWE, GPIO_FSMC_NE1
};
#define NLCD_CONFIG (sizeof(g_lcdconfig)/sizeof(uint32_t))
diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c
index 5891c6577..5833ff145 100644
--- a/nuttx/drivers/lcd/ssd1289.c
+++ b/nuttx/drivers/lcd/ssd1289.c
@@ -890,7 +890,7 @@ static inline void ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
ssd1289_putreg(lcd, SSD1289_DSPCTRL,
(SSD1289_DSPCTRL_ON | SSD1289_DSPCTRL_DTE |
- SSD1289_DSPCTRL_GON | define SSD1289_DSPCTRL_VLE(0)));
+ SSD1289_DSPCTRL_GON | SSD1289_DSPCTRL_VLE(0)));
#endif
/* Set up power control registers. There is a lot of variability