mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
aa1e7797b0
With the new version some OpenWSN modules are optional: - openwsn_cjoin (and therefore opewnsn_coap) - openwsn_6lo_fragmentation - openwsn_icmpv6echo - openwsn_crypto - openwsn_udp (optional but kept as default) New optional modules have been added: - openwsn_iee802154e_security (link layer security) - openwsn_adaptive_msf (MSF dynamic slot allocation) Openvisualizer needs to be updated to be compatible with the new version.
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From e801ea1e88ea60d848c0ca9c1a2e7dab1a8a7d98 Mon Sep 17 00:00:00 2001
|
|
From: Francisco Molina <femolina@uc.cl>
|
|
Date: Thu, 2 Apr 2020 16:04:29 +0200
|
|
Subject: [PATCH 05/10] 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
|
|
|