diff options
| -rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_ethernet.c | 5 | ||||
| -rw-r--r-- | nuttx/configs/eagle100/src/up_ethernet.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c index 4445af1937..963705e6ee 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c @@ -580,7 +580,7 @@ static int lm3s_uiptxpoll(struct uip_driver_s *dev) * the field d_len is set to a value > 0. */ - nvdbg("Poll result: d_len=%d\n", priv->dev.d_len); + nvdbg("Poll result: d_len=%d\n", priv->ld_dev.d_len); if (priv->ld_dev.d_len > 0) { /* Send the packet. lm3s_transmit() will return zero if the @@ -769,7 +769,6 @@ static void lm3s_receive(struct lm3s_driver_s *priv) } #endif } - while ( /* FIX ME */ TRUE /* FIX ME */); /* While there are more packets to be processed */ } /**************************************************************************** @@ -1085,7 +1084,7 @@ static int lm3s_ifup(struct uip_driver_s *dev) /* Enable the Ethernet transmitter */ - regval = lm3s_ethin(priv, LM3S_MAC_RCTL_OFFSET); + regval = lm3s_ethin(priv, LM3S_MAC_TCTL_OFFSET); regval |= MAC_TCTL_TXEN; lm3s_ethout(priv, LM3S_MAC_TCTL_OFFSET, regval); diff --git a/nuttx/configs/eagle100/src/up_ethernet.c b/nuttx/configs/eagle100/src/up_ethernet.c index 81c07d021b..d8ee03f8ab 100644 --- a/nuttx/configs/eagle100/src/up_ethernet.c +++ b/nuttx/configs/eagle100/src/up_ethernet.c @@ -41,6 +41,7 @@ #include <nuttx/config.h>
#include <sys/types.h>
+#include <debug.h>
#include <assert.h>
#include <arch/board/board.h>
@@ -81,7 +82,9 @@ void lm3s_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(LM3S_FLASH_USERREG0);
user1 = getreg32(LM3S_FLASH_USERREG1);
- DEBUGASSERT(user0 != 0xffffffff && user1 == 0xffffffff);
+
+ nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+ DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
/* Re-format that MAC address the way that uIP expects to see it */
|