diff --git a/LUFA/Drivers/Board/ADAFRUITU4/LEDs.h b/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/ADAFRUITU4/LEDs.h
rename to LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
index 9f5097f17e15cb39e6817ec114141cd6f31819d0..125481d0e9ff8c8d08463391699aa27be03ef4e4 100644
--- a/LUFA/Drivers/Board/ADAFRUITU4/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_ADAFRUITU4_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
rename to LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
index daefcdea9e04c03dbd79d8db764fb6f0be427537..0c382dfc5207baeef228ce8dd7b5ca40878d9284 100644
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_ATAVRUSBRF01_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
rename to LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
index 10456f1cd985ed494de33316fa030ff734b239ff..858b21eec7b4c916f783b4b916c1af052e824363 100644
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_ATAVRUSBRF01_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BENITO/Buttons.h b/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/BENITO/Buttons.h
rename to LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
index 141f1ed4d2c08544e0538368c409e0277742e8aa..3e722d62bfab10d5ddab1b0dc5221acf102d4f5b 100644
--- a/LUFA/Drivers/Board/BENITO/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_BENITO_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BENITO/LEDs.h b/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/BENITO/LEDs.h
rename to LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
index 596765fee644ca98e49377630419ac7aaf20788a..790960068c42cb7f1bd03e7597099755bd2eb4ff 100644
--- a/LUFA/Drivers/Board/BENITO/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_BENITO_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BLACKCAT/LEDs.h b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/BLACKCAT/LEDs.h
rename to LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
index 8b322bcf72e37716508ede82d4780ae911df5d76..42e2788c85c3e9cf3f343105d711448d860fd603 100644
--- a/LUFA/Drivers/Board/BLACKCAT/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_BLACKCAT_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUI/LEDs.h b/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/BUI/LEDs.h
rename to LUFA/Drivers/Board/AVR8/BUI/LEDs.h
index d8cf7e785619d82ef757f98771302d9494581aa3..aeb757a8b96075a1d258321dfe0626d3fb20c166 100644
--- a/LUFA/Drivers/Board/BUI/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_BUI_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/BUMBLEB/Buttons.h
rename to LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
index b4bab86cdee73e3a685ecb56d5665096ff133482..c3860e08a4fbbcd4a837b31086f9ba27920bb115 100644
--- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
@@ -51,7 +51,7 @@
#define __BUTTONS_BUMBLEB_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
similarity index 98%
rename from LUFA/Drivers/Board/BUMBLEB/Joystick.h
rename to LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
index 28b09b49e7839f3b27eb628b35a0dd4925aad75f..e9ff2f8888df4f2c517878a18fcf2db54320325d 100644
--- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
@@ -51,7 +51,7 @@
#define __JOYSTICK_BUMBLEB_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/BUMBLEB/LEDs.h
rename to LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
index c5ecfe87ff793b00b47d97f07ec89e6f0ab26399..fa53764e05c74af2b5970b350f6108b4e8b7a326 100644
--- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
@@ -51,7 +51,7 @@
#define __LEDS_BUMBLEB_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/CULV3/Buttons.h b/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/CULV3/Buttons.h
rename to LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
index 53bf57a0f48066cd9e445278fb03d8817c423b0c..c9153b232dee7238ceec5fd485918c10910d09df 100644
--- a/LUFA/Drivers/Board/CULV3/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_CULV3_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/CULV3/LEDs.h b/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/CULV3/LEDs.h
rename to LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
index c2af7401a313b51a16c1eb6a8ad46dc140f85c8b..86e5c0cff1e9e05bbf90636f137856efccbac512 100644
--- a/LUFA/Drivers/Board/CULV3/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_CULV3_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/EVK527/Buttons.h
rename to LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
index 98c8ce644489eff9d60528194c37c84f7be419d6..03c51d2e81aeb57b962d01db60e44a765019f4d9 100644
--- a/LUFA/Drivers/Board/EVK527/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_EVK527_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/Dataflash.h b/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
similarity index 98%
rename from LUFA/Drivers/Board/EVK527/Dataflash.h
rename to LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
index 2f0ad5724cb3bddaaeeed6d97832b350de77fd49..9a5d9855704d03d4b746a50750701b882d409992 100644
--- a/LUFA/Drivers/Board/EVK527/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
@@ -49,7 +49,8 @@
#define __DATAFLASH_EVK527_H__
/* Includes: */
- #include "../../Misc/AT45DB321C.h"
+ #include "../../../../Common/Common.h"
+ #include "../../../Misc/AT45DB321C.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
similarity index 98%
rename from LUFA/Drivers/Board/EVK527/Joystick.h
rename to LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
index cab4423ed9d28615ec150a9932dc4a54c2c5adb5..6965301738f27935afbf5ca10b71ba1d3a436de1 100644
--- a/LUFA/Drivers/Board/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
@@ -49,7 +49,7 @@
#define __JOYSTICK_EVK527_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/EVK527/LEDs.h
rename to LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
index b7c9e979a125e4cad98240defb0f047939b9a181..b24c9bc29843df390d41015c048aad15c1ea7e35 100644
--- a/LUFA/Drivers/Board/EVK527/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_EVK527_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/JMDBU2/Buttons.h b/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/JMDBU2/Buttons.h
rename to LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
index 4f3581654a6759a0e375a0f76f2da7e9328ce5fc..170eaeabdb61c902148db984317231c0ca5ab70d 100644
--- a/LUFA/Drivers/Board/JMDBU2/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_JMDBU2_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/JMDBU2/LEDs.h b/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/JMDBU2/LEDs.h
rename to LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
index 3c9bdc3b4a9ba9159c698e12b6f6665b59484cc9..b3847b709c6f76e350ac492fb95028cc2effb19a 100644
--- a/LUFA/Drivers/Board/JMDBU2/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_JMDBU2_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MAXIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/MAXIMUS/LEDs.h
rename to LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
index 5297d77eda9c4a3182112adef7f99ee081bf4079..a19bfe5bf79270f51e462a8daa3b1fc591bf99c5 100644
--- a/LUFA/Drivers/Board/MAXIMUS/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_MAXIMUS_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MICROSIN162/Buttons.h b/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
similarity index 95%
rename from LUFA/Drivers/Board/MICROSIN162/Buttons.h
rename to LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
index f41d28192ad1d0eeec77cef530f92ebc8fd383f1..46746f8179954ab17cb8db9a6710d810c395c4e7 100644
--- a/LUFA/Drivers/Board/MICROSIN162/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_MICROSIN162_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MICROSIN162/LEDs.h b/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/MICROSIN162/LEDs.h
rename to LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
index 2fa39fd6433c4d453b57f918829c7793d03c33ed..443316be5153be3b0ca470da5eecc9d263b2fc60 100644
--- a/LUFA/Drivers/Board/MICROSIN162/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_MICROSIN162_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MINIMUS/Buttons.h b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
similarity index 95%
rename from LUFA/Drivers/Board/MINIMUS/Buttons.h
rename to LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
index 518db88101a88245e66542de792b46cca1aaa396..3ea294fd8002a61e4632211757105f6a04e1e419 100644
--- a/LUFA/Drivers/Board/MINIMUS/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_MINIMUS_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MINIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/MINIMUS/LEDs.h
rename to LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
index f921918da47b4ef647259190a8fc85f78bdab119..3dfcb3510194ffb1706b464a5cbbcf0a8fe7563a 100644
--- a/LUFA/Drivers/Board/MINIMUS/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_MINIMUS_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/OLIMEX162/Buttons.h b/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/OLIMEX162/Buttons.h
rename to LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
index 33fee16785606689c69212a0a8102e34edb085e0..32a7511e81299c5410cf07a5e93a458362dcffe2 100644
--- a/LUFA/Drivers/Board/OLIMEX162/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_OLIMEX162_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/OLIMEX162/LEDs.h b/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/OLIMEX162/LEDs.h
rename to LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
index 971c08a2617d8184000ed398df20b406170247c4..9872b9463b582d14ab5f17d949795868ccc6fad0 100644
--- a/LUFA/Drivers/Board/OLIMEX162/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_OLIMEX162_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
similarity index 99%
rename from LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
rename to LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
index af8ff8cef946ee24ab6a90b0ea18dc81d10da18c..ed5c2c191f8201966c2cfcc719e3fd0925c48556 100644
--- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_RZUSBSTICK_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/SPARKFUN8U2/LEDs.h b/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/SPARKFUN8U2/LEDs.h
rename to LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
index 1d52913111802a7a1bc131f886ce6eb770acc141..d4436d35ba71edcb5e7a2697772677783342ae7a 100644
--- a/LUFA/Drivers/Board/SPARKFUN8U2/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_SPARKFUN8U2_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/STK525/Buttons.h
rename to LUFA/Drivers/Board/AVR8/STK525/Buttons.h
index 7e079f9a432b7cd124a411e1d38bc073152f9137..d67a51df17ba3ba7d32f5b7fd5bba4ad6f85a45f 100644
--- a/LUFA/Drivers/Board/STK525/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_STK525_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
similarity index 98%
rename from LUFA/Drivers/Board/STK525/Dataflash.h
rename to LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
index 3d1cffaa530b06e60d0a546b4253f3917f83f6cc..f1c99651a164a6a11517b220dc5ecfcdccd63155 100644
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
@@ -49,7 +49,8 @@
#define __DATAFLASH_STK525_H__
/* Includes: */
- #include "../../Misc/AT45DB321C.h"
+ #include "../../../../Common/Common.h"
+ #include "../../../Misc/AT45DB321C.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
similarity index 98%
rename from LUFA/Drivers/Board/STK525/Joystick.h
rename to LUFA/Drivers/Board/AVR8/STK525/Joystick.h
index c90e7a0d2c1f3662b9cb348d324e79f7494a2ee1..3504d184d1275502122f91e10e55df8a6e51bee8 100644
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
@@ -49,7 +49,7 @@
#define __JOYSTICK_STK525_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/STK525/LEDs.h
rename to LUFA/Drivers/Board/AVR8/STK525/LEDs.h
index 98cbb2fff8df40ead2ef9c95191e6f6d9a9f5cd4..2c81fd48cbf338501b1fec31bfa2537fe7299d19 100644
--- a/LUFA/Drivers/Board/STK525/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_STK525_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/STK526/Buttons.h
rename to LUFA/Drivers/Board/AVR8/STK526/Buttons.h
index 2f8b0648574eb974f29a8cc59b75f4e1f0cbfb8e..e2000a92e5a6625323fd4ee56a52c13ebf8caf95 100644
--- a/LUFA/Drivers/Board/STK526/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_STK526_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
similarity index 98%
rename from LUFA/Drivers/Board/STK526/Dataflash.h
rename to LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
index 6688358bedb880ea534ef3f11e53022f2c8c06f9..1d07c9e3e8a41ea135b448b7555cccea8150ec1c 100644
--- a/LUFA/Drivers/Board/STK526/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
@@ -49,7 +49,8 @@
#define __DATAFLASH_STK526_H__
/* Includes: */
- #include "../../Misc/AT45DB642D.h"
+ #include "../../../../Common/Common.h"
+ #include "../../../Misc/AT45DB642D.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
similarity index 98%
rename from LUFA/Drivers/Board/STK526/Joystick.h
rename to LUFA/Drivers/Board/AVR8/STK526/Joystick.h
index 96063846d3baef0c279fd28d5b647700345b5b9b..7c024fb398d8af5f94751e283183dda4a8f66622 100644
--- a/LUFA/Drivers/Board/STK526/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
@@ -49,7 +49,7 @@
#define __JOYSTICK_STK526_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/STK526/LEDs.h
rename to LUFA/Drivers/Board/AVR8/STK526/LEDs.h
index d8ccab1ec170e53dd93393eabdece58a848555a9..b77c691b153070d6ceb6f52142209613e384c635 100644
--- a/LUFA/Drivers/Board/STK526/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_STK526_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/TEENSY/LEDs.h b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/TEENSY/LEDs.h
rename to LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
index 9ff3506f056365afeadf29b859195b7e54881865..01818756fb15a45db5cd7c4fe0260dc9dc2c5cb3 100644
--- a/LUFA/Drivers/Board/TEENSY/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_TEENSY_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UDIP/Buttons.h b/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/UDIP/Buttons.h
rename to LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
index d1fd4192bbdb67e105c6342fab9299ee2379e361..61ae9b8be145eab4d9f72d58107d47fee30abe03 100644
--- a/LUFA/Drivers/Board/UDIP/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_UDIP_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UDIP/LEDs.h b/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
similarity index 99%
rename from LUFA/Drivers/Board/UDIP/LEDs.h
rename to LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
index 8c5fe7d51f92efe2b31814916735c5572f782295..53789038aeac2aa44708c381a894228fbb5bd934 100644
--- a/LUFA/Drivers/Board/UDIP/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_UDIP_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UNO/LEDs.h b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/UNO/LEDs.h
rename to LUFA/Drivers/Board/AVR8/UNO/LEDs.h
index 66942c8e0c92eddbc32e82c2edf20c8c62ac4794..0205b2dff4f3d3a1b23e835f7800fdb0de838bdb 100644
--- a/LUFA/Drivers/Board/UNO/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_UNO_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBFOO/Buttons.h b/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/USBFOO/Buttons.h
rename to LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
index da3f5e1a8279ba3a0f299f67eafcd464e5a3b8c0..21c6a1f2a6f7f0691c0841296cbac117aacab5af 100644
--- a/LUFA/Drivers/Board/USBFOO/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_USBFOO_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBFOO/LEDS.h b/LUFA/Drivers/Board/AVR8/USBFOO/LEDS.h
similarity index 98%
rename from LUFA/Drivers/Board/USBFOO/LEDS.h
rename to LUFA/Drivers/Board/AVR8/USBFOO/LEDS.h
index d82b76a49cafec6d789394c13979add154392818..cb4625836d96b051fd92715234f2b87a1545c711 100644
--- a/LUFA/Drivers/Board/USBFOO/LEDS.h
+++ b/LUFA/Drivers/Board/AVR8/USBFOO/LEDS.h
@@ -49,7 +49,7 @@
#define __LEDS_USBFOO_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/USBKEY/Buttons.h
rename to LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
index e495318ec60d13b1bcbd688503cbba8a8388f9ea..018bf6b12986863b14a8223ea1bd3d81c792c7f5 100644
--- a/LUFA/Drivers/Board/USBKEY/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_USBKEY_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
similarity index 100%
rename from LUFA/Drivers/Board/USBKEY/Dataflash.h
rename to LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
similarity index 98%
rename from LUFA/Drivers/Board/USBKEY/Joystick.h
rename to LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
index b8ae7bc3e3b8433aa005376c91c4280cb9191810..65f348178615e3458ae8f30376dc89d0f284aa94 100644
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
@@ -49,7 +49,7 @@
#define __JOYSTICK_USBKEY_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/USBKEY/LEDs.h
rename to LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
index 25cfabdf4fb41206174a964a68f9ab046308c213..f7bb3987351945cf2c42ce09da526d2d7d40ed5e 100644
--- a/LUFA/Drivers/Board/USBKEY/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_USBKEY_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBTINYMKII/Buttons.h b/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
similarity index 98%
rename from LUFA/Drivers/Board/USBTINYMKII/Buttons.h
rename to LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
index 06f98feafe90bd41e8bbaca6ba597e2327bebd67..20cb340541e543123ca9cdc3d47b04286fb56099 100644
--- a/LUFA/Drivers/Board/USBTINYMKII/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
@@ -49,7 +49,7 @@
#define __BUTTONS_USBTINYMKII_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h b/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/USBTINYMKII/LEDs.h
rename to LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
index 99fbd535b62749c8943ad33a364aa8bdfa972d1e..00cfd2b437946282d174f3f42dde411554575f01 100644
--- a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_USBTINYMKII_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
similarity index 98%
rename from LUFA/Drivers/Board/XPLAIN/Dataflash.h
rename to LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
index ed4ab6a18231a343001fa878c5c00b6251000200..42c0269064e67e1b06688273743be0ffef100c4a 100644
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
@@ -49,7 +49,8 @@
#define __DATAFLASH_XPLAIN_H__
/* Includes: */
- #include "../../Misc/AT45DB642D.h"
+ #include "../../../../Common/Common.h"
+ #include "../../../Misc/AT45DB642D.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
similarity index 98%
rename from LUFA/Drivers/Board/XPLAIN/LEDs.h
rename to LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
index 75d4a7bc9d5c0c20a5db1a7308ec7780aaaf65fa..d00bbb6a9ea1f6825e4de074ab45b588b921f815 100644
--- a/LUFA/Drivers/Board/XPLAIN/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
@@ -49,7 +49,7 @@
#define __LEDS_XPLAIN_H__
/* Includes: */
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index e32c4ebe8fa5afe1ab3157301fa4435e3240cb01..e4fe21dd0ed862a8b18e3b280a460a1eacff59aa 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -94,37 +94,37 @@
#if (BOARD == BOARD_NONE)
#error The Board Buttons driver cannot be used if the makefile BOARD option is not set.
#elif (BOARD == BOARD_USBKEY)
- #include "USBKEY/Buttons.h"
+ #include "AVR8/USBKEY/Buttons.h"
#elif (BOARD == BOARD_STK525)
- #include "STK525/Buttons.h"
+ #include "AVR8/STK525/Buttons.h"
#elif (BOARD == BOARD_STK526)
- #include "STK526/Buttons.h"
+ #include "AVR8/STK526/Buttons.h"
#elif (BOARD == BOARD_ATAVRUSBRF01)
- #include "ATAVRUSBRF01/Buttons.h"
+ #include "AVR8/ATAVRUSBRF01/Buttons.h"
#elif (BOARD == BOARD_BUMBLEB)
- #include "BUMBLEB/Buttons.h"
+ #include "AVR8/BUMBLEB/Buttons.h"
#elif (BOARD == BOARD_EVK527)
- #include "EVK527/Buttons.h"
+ #include "AVR8/EVK527/Buttons.h"
#elif (BOARD == BOARD_USBTINYMKII)
- #include "USBTINYMKII/Buttons.h"
+ #include "AVR8/USBTINYMKII/Buttons.h"
#elif (BOARD == BOARD_BENITO)
- #include "BENITO/Buttons.h"
+ #include "AVR8/BENITO/Buttons.h"
#elif (BOARD == BOARD_JMDBU2)
- #include "JMDBU2/Buttons.h"
+ #include "AVR8/JMDBU2/Buttons.h"
#elif (BOARD == BOARD_OLIMEX162)
- #include "OLIMEX162/Buttons.h"
+ #include "AVR8/OLIMEX162/Buttons.h"
#elif (BOARD == BOARD_USBFOO)
- #include "USBFOO/Buttons.h"
+ #include "AVR8/USBFOO/Buttons.h"
#elif (BOARD == BOARD_UDIP)
- #include "UDIP/Buttons.h"
+ #include "AVR8/UDIP/Buttons.h"
#elif (BOARD == BOARD_CULV3)
- #include "CULV3/Buttons.h"
+ #include "AVR8/CULV3/Buttons.h"
#elif (BOARD == BOARD_MINIMUS)
- #include "MINIMUS/Buttons.h"
+ #include "AVR8/MINIMUS/Buttons.h"
#elif (BOARD == BOARD_MICROSIN162)
- #include "MICROSIN162/Buttons.h"
+ #include "AVR8/MICROSIN162/Buttons.h"
#elif (BOARD == BOARD_EVK1101)
- #include "EVK1101/Buttons.h"
+ #include "UC3/EVK1101/Buttons.h"
#else
#include "Board/Buttons.h"
#endif
diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index cb5b7fccc3a0f76e19e5c73e4709e6c3505655c2..9d68739af4a6a497350d13fb23e149938983a9ae 100644
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -235,17 +235,15 @@
#if (BOARD == BOARD_NONE)
#error The Board Dataflash driver cannot be used if the makefile BOARD option is not set.
#elif (BOARD == BOARD_USBKEY)
- #include "USBKEY/Dataflash.h"
+ #include "AVR8/USBKEY/Dataflash.h"
#elif (BOARD == BOARD_STK525)
- #include "STK525/Dataflash.h"
+ #include "AVR8/STK525/Dataflash.h"
#elif (BOARD == BOARD_STK526)
- #include "STK526/Dataflash.h"
- #elif (BOARD == BOARD_XPLAIN)
- #include "XPLAIN/Dataflash.h"
- #elif (BOARD == BOARD_XPLAIN_REV1)
- #include "XPLAIN/Dataflash.h"
+ #include "AVR8/STK526/Dataflash.h"
+ #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+ #include "AVR8/XPLAIN/Dataflash.h"
#elif (BOARD == BOARD_EVK527)
- #include "EVK527/Dataflash.h"
+ #include "AVR8/EVK527/Dataflash.h"
#else
#include "Board/Dataflash.h"
#endif
diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index 7b8941695eacfd100d1c98ca343075d6fb325965..35b989dec33bc121713ada2c2d4efb4a3cb272bd 100644
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -102,17 +102,17 @@
#if (BOARD == BOARD_NONE)
#error The Board Joystick driver cannot be used if the makefile BOARD option is not set.
#elif (BOARD == BOARD_USBKEY)
- #include "USBKEY/Joystick.h"
+ #include "AVR8/USBKEY/Joystick.h"
#elif (BOARD == BOARD_STK525)
- #include "STK525/Joystick.h"
+ #include "AVR8/STK525/Joystick.h"
#elif (BOARD == BOARD_STK526)
- #include "STK526/Joystick.h"
+ #include "AVR8/STK526/Joystick.h"
#elif (BOARD == BOARD_BUMBLEB)
- #include "BUMBLEB/Joystick.h"
+ #include "AVR8/BUMBLEB/Joystick.h"
#elif (BOARD == BOARD_EVK527)
- #include "EVK527/Joystick.h"
+ #include "AVR8/EVK527/Joystick.h"
#elif (BOARD == BOARD_EVK1101)
- #include "EVK1101/Joystick.h"
+ #include "UC3/EVK1101/Joystick.h"
#else
#include "Board/Joystick.h"
#endif
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 628f2587bc3637d0c791ff6d58c7e602d25048fb..ac7716b43a1c9d21a26e19833cafc5cbddf41b5c 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -116,55 +116,55 @@
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) {};
static inline uint8_t LEDs_GetLEDs(void) { return 0; }
#elif (BOARD == BOARD_USBKEY)
- #include "USBKEY/LEDs.h"
+ #include "AVR8/USBKEY/LEDs.h"
#elif (BOARD == BOARD_STK525)
- #include "STK525/LEDs.h"
+ #include "AVR8/STK525/LEDs.h"
#elif (BOARD == BOARD_STK526)
- #include "STK526/LEDs.h"
+ #include "AVR8/STK526/LEDs.h"
#elif (BOARD == BOARD_RZUSBSTICK)
- #include "RZUSBSTICK/LEDs.h"
+ #include "AVR8/RZUSBSTICK/LEDs.h"
#elif (BOARD == BOARD_ATAVRUSBRF01)
- #include "ATAVRUSBRF01/LEDs.h"
+ #include "AVR8/ATAVRUSBRF01/LEDs.h"
#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
- #include "XPLAIN/LEDs.h"
+ #include "AVR8/XPLAIN/LEDs.h"
#elif (BOARD == BOARD_BUMBLEB)
- #include "BUMBLEB/LEDs.h"
+ #include "AVR8/BUMBLEB/LEDs.h"
#elif (BOARD == BOARD_EVK527)
- #include "EVK527/LEDs.h"
+ #include "AVR8/EVK527/LEDs.h"
#elif (BOARD == BOARD_TEENSY)
- #include "TEENSY/LEDs.h"
+ #include "AVR8/TEENSY/LEDs.h"
#elif (BOARD == BOARD_USBTINYMKII)
- #include "USBTINYMKII/LEDs.h"
+ #include "AVR8/USBTINYMKII/LEDs.h"
#elif (BOARD == BOARD_BENITO)
- #include "BENITO/LEDs.h"
+ #include "AVR8/BENITO/LEDs.h"
#elif (BOARD == BOARD_JMDBU2)
- #include "JMDBU2/LEDs.h"
+ #include "AVR8/JMDBU2/LEDs.h"
#elif (BOARD == BOARD_OLIMEX162)
- #include "OLIMEX162/LEDs.h"
+ #include "AVR8/OLIMEX162/LEDs.h"
#elif (BOARD == BOARD_USBFOO)
- #include "USBFOO/LEDs.h"
+ #include "AVR8/USBFOO/LEDs.h"
#elif (BOARD == BOARD_UDIP)
- #include "UDIP/LEDs.h"
+ #include "AVR8/UDIP/LEDs.h"
#elif (BOARD == BOARD_BUI)
- #include "BUI/LEDs.h"
+ #include "AVR8/BUI/LEDs.h"
#elif (BOARD == BOARD_UNO)
- #include "UNO/LEDs.h"
+ #include "AVR8/UNO/LEDs.h"
#elif (BOARD == BOARD_CULV3)
- #include "CULV3/LEDs.h"
+ #include "AVR8/CULV3/LEDs.h"
#elif (BOARD == BOARD_BLACKCAT)
- #include "BLACKCAT/LEDs.h"
+ #include "AVR8/BLACKCAT/LEDs.h"
#elif (BOARD == BOARD_MAXIMUS)
- #include "MAXIMUS/LEDs.h"
+ #include "AVR8/MAXIMUS/LEDs.h"
#elif (BOARD == BOARD_MINIMUS)
- #include "MINIMUS/LEDs.h"
+ #include "AVR8/MINIMUS/LEDs.h"
#elif (BOARD == BOARD_ADAFRUITU4)
- #include "ADAFRUITU4/LEDs.h"
+ #include "AVR8/ADAFRUITU4/LEDs.h"
#elif (BOARD == BOARD_MICROSIN162)
- #include "MICROSIN162/LEDs.h"
+ #include "AVR8/MICROSIN162/LEDs.h"
#elif (BOARD == BOARD_SPARKFUN8U2)
- #include "SPARKFUN8U2/LEDs.h"
+ #include "AVR8/SPARKFUN8U2/LEDs.h"
#elif (BOARD == BOARD_EVK1101)
- #include "EVK1101/LEDs.h"
+ #include "UC3/EVK1101/LEDs.h"
#else
#include "Board/LEDs.h"
#endif
diff --git a/LUFA/Drivers/Board/EVK1101/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
similarity index 94%
rename from LUFA/Drivers/Board/EVK1101/Buttons.h
rename to LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
index 4165694613a694c26defb9d84927ab06374ff270..909c3127a1dfca7de76807f32933e8b414bcbe9e 100644
--- a/LUFA/Drivers/Board/EVK1101/Buttons.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
@@ -49,10 +49,7 @@
#define __BUTTONS_EVK1101_H__
/* Includes: */
- #include <avr32/io.h>
- #include <stdbool.h>
-
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK1101/Joystick.h b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
similarity index 95%
rename from LUFA/Drivers/Board/EVK1101/Joystick.h
rename to LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
index 790f1823a48390b82498cfbef42ec72443fe6345..ea20c677d46052019c0f449d627621a3e440b54b 100644
--- a/LUFA/Drivers/Board/EVK1101/Joystick.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
@@ -49,9 +49,7 @@
#define __JOYSTICK_EVK1101_H__
/* Includes: */
- #include <avr32/io.h>
-
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
similarity index 95%
rename from LUFA/Drivers/Board/EVK1101/LEDs.h
rename to LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
index ddb460795c687dcfcb1f61b1076c31645558c580..4c7ad5db5e64eb94f569c394631435a5bcba978c 100644
--- a/LUFA/Drivers/Board/EVK1101/LEDs.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
@@ -49,9 +49,7 @@
#define __LEDS_EVK1101_H__
/* Includes: */
- #include <avr32/io.h>
-
- #include "../../../Common/Common.h"
+ #include "../../../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 99445153c3c038e110099885e64cad59fad25153..237710d984cf4319cd9387b683a38f0d80f718af 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -70,6 +70,7 @@
* a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures
* - Renamed all low level Pipe_Read_*, Pipe_Write_* and Pipe_Discard_* functions to use the number of bits instead of
* a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures
+ * - Seperated out board drivers by architecture in the library internals for better organisation
* - Library Applications:
* - Changed the XPLAINBridge software UART to use the regular timer CTC mode instead of the alternative CTC mode
* via the Input Capture register, to reduce user confusion