diff --git a/ChangeLog b/ChangeLog
index f0c1057889db8a1ca64b90269998c53961955b2e..6c138a9f1b14b1e077228092a155a1fffc1bbdc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -848,3 +848,11 @@
argument to macro caused strcasecmp() and strncasecmp() to fail.
* lib/lib_strstr.c: Length of substring off by one causes false alarm
sub-string matches.
+ * arch/arm/src/lm3s/lm3s_ethernet.c: Fix errors in LMS6918 FIFO length
+ handling. (1) The incorrect size of the ethernet header was being
+ subtracted on outgoing messages (4 vs 14), which caused outgoing messages to
+ be a little too long. (2) The size of incoming FIFO messages is 6 bytes
+ larger than it expected (2 for the length and 4 for the FCS). The unhandled
+ extra two bytes of length cause the driver to sometimes read one too many
+ words from the received FIFO (corrupting the next queued receive packet,
+ if any).
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index cbaec7977287ef023264d2c180bc10b980bbae3d..2223e362c8c218866aa29ed8174dd8c249d40b54 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: August 15, 2009</p>
+ <p>Last Updated: September 09, 2009</p>
</td>
</tr>
</table>
@@ -1509,6 +1509,14 @@ nuttx-0.4.11 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
argument to macro caused strcasecmp() and strncasecmp() to fail.
* lib/lib_strstr.c: Length of substring off by one causes false alarm
sub-string matches.
+ * arch/arm/src/lm3s/lm3s_ethernet.c: Fix errors in LMS6918 FIFO length
+ handling. (1) The incorrect size of the ethernet header was being
+ subtracted on outgoing messages (4 vs 14), which caused outgoing messages to
+ be a little too long. (2) The size of incoming FIFO messages is 6 bytes
+ larger than it expected (2 for the length and 4 for the FCS). The unhandled
+ extra two bytes of length cause the driver to sometimes read one too many
+ words from the received FIFO (corrupting the next queued receive packet,
+ if any).
pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/arch/arm/src/lm3s/lm3s_ethernet.c b/arch/arm/src/lm3s/lm3s_ethernet.c
index d626166b566bc0dd7abf43fd55a7c56380fc3dbd..86052eb510c6b0f4043e2f4cee6a7ef22af21efa 100644
--- a/arch/arm/src/lm3s/lm3s_ethernet.c
+++ b/arch/arm/src/lm3s/lm3s_ethernet.c
@@ -127,6 +127,14 @@
#define LM3S_RCTCL_SETBITS (LM3S_AMUL_SETBITS|LM3S_PRMS_SETBITS|LM3S_BADCRC_SETBITS)
#define LM3S_RCTCL_CLRBITS (LM3S_AMUL_CLRBITS|LM3S_PRMS_CLRBITS|LM3S_BADCRC_CLRBITS)
+/* CONFIG_LM3S_DUMPPACKET will dump the contents of each packet to the console. */
+
+#ifdef CONFIG_LM3S_DUMPPACKET
+# define lm3s_dumppacket(m,a,n) lib_dumpbuffer(m,a,n)
+#else
+# define lm3s_dumppacket(m,a,n)
+#endif
+
/* TX poll deley = 1 seconds. CLK_TCK is the number of clock ticks per second */
#define LM3S_WDDELAY (1*CLK_TCK)
@@ -483,6 +491,7 @@ static int lm3s_transmit(struct lm3s_driver_s *priv)
/* Increment statistics */
EMAC_STAT(priv, tx_packets);
+ lm3s_dumppacket("Transmit packet", priv->ld_dev.d_buf, priv->ld_dev.d_len);
/* Transfer the packet into the Tx FIFO. The LS 16-bits of the first
* 32-bit word written to the Tx FIFO contains the Ethernet payload
@@ -495,7 +504,7 @@ static int lm3s_transmit(struct lm3s_driver_s *priv)
DEBUGASSERT(pktlen > UIP_LLH_LEN);
dbuf = priv->ld_dev.d_buf;
- regval = (uint32)(pktlen - 4);
+ regval = (uint32)(pktlen - 14);
regval |= ((uint32)(*dbuf++) << 16);
regval |= ((uint32)(*dbuf++) << 24);
lm3s_ethout(priv, LM3S_MAC_DATA_OFFSET, regval);
@@ -639,7 +648,8 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
* word from the FIFO followed by the Ethernet header beginning
* in the MS 16-bits of the first word.
*
- * Pick off the packet length from the first word.
+ * Pick off the packet length from the first word. This packet length
+ * includes the len/type field (size 2) and the FCS (size 4).
*/
regval = lm3s_ethin(priv, LM3S_MAC_DATA_OFFSET);
@@ -660,11 +670,11 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
ndbg("Bad packet size dropped (%d)\n", pktlen);
EMAC_STAT(priv, rx_pktsize);
- /* This is the number of bytes and words left to read (including,
- * the final, possibly partial word).
+ /* The number of bytes and words left to read is pktlen - 4 (including,
+ * the final, possibly partial word) because we've already read 4 bytes.
*/
- wordlen = (pktlen + 1) >> 4;
+ wordlen = (pktlen - 1) >> 2;
/* Read and discard the remaining words in the FIFO */
@@ -683,9 +693,12 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
*dbuf++ = (ubyte)((regval >> 16) & 0xff);
*dbuf++ = (ubyte)((regval >> 24) & 0xff);
- /* Read all of the whole, 32-bit values in the middle of the packet */
+ /* Read all of the whole, 32-bit values in the middle of the packet.
+ * We've already read the length (2 bytes) plus the first two bytes
+ * of data
+ */
- for (bytesleft = pktlen - 2; bytesleft > 3; bytesleft -= 4, dbuf += 4)
+ for (bytesleft = pktlen - 4; bytesleft > 3; bytesleft -= 4, dbuf += 4)
{
/* Transfer a whole word to the user buffer. Note, the user
* buffer may be un-aligned.
@@ -717,9 +730,13 @@ static void lm3s_receive(struct lm3s_driver_s *priv)
}
}
- /* Pass the packet length to uIP */
+ lm3s_dumppacket("Received packet", priv->ld_dev.d_buf, pktlen);
+
+ /* Pass the packet length to uIP MINUS 2 bytes for the length and
+ * 4 bytes for the FCS.
+ */
- priv->ld_dev.d_len = pktlen;
+ priv->ld_dev.d_len = pktlen - 6;
/* We only accept IP packets of the configured type and ARP packets */
@@ -916,7 +933,7 @@ static void lm3s_txtimeout(int argc, uint32 arg, ...)
{
struct lm3s_driver_s *priv = (struct lm3s_driver_s *)arg;
- /* Increment statistics and dump debug info */
+ /* Increment statistics */
ndbg("Tx timeout\n");
EMAC_STAT(priv, tx_timeouts);
diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt
index 32bcd2bfd587d9441ccac8fced3e6d138e201ed4..4f992935c1266f228977735c913cebea2e845519 100644
--- a/configs/eagle100/README.txt
+++ b/configs/eagle100/README.txt
@@ -287,6 +287,7 @@ Eagle100-specific Configuration Options
CONFIG_LM3S_MULTICAST - Set to enable multicast frames
CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+ CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
Configurations
^^^^^^^^^^^^^^
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index d8fc5aa70cbe7f2ea140f0af1554a8880ce0a131..fa0320ebbebd33037791e718b31cfd469db0e4f5 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=y
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index c4a90ca94392464b43ec3e503d201ddf0a926ba3..ba0d5456dcd6bbbc264313ead9315c623c773734 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=y
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 1fad6d0be02a18f7198d1bea7a59ae620de201bd..c11a7a1dc8d53fd95baa3a2903af01b1127c5150 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=n
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index e76b7feeed9842d0413b40deb0c9c9f31b82ddf5..4c918349f6ba922a378a4a977873f5376ffee5d8 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=n
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 1a20946c46e44b89d37cd8ea12a2283b0269a430..c64832451007cbd4f2733e02bd1a425cf6fd2bdb 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=n
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index b369e70b03a93c6fc7a47b82cc0aa2eb6b0184e7..f1036fa360dee2ff1f7d5ee208372e5fe5b1760d 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -152,6 +152,7 @@ CONFIG_SSI_POLLWAIT=y
# CONFIG_LM3S_MULTICAST - Set to enable multicast frames
# CONFIG_LM3S_PROMISCUOUS - Set to enable promiscuous mode
# CONFIG_LM3S_BADCRC - Set to enable bad CRC rejection.
+# CONFIG_LM3S_DUMPPACKET - Dump each packet received/sent to the console.
#
CONFIG_LM3S_ETHERNET=y
CONFIG_LM3S_ETHLEDS=n
@@ -162,6 +163,7 @@ CONFIG_LM3S_ETHNOPAD=n
CONFIG_LM3S_MULTICAST=n
CONFIG_LM3S_PROMISCUOUS=n
CONFIG_LM3S_BADCRC=n
+CONFIG_LM3S_DUMPPACKET=n
#
# General build options