mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
844ccfbeb3
Co-authored-by: Peter Kietzmann <peter.kietzmann@haw-hamburg.de> Co-authored-by: Jose Alamos <jose.alamos@haw-hamburg.de> Co-authored-by: Michel Rottleuthner <michel.rottleuthner@haw-hamburg.de>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 251802a8050d6b619d2e70c33c6ada5b6e57d549 Mon Sep 17 00:00:00 2001
|
|
From: Francisco Molina <femolina@uc.cl>
|
|
Date: Thu, 2 Apr 2020 16:04:29 +0200
|
|
Subject: [PATCH 06/11] bsp/boards/toolchain_defs.h: comment out conflict ISR
|
|
definitions
|
|
|
|
The ISR definition conflicts with AVR ISR definitions.
|
|
---
|
|
bsp/boards/toolchain_defs.h | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/bsp/boards/toolchain_defs.h b/bsp/boards/toolchain_defs.h
|
|
index afcbcbf6..e288e52e 100644
|
|
--- a/bsp/boards/toolchain_defs.h
|
|
+++ b/bsp/boards/toolchain_defs.h
|
|
@@ -16,15 +16,15 @@
|
|
|
|
//===== ISR and pragma
|
|
|
|
-#if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<=5) && defined(__MSP430__)
|
|
- // mspgcc <4.5.x
|
|
- #include <signal.h>
|
|
- #define ISR(v) interrupt (v ## _VECTOR) v ## _ISR(void)
|
|
-#else
|
|
- // other
|
|
- #define __PRAGMA__(x) _Pragma(#x)
|
|
- #define ISR(v) __PRAGMA__(vector=v ##_VECTOR) __interrupt void v ##_ISR(void)
|
|
-#endif
|
|
+// #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<=5) && defined(__MSP430__)
|
|
+// // mspgcc <4.5.x
|
|
+// #include <signal.h>
|
|
+// #define ISR(v) interrupt (v ## _VECTOR) v ## _ISR(void)
|
|
+// #else
|
|
+// // other
|
|
+// #define __PRAGMA__(x) _Pragma(#x)
|
|
+// #define ISR(v) __PRAGMA__(vector=v ##_VECTOR) __interrupt void v ##_ISR(void)
|
|
+// #endif
|
|
|
|
//===== inline
|
|
|
|
--
|
|
2.27.0
|
|
|