mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-16 07:28:57 +00:00
Moved configuration of memcpy workaround to cpu (only needed for an older version of mspgcc)
This commit is contained in:
parent
fd81a0d393
commit
3daa822f89
@ -50,7 +50,9 @@
|
|||||||
#else /* __MSPGCC__ */
|
#else /* __MSPGCC__ */
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#if !defined(MSP430_MEMCPY_WORKAROUND) && (__GNUC__ < 4)
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
#define MSP430_MEMCPY_WORKAROUND 1
|
||||||
|
#endif
|
||||||
#endif /* __MSPGCC__ */
|
#endif /* __MSPGCC__ */
|
||||||
|
|
||||||
#define CC_CONF_INLINE inline
|
#define CC_CONF_INLINE inline
|
||||||
@ -110,26 +112,9 @@ spl_t splhigh_(void);
|
|||||||
void *w_memcpy(void *out, const void *in, size_t n);
|
void *w_memcpy(void *out, const void *in, size_t n);
|
||||||
#define memcpy(dest, src, count) w_memcpy(dest, src, count)
|
#define memcpy(dest, src, count) w_memcpy(dest, src, count)
|
||||||
|
|
||||||
/* #define memcpy(dest, src, count) do { \ */
|
|
||||||
/* if(count == 2) { \ */
|
|
||||||
/* *((uint8_t *)dest) = *((uint8_t *)src); \ */
|
|
||||||
/* *((uint8_t *)dest + 1) = *((uint8_t *)src + 1); \ */
|
|
||||||
/* } else { \ */
|
|
||||||
/* memcpy(dest, src, count); \ */
|
|
||||||
/* } \ */
|
|
||||||
/* } while(0) */
|
|
||||||
|
|
||||||
void *w_memset(void *out, int value, size_t n);
|
void *w_memset(void *out, int value, size_t n);
|
||||||
#define memset(dest, value, count) w_memset(dest, value, count)
|
#define memset(dest, value, count) w_memset(dest, value, count)
|
||||||
|
|
||||||
/* #define memset(dest, value, count) do { \ */
|
|
||||||
/* if(count == 2) { \ */
|
|
||||||
/* *((uint8_t *)dest) = (uint8_t)value; \ */
|
|
||||||
/* *((uint8_t *)dest + 1) = (uint8_t)value; \ */
|
|
||||||
/* } else { \ */
|
|
||||||
/* memset(dest, value, count); \ */
|
|
||||||
/* } \ */
|
|
||||||
/* } while(0) */
|
|
||||||
#endif /* memcpy */
|
#endif /* memcpy */
|
||||||
#endif /* __GNUC__ && __MSP430__ && MSP430_MEMCPY_WORKAROUND */
|
#endif /* __GNUC__ && __MSP430__ && MSP430_MEMCPY_WORKAROUND */
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#define BV(x) (1 << x)
|
#define BV(x) (1 << x)
|
||||||
#else
|
#else
|
||||||
#define CC_CONF_INLINE inline
|
#define CC_CONF_INLINE inline
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define HAVE_STDINT_H
|
#define HAVE_STDINT_H
|
||||||
|
@ -63,7 +63,6 @@
|
|||||||
#define CC_CONF_INLINE inline
|
#define CC_CONF_INLINE inline
|
||||||
|
|
||||||
#define HAVE_STDINT_H
|
#define HAVE_STDINT_H
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
|
||||||
#include "msp430def.h"
|
#include "msp430def.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@
|
|||||||
#define CC_CONF_INLINE inline
|
#define CC_CONF_INLINE inline
|
||||||
|
|
||||||
#define HAVE_STDINT_H
|
#define HAVE_STDINT_H
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
|
||||||
#include "msp430def.h"
|
#include "msp430def.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -73,7 +73,6 @@
|
|||||||
#define CLIF
|
#define CLIF
|
||||||
|
|
||||||
#define HAVE_STDINT_H
|
#define HAVE_STDINT_H
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
|
||||||
#include "msp430def.h"
|
#include "msp430def.h"
|
||||||
|
|
||||||
/* XXX Temporary place for defines that are lacking in mspgcc4's gpio.h */
|
/* XXX Temporary place for defines that are lacking in mspgcc4's gpio.h */
|
||||||
|
@ -62,7 +62,6 @@
|
|||||||
#define CC_CONF_INLINE inline
|
#define CC_CONF_INLINE inline
|
||||||
|
|
||||||
#define HAVE_STDINT_H
|
#define HAVE_STDINT_H
|
||||||
#define MSP430_MEMCPY_WORKAROUND 1
|
|
||||||
#include "msp430def.h"
|
#include "msp430def.h"
|
||||||
|
|
||||||
/* XXX Temporary place for defines that are lacking in mspgcc4's gpio.h */
|
/* XXX Temporary place for defines that are lacking in mspgcc4's gpio.h */
|
||||||
|
Loading…
Reference in New Issue
Block a user