diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-08 17:12:12 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-08 17:12:12 +0000 |
| commit | c7bd005fd19b6ab3d548613495f6f5a0a955387f (patch) | |
| tree | eae4685c1e7087249186ad116647ad108c2fa8b4 | |
| parent | 615e22af65c7efb223ba973c1b5aeaacdf5e7cdb (diff) | |
| download | nuttx-c7bd005fd19b6ab3d548613495f6f5a0a955387f.tar.gz nuttx-c7bd005fd19b6ab3d548613495f6f5a0a955387f.tar.bz2 nuttx-c7bd005fd19b6ab3d548613495f6f5a0a955387f.zip | |
Doc/comments update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@380 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 6 | ||||
| -rw-r--r-- | nuttx/net/uip/uip-tcpcallback.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index e71872221..3f67662f9 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: November 6, 2007</p> + <p>Last Updated: November 8, 2007</p> </td> </tr> </table> @@ -355,11 +355,11 @@ is available that be used to build a NuttX-compatible arm-elf toolchain.</blockq </pre> <p><b>DM320 (ARM9)</b> This build for the ARM9 target includes a signficant subset of OS - features, ethernet driver and full TCP/IP stack (via uIP). + features, ethernet driver and full TCP/IP stack (via uIP). (11/8/07) </p> <pre> text data bss dec hex filename - 51368 296 6072 57736 e188 nuttx + 49472 296 3972 53740 d1ec nuttx </pre> <p><b>87C52</b> A reduced functionality OS test for the 8052 target requires only diff --git a/nuttx/net/uip/uip-tcpcallback.c b/nuttx/net/uip/uip-tcpcallback.c index 524b70084..72fae7736 100644 --- a/nuttx/net/uip/uip-tcpcallback.c +++ b/nuttx/net/uip/uip-tcpcallback.c @@ -75,6 +75,10 @@ uint8 uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn, uint8 flags) { + /* Preserve the UIP_ACKDATA & UIP_NEWDATA in the response. These are + * needed by uIP to handle ACKing and buffer state. + */ + uint8 ret = flags & (UIP_ACKDATA|UIP_NEWDATA); vdbg("flags: %02x\n", flags); @@ -83,7 +87,11 @@ uint8 uip_tcpcallback(struct uip_driver_s *dev, struct uip_conn *conn, uint8 fla if (conn->data_event) { - /* Perform the callback */ + /* Perform the callback. Callback function may return on of: + * UIP_CLOSE - Gracefully close the current connection + * UIP_ABORT - Abort (reset) the current connection on an error that + * prevents UIP_CLOSE from working. + */ ret |= conn->data_event(dev, conn, flags); } |