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 dbc5f910fc
commit 6df1d2823f
2 changed files with 16 additions and 13 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 else
#endif #endif
#ifdef CONFIG_NET_ARP #ifdef CONFIG_NET_ARP
else if (BUF->type == HTONS(ETHTYPE_ARP)) if (BUF->type == HTONS(ETHTYPE_ARP))
{ {
arp_arpin(dev); 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 BASE_ADDR_WDOG 0xfffff800
#define WDOG_REG(m) (BASE_ADDR_WDOG + m) #define WDOG_REG(m) (BASE_ADDR_WDOG + m)
enum wdog_reg { enum wdog_reg
WD_CNTL_TIMER = CNTL_TIMER, {
WD_LOAD_TIMER = LOAD_TIMER, WD_CNTL_TIMER = CNTL_TIMER,
WD_READ_TIMER = 0x02, WD_LOAD_TIMER = LOAD_TIMER,
WD_MODE = 0x04, WD_READ_TIMER = 0x02,
WD_MODE = 0x04,
}; };
enum wdog_ctl { enum wdog_ctl
WD_CTL_START = (1 << 7), {
WD_CTL_AUTO_RELOAD = (1 << 8) WD_CTL_START = (1 << 7),
WD_CTL_AUTO_RELOAD = (1 << 8)
}; };
enum wdog_mode { enum wdog_mode
WD_MODE_DIS_ARM = 0xF5, {
WD_MODE_DIS_CONFIRM = 0xA0, WD_MODE_DIS_ARM = 0xF5,
WD_MODE_ENABLE = (1 << 15) WD_MODE_DIS_CONFIRM = 0xA0,
WD_MODE_ENABLE = (1 << 15)
}; };
#define WD_CTL_PRESCALE(value) (((value)&0x07) << 9) #define WD_CTL_PRESCALE(value) (((value)&0x07) << 9)