deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed UIP_CONF_PLAIN_BUFFER again now that the pointer indirection to uip_buf was removed again.

Browse source
This commit is contained in:
oliverschmidt 2010-05-30 09:46:12 +00:00
parent f135105567
commit 126ea40994
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/uip.c
View file

@ -41,7 +41,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip.c,v 1.28 2010/05/24 10:07:34 joxe Exp $ * $Id: uip.c,v 1.29 2010/05/30 09:46:12 oliverschmidt Exp $
* *
*/ */
@ -127,11 +127,7 @@ struct uip_eth_addr uip_ethaddr = {{0,0,0,0,0,0}};
#endif #endif
/* The packet buffer that contains incoming packets. */ /* The packet buffer that contains incoming packets. */
#ifdef UIP_CONF_PLAIN_BUFFER
uint8_t uip_buf[UIP_BUFSIZE + 2];
#else /* UIP_CONF_PLAIN_BUFFER */
uip_buf_t uip_aligned_buf; uip_buf_t uip_aligned_buf;
#endif /* UIP_CONF_PLAIN_BUFFER */
void *uip_appdata; /* The uip_appdata pointer points to void *uip_appdata; /* The uip_appdata pointer points to
application data. */ application data. */

6
core/net/uip.h
View file

@ -47,7 +47,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip.h,v 1.33 2010/05/24 10:07:34 joxe Exp $ * $Id: uip.h,v 1.34 2010/05/30 09:46:12 oliverschmidt Exp $
* *
*/ */
@ -482,12 +482,8 @@ typedef union {
uint8_t u8[UIP_BUFSIZE]; uint8_t u8[UIP_BUFSIZE];
} uip_buf_t; } uip_buf_t;
#ifdef UIP_CONF_PLAIN_BUFFER
CCIF extern uint8_t uip_buf[UIP_BUFSIZE+2];
#else /* UIP_CONF_PLAIN_BUFFER */
CCIF extern uip_buf_t uip_aligned_buf; CCIF extern uip_buf_t uip_aligned_buf;
#define uip_buf (uip_aligned_buf.u8) #define uip_buf (uip_aligned_buf.u8)
#endif /* UIP_CONF_PLAIN_BUFFER */
/** @} */ /** @} */

4
cpu/6502/6502def.h
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* @(#)$Id: 6502def.h,v 1.24 2010/05/08 07:25:10 oliverschmidt Exp $ * @(#)$Id: 6502def.h,v 1.25 2010/05/30 09:46:12 oliverschmidt Exp $
*/ */
#ifndef __6502DEF_H__ #ifndef __6502DEF_H__
@ -72,8 +72,6 @@ typedef unsigned short uip_stats_t;
#define LOADER_CONF_ARCH "lib/unload.h" #define LOADER_CONF_ARCH "lib/unload.h"
#define UIP_CONF_PLAIN_BUFFER 1
#if MTU_SIZE #if MTU_SIZE
#define UIP_CONF_BUFFER_SIZE (UIP_LLH_LEN + MTU_SIZE) #define UIP_CONF_BUFFER_SIZE (UIP_LLH_LEN + MTU_SIZE)
#else /* MTU_SIZE */ #else /* MTU_SIZE */