diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-11-15 02:25:06 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-11-15 02:25:06 +0000 |
| commit | d58517b1ba80c3121b7f0c1689069e6f7c2d6c63 (patch) | |
| tree | 877f21a77f438bf7658b0524be9427c72d1a6762 | |
| parent | c2111d312b08f0f2d92359f49ea6d9fa0c45c5d0 (diff) | |
| download | px4-nuttx-d58517b1ba80c3121b7f0c1689069e6f7c2d6c63.tar.gz px4-nuttx-d58517b1ba80c3121b7f0c1689069e6f7c2d6c63.tar.bz2 px4-nuttx-d58517b1ba80c3121b7f0c1689069e6f7c2d6c63.zip | |
Fix compile errors with debug on
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3111 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 6 | ||||
| -rwxr-xr-x | nuttx/configs/olimex-lpc1766stk/nettest/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/lib/lib_fopen.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 5e3ba537e..dd37c560f 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -1970,8 +1970,8 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) #endif ndbg("%dBase-T %s duplex\n", - priv->lp_mode & LPC17_SPEED_MASK == LPC17_SPEED_100 ? 100 : 10, - priv->lp_mode & LPC17_DUPLEX_MASK == LPC17_DUPLEX_FULL ?"full" : "half"); + (priv->lp_mode & LPC17_SPEED_MASK) == LPC17_SPEED_100 ? 100 : 10, + (priv->lp_mode & LPC17_DUPLEX_MASK) == LPC17_DUPLEX_FULL ?"full" : "half"); /* Disable auto-configuration. Set the fixed speed/duplex mode. * (probably more than little redundant). @@ -2281,7 +2281,7 @@ static inline int lpc17_ethinitialize(int intf) int ret; int i; - DEBUGASSERT(inf < LPC17_NETHCONTROLLERS); + DEBUGASSERT(intf < LPC17_NETHCONTROLLERS); priv = &g_ethdrvr[intf]; /* Turn on the ethernet MAC clock */ diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index d546f7c0d..25322b279 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -204,7 +204,7 @@ CONFIG_PHY_KS8721=y CONFIG_PHY_AUTONEG=y CONFIG_PHY_SPEED100=n CONFIG_PHY_FDUPLEX=y - +CONFIG_NET_REGDEBUG=n # # General build options # diff --git a/nuttx/lib/lib_fopen.c b/nuttx/lib/lib_fopen.c index 0bfb275b8..6502f0ee4 100644 --- a/nuttx/lib/lib_fopen.c +++ b/nuttx/lib/lib_fopen.c @@ -137,7 +137,7 @@ FAR struct file_struct *lib_fdopen(int fd, FAR const char *mode, FAR struct filelist *flist, FAR struct streamlist *slist) { - FAR struct inode *inode = flist; + FAR struct inode *inode; FAR FILE *stream; int oflags = lib_mode2oflags(mode); int err = OK; |