diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-28 13:17:22 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-28 13:17:22 +0000 |
| commit | 4bba15ad8191e09bf02c89e8b99fda015eecd57b (patch) | |
| tree | 9e4ea042820e45f73840b75cebb6eefaa664b59d /nuttx | |
| parent | fbfbb294a4755134bf197592af2c97468960df5d (diff) | |
| download | px4-firmware-4bba15ad8191e09bf02c89e8b99fda015eecd57b.tar.gz px4-firmware-4bba15ad8191e09bf02c89e8b99fda015eecd57b.tar.bz2 px4-firmware-4bba15ad8191e09bf02c89e8b99fda015eecd57b.zip | |
SSD1289 fixes
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4776 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_ssd1289.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/lcd/ssd1289.c | 2 |
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 |