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

Added resource definition for button and removed obsolete compiler setup (compiler setup is now handled by cpu/msp430/msp430def.h)

Browse source
This commit is contained in:
Niclas Finne 2012-01-11 00:22:18 +01:00
parent 24d58edf15
commit 1c6c4ba2f1
3 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/z1/Makefile.common
View file

@ -7,7 +7,7 @@ CFLAGS+=-Os -g
endif endif
ifdef IAR ifdef IAR
CFLAGS+=-e --vla -Ohz --multiplier=16s --core=430X --double=32 CFLAGS += -D__MSP430F2617__=1 -e --vla -Ohz --multiplier=16s --core=430X --double=32
endif endif
CLEAN += symbols.c symbols.h CLEAN += symbols.c symbols.h

18
platform/z1/platform-conf.h
View file

@ -25,13 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $Id: platform-conf.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
*/ */
/** /**
* \file * \file
* A brief description of what this file is * Platform configuration for the Z1 platform
* \author * \author
* Joakim Eriksson <joakime@sics.se> * Joakim Eriksson <joakime@sics.se>
*/ */
@ -46,19 +44,7 @@
#define ZOLERTIA_Z1 1 /* Enric */ #define ZOLERTIA_Z1 1 /* Enric */
#define PLATFORM_HAS_LEDS 1 #define PLATFORM_HAS_LEDS 1
#define PLATFORM_HAS_BUTTON 1
#ifdef __IAR_SYSTEMS_ICC__
#include <intrinsics.h>
#include <in430.h>
#define dint() __disable_interrupt()
#define eint() __enable_interrupt()
#define __MSP430F2617__ 1
#define __MSP430__ 1
#define CC_CONF_INLINE
#define BV(x) (1 << x)
#else
#define CC_CONF_INLINE inline
#endif
/* CPU target speed in Hz */ /* CPU target speed in Hz */
#define F_CPU 8000000uL /* 8MHz by default */ #define F_CPU 8000000uL /* 8MHz by default */

9
platform/z1sp/platform-conf.h
View file

@ -25,13 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $Id: platform-conf.h,v 1.1 2010/08/24 16:26:38 joxe Exp $
*/ */
/** /**
* \file * \file
* A brief description of what this file is * Platform configuration for the Z1SP platform
* \author * \author
* Joakim Eriksson <joakime@sics.se> * Joakim Eriksson <joakime@sics.se>
*/ */
@ -47,8 +45,7 @@
#define ZOLERTIA_Z1SP 1 /* Enric */ #define ZOLERTIA_Z1SP 1 /* Enric */
/* CPU target speed in Hz */ /* CPU target speed in Hz */
/* CPU target speed in Hz */ #define F_CPU 8000000uL /* 8MHz by default */
#define F_CPU 8000000uL // 8MHz by default
//Enric #define F_CPU 3900000uL /*2457600uL*/ //Enric #define F_CPU 3900000uL /*2457600uL*/
/* Our clock resolution, this is the same as Unix HZ. */ /* Our clock resolution, this is the same as Unix HZ. */
@ -59,8 +56,6 @@
#define CCIF #define CCIF
#define CLIF #define CLIF
#define CC_CONF_INLINE inline
#define HAVE_STDINT_H #define HAVE_STDINT_H
#include "msp430def.h" #include "msp430def.h"