sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5 LCDC: Fix a few compilation errors that show up when additional layers are enabled

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-09 18:46:05 -06:00
parent b7f4a51ee2
commit e4e4912712
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/sama5/sam_lcd.c
View File

@ -2752,15 +2752,17 @@ static void sam_show_base(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_FB_HWCURSOR #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 */ /* Enable default transparent keying */
sam_putreg(SAM_LCDC_HCRCFG7, 0x00000000); sam_putreg(SAM_LCDC_HCRCFG7, 0x00000000);
sam_putreg(SAM_LCDC_HCRCFG8, 0xffffffff); sam_putreg(SAM_LCDC_HCRCFG8, 0xffffffff);
regval = sam_getreg(SAM_LCDC_HCRCFG9); regval = sam_getreg(SAM_LCDC_HCRCFG9);
regval |= LCDC_HCRCFG9_CRKEY); regval |= LCDC_HCRCFG9_CRKEY;
sam_putreg(SAM_LCDC_HCRCFG9, regval); sam_putreg(SAM_LCDC_HCRCFG9, regval);
/* And show the hardware cursor layer */ /* 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) int up_fbinitialize(void)
{ {
#if defined(CONFIG_SAMA5_LCDC_OVR1) && defined(CONFIG_SAMA5_LCDC_HEO)
uint32_t regval;
#endif
int ret; int ret;
gvdbg("Entry\n"); gvdbg("Entry\n");