half-baked timer implementation for MSP430 and Arduino

4 files changed, 7 insertions, 12 deletions

diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index d4d5be7..6dbd95e 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -37,14 +37,6 @@ ifneq ($(findstring timer,${arch_drivers}), )
 	TARGETS += src/arch/arduino-nano/driver/timer.cc
 endif
 
-ifneq (${i2c_freq}, )
-	COMMON_FLAGS += -DF_I2C=${i2c_freq}
-endif
-
-ifneq (${timer_freq}, )
-	COMMON_FLAGS += -DF_TIMER=${timer_freq}
-endif
-
 OBJECTS = ${TARGETS:.cc=.o}
 
 .cc.o:
diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc
index 5a4259f..1d99d0b 100644
--- a/src/arch/blinkenrocket/Makefile.inc
+++ b/src/arch/blinkenrocket/Makefile.inc
@@ -27,10 +27,6 @@ else ifneq ($(findstring i2c,${arch_drivers}), )
 	TARGETS += src/arch/blinkenrocket/driver/i2c.cc
 endif
 
-ifneq (${i2c_freq}, )
-	COMMON_FLAGS += -DF_I2C=${i2c_freq}
-endif
-
 OBJECTS = ${TARGETS:.cc=.o}
 
 .cc.o:
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index 28c1cef..037c9cd 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -43,6 +43,10 @@ ifneq ($(findstring spi_b,${arch_drivers}), )
 	TARGETS += src/arch/msp430fr5969lp/driver/spi_b.cc
 endif
 
+ifneq ($(findstring timer,${arch_drivers}), )
+	TARGETS += src/arch/msp430fr5969lp/driver/timer.cc
+endif
+
 OBJECTS = ${TARGETS:.cc=.o}
 
 .cc.o:
diff --git a/src/arch/msp430fr5969lp/driver/timer.cc b/src/arch/msp430fr5969lp/driver/timer.cc
new file mode 100644
index 0000000..4f2d6d1
--- /dev/null
+++ b/src/arch/msp430fr5969lp/driver/timer.cc
@@ -0,0 +1,3 @@
+#include "driver/timer.h"
+
+Timer timer;