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

only include memcpy/set workaround when needed

Browse source
This commit is contained in:
nifi 2010-03-21 10:40:15 +00:00
parent 8f7e96b06f
commit ebfa6c5ef1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cpu/msp430/msp430.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: msp430.c,v 1.12 2010/03/19 14:50:07 joxe Exp $ * @(#)$Id: msp430.c,v 1.13 2010/03/21 10:40:15 nifi Exp $
*/ */
#include <io.h> #include <io.h>
#include <signal.h> #include <signal.h>
@ -38,7 +38,8 @@
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "net/uip.h" #include "net/uip.h"
/* /\*---------------------------------------------------------------------------*\/ */ /*---------------------------------------------------------------------------*/
#if defined(__MSP430__) && defined(__GNUC__) && MSP430_MEMCPY_WORKAROUND
void * void *
w_memcpy(void *out, const void *in, size_t n) w_memcpy(void *out, const void *in, size_t n)
{ {
@ -50,7 +51,9 @@ w_memcpy(void *out, const void *in, size_t n)
} }
return out; return out;
} }
#endif /* __GNUC__ && __MSP430__ && MSP430_MEMCPY_WORKAROUND */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if defined(__MSP430__) && defined(__GNUC__) && MSP430_MEMCPY_WORKAROUND
void * void *
w_memset(void *out, int value, size_t n) w_memset(void *out, int value, size_t n)
{ {
@ -61,6 +64,7 @@ w_memset(void *out, int value, size_t n)
} }
return out; return out;
} }
#endif /* __GNUC__ && __MSP430__ && MSP430_MEMCPY_WORKAROUND */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
msp430_init_dco(void) msp430_init_dco(void)