summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/ChangeLog5
-rw-r--r--nuttx/Documentation/NuttX.html5
-rw-r--r--nuttx/TODO10
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/README.txt11
-rw-r--r--nuttx/net/send.c4
5 files changed, 27 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 63cb6efe5..c0bae9e06 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1569,4 +1569,7 @@
* arch/arm/src/stm32/stm32_gpio.c and stm32_internal.h -- Fixed
PullUp/Down Input Configuration.
* arch/arm/src/lpc17xx/lpc17_serial.h -- Now supports Auto-RTS and
- Auto-CTS modes. This is needed to support SLIP. \ No newline at end of file
+ Auto-CTS modes. This is needed to support SLIP.
+ * drivers/net/slip.c -- SLIP is now basically functional on the
+ LPC17xx with some caveats as described in the TODO list under
+ LPC17xx.
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 020cec2cd..a7d66da8c 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/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: March 14, 2011</p>
+ <p>Last Updated: March 15, 2011</p>
</td>
</tr>
</table>
@@ -2197,6 +2197,9 @@ nuttx-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
PullUp/Down Input Configuration.
* arch/arm/src/lpc17xx/lpc17_serial.h -- Now supports Auto-RTS and
Auto-CTS modes. This is needed to support SLIP.
+ * drivers/net/slip.c -- SLIP is now basically functional on the
+ LPC17xx with some caveats as described in the TODO list under
+ LPC17xx.
apps-5.20 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/TODO b/nuttx/TODO
index 54ac726e4..815a3e301 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -24,7 +24,7 @@ NuttX TODO List (Last updated March 15, 2011)
(1) ARM/C5471 (arch/arm/src/c5471/)
(3) ARM/DM320 (arch/arm/src/dm320/)
(2) ARM/i.MX (arch/arm/src/imx/)
- (3) ARM/LPC17xx (arch/arm/src/lpc17xx/)
+ (4) ARM/LPC17xx (arch/arm/src/lpc17xx/)
(7) ARM/LPC214x (arch/arm/src/lpc214x/)
(2) ARM/LPC313x (arch/arm/src/lpc313x/)
(3) ARM/STR71x (arch/arm/src/str71x/)
@@ -779,6 +779,14 @@ o ARM/LPC17xx (arch/arm/src/lpc17xx/)
Status: Open
Priority: Medium-Low (unless you need the display on the LPC1766STK!)
+ Description: SLIP (Configuration olimex-lpc1766stk/slip-httpd) only works with VERBOSE
+ debug disabled. For some reason, certain debug statements hang(?).
+ Also, this example does not use UART1's hardware flow control. UART1
+ hardware flow control is partially implemented but does not behave as
+ expected. It needs a little more work.
+ Status: Open
+ Priority: Low
+
o ARM/LPC214x (arch/arm/src/lpc214x/)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index a2223206a..7367abff9 100755
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -838,11 +838,18 @@ Where <subdir> is one of the following:
$ tcpdump -n -nn -i sl0 -x -X -s 1500
- NOTES: Only UART1 supports the hardware handshake. If hardware
+ NOTE: Only UART1 supports the hardware handshake. If hardware
handshake is not available, then you might try the slattach option
-L which is supposed to enable "3-wire operation."
- thttpd:
+ NOTE: This configurat only works with VERBOSE debug disabled. For some
+ reason, certain debug statements hang(?).
+
+ NOTE: This example does not use UART1's hardware flow control. UART1
+ hardware flow control is partially implemented but does not behave as
+ expected. It needs a little more work.
+
+ thttpd:
This builds the THTTPD web server example using the THTTPD and
the examples/thttpd application.
diff --git a/nuttx/net/send.c b/nuttx/net/send.c
index b1583f5b3..1b4407db1 100644
--- a/nuttx/net/send.c
+++ b/nuttx/net/send.c
@@ -277,8 +277,7 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn,
* should already be in the ARP table.
*/
-#ifdef CONFIG_NET_ETHERNET
-#ifndef CONFIG_NET_ARP_IPIN
+#if defined(CONFIG_NET_ETHERNET) && defined (CONFIG_NET_ARP_IPIN)
if (pstate->snd_sent != 0 || uip_arp_find(conn->ripaddr) != NULL)
#endif
{
@@ -294,7 +293,6 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn,
pstate->snd_time = g_system_timer;
#endif
}
-#endif /* CONFIG_NET_ETHERNET */
}
/* All data has been send and we are just waiting for ACK or re-transmit