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

Fix misc. compilation error/warning detected by tools/testbuild.sh

Browse Source
This commit is contained in:
Gregory Nutt 2015-07-01 14:33:37 -06:00
parent 8c5bae60d9
commit 09c7373f24
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/c5471/c5471_ethernet.c
View File

@ -1349,7 +1349,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
else
#endif
#ifdef CONFIG_NET_ARP
else if (BUF->type == HTONS(ETHTYPE_ARP))
if (BUF->type == HTONS(ETHTYPE_ARP))
{
arp_arpin(dev);

27
arch/arm/src/calypso/calypso_timer.c
View File

@ -116,22 +116,25 @@ uint16_t hwtimer_read(int num)
#define BASE_ADDR_WDOG 0xfffff800
#define WDOG_REG(m) (BASE_ADDR_WDOG + m)
enum wdog_reg {
WD_CNTL_TIMER = CNTL_TIMER,
WD_LOAD_TIMER = LOAD_TIMER,
WD_READ_TIMER = 0x02,
WD_MODE = 0x04,
enum wdog_reg
{
WD_CNTL_TIMER = CNTL_TIMER,
WD_LOAD_TIMER = LOAD_TIMER,
WD_READ_TIMER = 0x02,
WD_MODE = 0x04,
};
enum wdog_ctl {
WD_CTL_START = (1 << 7),
WD_CTL_AUTO_RELOAD = (1 << 8)
enum wdog_ctl
{
WD_CTL_START = (1 << 7),
WD_CTL_AUTO_RELOAD = (1 << 8)
};
enum wdog_mode {
WD_MODE_DIS_ARM = 0xF5,
WD_MODE_DIS_CONFIRM = 0xA0,
WD_MODE_ENABLE = (1 << 15)
enum wdog_mode
{
WD_MODE_DIS_ARM = 0xF5,
WD_MODE_DIS_CONFIRM = 0xA0,
WD_MODE_ENABLE = (1 << 15)
};
#define WD_CTL_PRESCALE(value) (((value)&0x07) << 9)

3
drivers/net/enc28j60.c
View File

@ -1929,6 +1929,7 @@ static void enc_toworker(FAR void *arg)
DEBUGASSERT(ret == OK);
ret = enc_ifup(&priv->dev);
DEBUGASSERT(ret == OK);
UNUSED(ret);
/* Then poll uIP for new XMIT data */
@ -1977,6 +1978,7 @@ static void enc_txtimeout(int argc, uint32_t arg, ...)
ret = work_queue(HPWORK, &priv->towork, enc_toworker, (FAR void *)priv, 0);
DEBUGASSERT(ret == OK);
UNUSED(ret);
}
/****************************************************************************
@ -2071,6 +2073,7 @@ static void enc_polltimer(int argc, uint32_t arg, ...)
ret = work_queue(HPWORK, &priv->pollwork, enc_pollworker, (FAR void *)priv, 0);
DEBUGASSERT(ret == OK);
UNUSED(ret);
}
/****************************************************************************

3
include/nuttx/nx/nxmu.h
View File

@ -49,6 +49,8 @@
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NX_MULTIUSER
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -565,4 +567,5 @@ int nxmu_sendwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
}
#endif
#endif /* CONFIG_NX_MULTIUSER */
#endif /* __INCLUDE_NUTTX_NX_NXMU_H */

2
net/iob/iob_alloc.c
View File

@ -88,7 +88,7 @@ static FAR struct iob_s *iob_allocwait(bool throttled)
FAR struct iob_s *iob;
irqstate_t flags;
FAR sem_t *sem;
int ret;
int ret = OK;
#if CONFIG_IOB_THROTTLE > 0
/* Select the semaphore count to check. */

2
net/iob/iob_alloc_qentry.c
View File

@ -90,7 +90,7 @@ static FAR struct iob_qentry_s *iob_allocwait_qentry(void)
{
FAR struct iob_qentry_s *qentry;
irqstate_t flags;
int ret;
int ret = OK;
/* The following must be atomic; interrupt must be disabled so that there
* is no conflict with interrupt level I/O buffer chain container