From 6326b0b4df2e158b839f607f506be6ce2972f1b5 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 13 Mar 2019 14:59:16 +0100
Subject: msp430fr aspectc++ support

---
 src/arch/msp430fr5969lp/arch.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/arch/msp430fr5969lp/arch.cc')

diff --git a/src/arch/msp430fr5969lp/arch.cc b/src/arch/msp430fr5969lp/arch.cc
index 1eb34b5..3f0eb3c 100644
--- a/src/arch/msp430fr5969lp/arch.cc
+++ b/src/arch/msp430fr5969lp/arch.cc
@@ -1,6 +1,10 @@
 #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) */
-- 
cgit v1.2.3