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-plus4/uip/uip_arch.c b/contiki-plus4/uip/uip_arch.c
index b43fc26..188da29 100644
--- a/contiki-plus4/uip/uip_arch.c
+++ b/contiki-plus4/uip/uip_arch.c
@@ -28,7 +28,7 @@
*
* This file is part of the uIP TCP/IP stack.
*
- * $Id: uip_arch.c,v 1.3 2004/07/18 13:23:48 oliverschmidt Exp $
+ * $Id: uip_arch.c,v 1.4 2005/01/26 23:36:37 oliverschmidt Exp $
*
*/
@@ -40,8 +40,6 @@
#define IP_PROTO_TCP 6
/*-----------------------------------------------------------------------------------*/
-#if UIP_BUFSIZE > 255
-/*-----------------------------------------------------------------------------------*/
#pragma optimize(push, off)
void
uip_add32(u8_t *op32, u16_t op16)
@@ -72,39 +70,6 @@
}
#pragma optimize(pop)
/*-----------------------------------------------------------------------------------*/
-#else /* UIP_BUFSIZE > 255 */
-/*-----------------------------------------------------------------------------------*/
-#pragma optimize(push, off)
-void
-uip_add32(u8_t *op32, u8_t op8)
-{
- asm("ldy #2");
- asm("jsr ldaxysp");
- asm("sta ptr1");
- asm("stx ptr1+1");
- asm("ldy #0");
- asm("lda (sp),y");
- asm("ldy #3");
- asm("clc");
- asm("adc (ptr1),y");
- asm("sta _uip_acc32+3");
- asm("dey");
- asm("lda (ptr1),y");
- asm("adc #0");
- asm("sta _uip_acc32+2");
- asm("dey");
- asm("lda (ptr1),y");
- asm("adc #0");
- asm("sta _uip_acc32+1");
- asm("dey");
- asm("lda (ptr1),y");
- asm("adc #0");
- asm("sta _uip_acc32+0");
-}
-#pragma optimize(pop)
-/*-----------------------------------------------------------------------------------*/
-#endif /* UIP_BUFSIZE > 255 */
-
static u16_t chksum_ptr, chksum_len, chksum_tmp;
static u16_t chksum(void);
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-plus4/uip/uip_arch.h b/contiki-plus4/uip/uip_arch.h
index 5d21ed9..faa009a 100644
--- a/contiki-plus4/uip/uip_arch.h
+++ b/contiki-plus4/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/04/11 20:30:19 adamdunkels Exp $
+ * $Id: uip_arch.h,v 1.2 2005/01/26 23:36:38 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);