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

Adjusted UIP_CONF_EXTERNAL_BUFFER to apply to actual buffer only.

Browse source
This commit is contained in:
oliverschmidt 2010-05-07 20:45:16 +00:00
parent bc0ea1f81d
commit dec19626e8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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.25 2010/05/05 13:07:45 joxe Exp $ * $Id: uip.c,v 1.26 2010/05/07 20:45:16 oliverschmidt Exp $
* *
*/ */
@ -128,9 +128,10 @@ struct uip_eth_addr uip_ethaddr = {{0,0,0,0,0,0}};
#ifndef UIP_CONF_EXTERNAL_BUFFER #ifndef UIP_CONF_EXTERNAL_BUFFER
static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4]; static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4];
uint8_t * const uip_buf = (uint8_t * const)uip_buf32; /* The packet buffer that contains
incoming packets. */
#endif /* UIP_CONF_EXTERNAL_BUFFER */ #endif /* UIP_CONF_EXTERNAL_BUFFER */
uint8_t * const uip_buf = (uint8_t * const)uip_buf32;
/* The packet buffer that contains
incoming packets. */
void *uip_appdata; /* The uip_appdata pointer points to void *uip_appdata; /* The uip_appdata pointer points to
application data. */ application data. */

7
core/net/uip6.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: uip6.c,v 1.21 2010/05/05 13:07:45 joxe Exp $ * $Id: uip6.c,v 1.22 2010/05/07 20:45:16 oliverschmidt Exp $
* *
*/ */
@ -170,12 +170,11 @@ u8_t uip_ext_opt_offset = 0;
*/ */
/** Packet buffer for incoming and outgoing packets */ /** Packet buffer for incoming and outgoing packets */
#ifndef UIP_CONF_EXTERNAL_BUFFER #ifndef UIP_CONF_EXTERNAL_BUFFER
static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4]; static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4];
uint8_t * const uip_buf = (uint8_t * const) uip_buf32;
#endif /* UIP_CONF_EXTERNAL_BUFFER */ #endif /* UIP_CONF_EXTERNAL_BUFFER */
uint8_t * const uip_buf = (uint8_t * const) uip_buf32;
/* The uip_appdata pointer points to application data. */ /* The uip_appdata pointer points to application data. */
void *uip_appdata; void *uip_appdata;
/* The uip_appdata pointer points to the application data which is to be sent*/ /* The uip_appdata pointer points to the application data which is to be sent*/