diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 16:20:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-27 16:20:32 +0000 |
| commit | bef5049f0198760cc241a0ef137e6c39e3edff8c (patch) | |
| tree | 03464240a7be9d5267d39886c5195503aa49089b /nuttx/configs/stm3240g-eval/src/up_lcd.c | |
| parent | e75166dbfc512e9c8d2fc717229ab3f20e45f73a (diff) | |
| download | px4-nuttx-bef5049f0198760cc241a0ef137e6c39e3edff8c.tar.gz px4-nuttx-bef5049f0198760cc241a0ef137e6c39e3edff8c.tar.bz2 px4-nuttx-bef5049f0198760cc241a0ef137e6c39e3edff8c.zip | |
Add NxConsole configuration for the STM3240G-EVAL board
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4664 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3240g-eval/src/up_lcd.c')
| -rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_lcd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/configs/stm3240g-eval/src/up_lcd.c b/nuttx/configs/stm3240g-eval/src/up_lcd.c index 19c80e62b..c77af6ac0 100644 --- a/nuttx/configs/stm3240g-eval/src/up_lcd.c +++ b/nuttx/configs/stm3240g-eval/src/up_lcd.c @@ -311,9 +311,7 @@ static void stm3240g_writereg(uint8_t regaddr, uint16_t regval); static uint16_t stm3240g_readreg(uint8_t regaddr); static inline void stm3240g_gramselect(void); static inline void stm3240g_writegram(uint16_t rgbval); -static void stm3240g_readsetup(FAR uint16_t *accum); static void stm3240g_readnosetup(FAR uint16_t *accum); -static uint16_t stm3240g_readshift(FAR uint16_t *accum); static uint16_t stm3240g_readnoshift(FAR uint16_t *accum); static void stm3240g_setcursor(uint16_t col, uint16_t row); @@ -1015,7 +1013,7 @@ static inline void stm3240g_lcdinitialize(void) stm3240g_writereg(LCD_REG_3, 0x1018); stm3240g_writereg(LCD_REG_7, 0); /* Display off */ - } + } else #endif #if !defined(CONFIG_STM32_ILI9325_DISABLE) @@ -1105,10 +1103,12 @@ static inline void stm3240g_lcdinitialize(void) stm3240g_writereg(LCD_REG_3, 0x1018); stm3240g_writereg(LCD_REG_7, 0x0); /* display off */ - -#else - lcddbg("Unsupported LCD type\n"); + } + else #endif + { + lcddbg("Unsupported LCD type\n"); + } } /************************************************************************************** |