OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some compile problems found in build testing.

This commit is contained in:
Gregory Nutt 2017-08-12 14:28:27 -06:00
parent 8222156b25
commit 4fa6106b57
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,6 +820,7 @@ static const uintptr_t g_layerenable[LCDC_NLAYERS] =
#endif #endif
}; };
#if 0 /* Not used */
static const uintptr_t g_layerdisable[LCDC_NLAYERS] = static const uintptr_t g_layerdisable[LCDC_NLAYERS] =
{ {
SAM_LCDC_BASECHDR, SAM_LCDC_BASECHDR,
@ -830,7 +831,9 @@ static const uintptr_t g_layerdisable[LCDC_NLAYERS] =
, SAM_LCDC_HCRCHDR , SAM_LCDC_HCRCHDR
#endif #endif
}; };
#endif
#if 0 /* #if defined(SAMA5_HAVE_POSITION) && defined(SAMA5_HAVE_SIZE) -- not used */
static const uintptr_t g_layerstatus[LCDC_NLAYERS] = static const uintptr_t g_layerstatus[LCDC_NLAYERS] =
{ {
SAM_LCDC_BASECHSR, SAM_LCDC_BASECHSR,
@ -841,6 +844,7 @@ static const uintptr_t g_layerstatus[LCDC_NLAYERS] =
, SAM_LCDC_HCRCHSR , SAM_LCDC_HCRCHSR
#endif #endif
}; };
#endif
static const uintptr_t g_layerblend[LCDC_NLAYERS] = static const uintptr_t g_layerblend[LCDC_NLAYERS] =
{ {
@ -908,6 +912,7 @@ static const uintptr_t g_layercfg[LCDC_NLAYERS] =
#endif #endif
}; };
#if 0 /* Not used */
static const uintptr_t g_layercolor[LCDC_NLAYERS] = static const uintptr_t g_layercolor[LCDC_NLAYERS] =
{ {
SAM_LCDC_BASECFG1, SAM_LCDC_BASECFG1,
@ -918,6 +923,7 @@ static const uintptr_t g_layercolor[LCDC_NLAYERS] =
, SAM_LCDC_HCRCFG1 , SAM_LCDC_HCRCFG1
#endif #endif
}; };
#endif
#ifdef SAMA5_HAVE_POSITION #ifdef SAMA5_HAVE_POSITION
static const uintptr_t g_layerpos[LCDC_NLAYERS] = static const uintptr_t g_layerpos[LCDC_NLAYERS] =

2
arch/arm/src/sama5/sam_ohci.c
View File

@ -1374,7 +1374,7 @@ static inline int sam_reminted(struct sam_ed_s *ed)
/* Save the new minimum interval */ /* Save the new minimum interval */
if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN) if ((ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN)
{ {
g_ohci.ininterval = interval; g_ohci.ininterval = interval;
} }

2
drivers/wireless/cc3000/cc3000.c
View File

@ -1648,7 +1648,7 @@ static int cc3000_wait_data(FAR struct cc3000_dev_s *priv, int sockfd)
cc3000_devtake(priv); cc3000_devtake(priv);
sched_unlock(); sched_unlock();
if (!priv->sockets[s].sd == sockfd) if (priv->sockets[s].sd != sockfd)
{ {
return -1; return -1;
} }