From e0d0014f5f1827a5a7c5bdee4f73275c0d8a775b Mon Sep 17 00:00:00 2001
From: Edward Longman <el7g15@soton.ac.uk>
Date: Thu, 11 Jul 2019 16:33:11 +0100
Subject: [PATCH] Remove redefinition of HAL_ISR_FUNC and include hal_types
 instead

---
 source/lib/hal_mcu/hal_fr5_timer.c | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/source/lib/hal_mcu/hal_fr5_timer.c b/source/lib/hal_mcu/hal_fr5_timer.c
index 57787e2..5b73f3e 100644
--- a/source/lib/hal_mcu/hal_fr5_timer.c
+++ b/source/lib/hal_mcu/hal_fr5_timer.c
@@ -41,31 +41,8 @@
 #include "msp430.h"
 #include "hal_timer.h"
 
-//#include "../radio_drv/hal_types.h"
-/*******************************************************************************
-* GNU GCC specifics
-*/
-#if defined __GNUC__
-
-#define CODE
-#define XDATA
-#define FAR
-#define NOP()  __no_operation()
-#define HAL_ISR_FUNC_DECLARATION(f,v)   \
-    void __attribute__((interrupt(v ## _VECTOR),used)) f(void)
-#define HAL_ISR_FUNC_PROTOTYPE(f,v)     \
-    void __attribute__((interrupt(v ## _VECTOR),used)) f(void)
-#define HAL_ISR_FUNCTION(f,v)           \
-    HAL_ISR_FUNC_PROTOTYPE(f,v); HAL_ISR_FUNC_DECLARATION(f,v)
-
-typedef unsigned short istate_t;
-
-/*******************************************************************************
-* Other compilers
-*/
-#else
-#error "Unsupported compiler"
-#endif
+#include "../radio_drv/hal_types.h"
+
 
 unsigned char volatile timer_event;
 unsigned long volatile time_counter = 0;
-- 
GitLab