Removed (after checking back with Adam Dunkels) the compile-time optimizations for UIP_BUFSIZE < 256 for all targets but the msp430 which actually is configured to have a smaller buffer.
diff --git a/contiki-gb/uip/uip_arch.c b/contiki-gb/uip/uip_arch.c
index c15ad6a..46f5a8e 100644
--- a/contiki-gb/uip/uip_arch.c
+++ b/contiki-gb/uip/uip_arch.c
@@ -31,7 +31,7 @@
*
* This file is part of the uIP TCP/IP stack.
*
- * $Id: uip_arch.c,v 1.1 2003/05/19 08:21:05 gpz Exp $
+ * $Id: uip_arch.c,v 1.2 2005/01/26 23:36:29 oliverschmidt Exp $
*
*/
@@ -43,8 +43,6 @@
#define IP_PROTO_TCP 6
/*-----------------------------------------------------------------------------------*/
-#if UIP_BUFSIZE > 255
-/*-----------------------------------------------------------------------------------*/
void
uip_add_rcv_nxt(u16_t n)
{
@@ -98,43 +96,6 @@
}
}
/*-----------------------------------------------------------------------------------*/
-#else /* UIP_BUFSIZE > 255 */
-/*-----------------------------------------------------------------------------------*/
-void
-uip_add_rcv_nxt(u8_t n)
-{
- uip_conn->rcv_nxt[3] += n;
- if(uip_conn->rcv_nxt[3] < n) {
- ++uip_conn->rcv_nxt[2];
- if(uip_conn->rcv_nxt[2] == 0) {
- ++uip_conn->rcv_nxt[1];
- if(uip_conn->rcv_nxt[1] == 0) {
- ++uip_conn->rcv_nxt[0];
- }
- }
- }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-uip_add32(u8_t *op32, u8_t op8)
-{
- uip_acc32[3] = op32[3] + op8;
- uip_acc32[2] = op32[2];
- uip_acc32[1] = op32[1];
- uip_acc32[0] = op32[0];
-
- if(uip_acc32[3] < op8) {
- ++uip_acc32[2];
- if(uip_acc32[2] == 0) {
- ++uip_acc32[1];
- if(uip_acc32[1] == 0) {
- ++uip_acc32[0];
- }
- }
- }
-}
-/*-----------------------------------------------------------------------------------*/
-#endif /* UIP_BUFSIZE > 255 */
u16_t
uip_chksum(u16_t *sdata, u16_t len)
{
diff --git a/contiki-gb/uip/uip_arch.h b/contiki-gb/uip/uip_arch.h
index 14338ed..8c5349a 100644
--- a/contiki-gb/uip/uip_arch.h
+++ b/contiki-gb/uip/uip_arch.h
@@ -31,7 +31,7 @@
*
* This file is part of the uIP TCP/IP stack.
*
- * $Id: uip_arch.h,v 1.1 2003/05/19 08:21:07 gpz Exp $
+ * $Id: uip_arch.h,v 1.2 2005/01/26 23:36:36 oliverschmidt Exp $
*
*/
@@ -40,14 +40,8 @@
#include "uip.h"
-#if UIP_BUFSIZE > 255
void uip_add_rcv_nxt(u16_t n);
void uip_add32(u8_t *op32, u16_t op16);
-#else
-void uip_add_rcv_nxt(u8_t n);
-void uip_add32(u8_t *op32, u8_t op8);
-#endif /* UIP_BUFSIZE > 255 */
-
u16_t uip_chksum(u16_t *data, u16_t len);
u16_t uip_ipchksum(void);
u16_t uip_tcpchksum(void);