diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-09 18:46:05 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-09 18:46:05 -0600 |
| commit | fd2bf076d015face6d77dc9e12d5b1e9c2402c60 (patch) | |
| tree | 54e0a46996a6e86fbc5523fb9071b86ed600ecc1 | |
| parent | 75e0cdbb60823e57a39005d011dbabe9290bc4da (diff) | |
| download | nuttx-fd2bf076d015face6d77dc9e12d5b1e9c2402c60.tar.gz nuttx-fd2bf076d015face6d77dc9e12d5b1e9c2402c60.tar.bz2 nuttx-fd2bf076d015face6d77dc9e12d5b1e9c2402c60.zip | |
SAMA5 LCDC: Fix a few compilation errors that show up when additional layers are enabled
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_lcd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_lcd.c b/nuttx/arch/arm/src/sama5/sam_lcd.c index e027b2096..ae3094740 100644 --- a/nuttx/arch/arm/src/sama5/sam_lcd.c +++ b/nuttx/arch/arm/src/sama5/sam_lcd.c @@ -2752,15 +2752,17 @@ static void sam_show_base(void) ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static void sam_show_hcr(uint32_t x, uint32_t y) +static void sam_show_hcr(void) { + uint32_t regval; + /* Enable default transparent keying */ sam_putreg(SAM_LCDC_HCRCFG7, 0x00000000); sam_putreg(SAM_LCDC_HCRCFG8, 0xffffffff); regval = sam_getreg(SAM_LCDC_HCRCFG9); - regval |= LCDC_HCRCFG9_CRKEY); + regval |= LCDC_HCRCFG9_CRKEY; sam_putreg(SAM_LCDC_HCRCFG9, regval); /* And show the hardware cursor layer */ @@ -2787,6 +2789,9 @@ static void sam_show_hcr(uint32_t x, uint32_t y) int up_fbinitialize(void) { +#if defined(CONFIG_SAMA5_LCDC_OVR1) && defined(CONFIG_SAMA5_LCDC_HEO) + uint32_t regval; +#endif int ret; gvdbg("Entry\n"); |