Merge remote-tracking branch 'upstream/master'

[kiibohd-controller.git] / Lib / MacroLib.h

diff --git a/Lib/MacroLib.h b/Lib/MacroLib.h
index 9bf22a81b07d7a771864a3dbc8394ff7a54fb79b..ea4617f6cdc59aeb51b3bbdd4f319b92a7fbff2a 100644 (file)
--- a/Lib/MacroLib.h
+++ b/Lib/MacroLib.h
@@ -1,15 +1,15 @@
-/* Copyright (C) 2013 by Jacob Alexander
- * 
+/* Copyright (C) 2013-2014 by Jacob Alexander
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,16 +24,19 @@
 // Additional includes should only be added to this file if they should be added to *all* Macro modules.
 
 
-// ----- Includes -----
-
 #ifndef __MACROLIB_H
 #define __MACROLIB_H
 
+// ----- Includes -----
+
+#include <Lib/Interrupts.h>
+
+
+
 // ARM
-#if defined(_mk20dx128_)
+#if defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_)
 
-#include <Lib/mk20dx128.h>
-#include <Lib/aliased_bitband.h>
+#include <Lib/mk20dx.h>
 #include <Lib/delay.h>
 
 #endif
@@ -43,7 +46,6 @@
 // AVR
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
 
-#include <avr/interrupt.h>
 #include <util/delay.h>
 
 #endif