Commit 6326b0b4 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

msp430fr aspectc++ support

parent b0f6217a

src/app/prototest/Makefile.inc

+4 −0
Original line number Diff line number Diff line 
ifeq (${aspectc}, 1)

	CXX_FLAGS += --Xweaver -asrc/app/prototest/prototest.ah --Xcompiler

endif



ifeq (${prototest_bench_energy}, 1)

	loop ?= 1

	COMMON_FLAGS += -DPROTOTEST_BENCH_ENERGY

src/arch/msp430fr5969lp/arch.cc

+6 −0
Original line number Diff line number Diff line 
#include "arch.h"

#include <msp430.h>



#ifdef __acweaving

#define __delay_cycles(x)

#endif



void Arch::setup(void)

{

	WDTCTL = WDTPW | WDTHOLD;
@@ -157,6 +161,7 @@ Arch arch; 


#include "driver/uptime.h"



#ifndef __acweaving

__attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle_timer1_overflow()

{

	if (TA1IV == 0x0e) {
@@ -168,5 +173,6 @@ __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle 
#endif

	}

}

#endif



#endif /* defined(WITH_LOOP) || defined(TIMER_S) */

src/arch/msp430fr5994lp/arch.cc

+6 −0
Original line number Diff line number Diff line 
#include "arch.h"

#include <msp430.h>



#ifdef __acweaving

#define __delay_cycles(x)

#endif



void Arch::setup(void)

{

	WDTCTL = WDTPW | WDTHOLD;
@@ -157,6 +161,7 @@ Arch arch; 


#include "driver/uptime.h"



#ifndef __acweaving

__attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle_timer1_overflow()

{

	if (TA1IV == 0x0e) {
@@ -168,5 +173,6 @@ __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle 
#endif

	}

}

#endif



#endif /* defined(WITH_LOOP) || defined(TIMER_S) */