From 910bca557cbdc34dbc8db9df91d00103ffd73c88 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 18 May 2011 12:23:24 +0000 Subject: [PATCH] Seperated out board drivers by architecture in the library internals for better organisation. --- .../Board/{ => AVR8}/ADAFRUITU4/LEDs.h | 2 +- .../Board/{ => AVR8}/ATAVRUSBRF01/Buttons.h | 2 +- .../Board/{ => AVR8}/ATAVRUSBRF01/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/BENITO/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/BENITO/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/BLACKCAT/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/BUI/LEDs.h | 2 +- .../Board/{ => AVR8}/BUMBLEB/Buttons.h | 2 +- .../Board/{ => AVR8}/BUMBLEB/Joystick.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/BUMBLEB/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/CULV3/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/CULV3/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/EVK527/Buttons.h | 2 +- .../Board/{ => AVR8}/EVK527/Dataflash.h | 3 +- .../Board/{ => AVR8}/EVK527/Joystick.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/EVK527/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/JMDBU2/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/JMDBU2/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/MAXIMUS/LEDs.h | 2 +- .../Board/{ => AVR8}/MICROSIN162/Buttons.h | 2 +- .../Board/{ => AVR8}/MICROSIN162/LEDs.h | 2 +- .../Board/{ => AVR8}/MINIMUS/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/MINIMUS/LEDs.h | 2 +- .../Board/{ => AVR8}/OLIMEX162/Buttons.h | 2 +- .../Drivers/Board/{ => AVR8}/OLIMEX162/LEDs.h | 2 +- .../Board/{ => AVR8}/RZUSBSTICK/LEDs.h | 2 +- .../Board/{ => AVR8}/SPARKFUN8U2/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/STK525/Buttons.h | 2 +- .../Board/{ => AVR8}/STK525/Dataflash.h | 3 +- .../Board/{ => AVR8}/STK525/Joystick.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/STK525/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/STK526/Buttons.h | 2 +- .../Board/{ => AVR8}/STK526/Dataflash.h | 3 +- .../Board/{ => AVR8}/STK526/Joystick.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/STK526/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/TEENSY/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/UDIP/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/UDIP/LEDs.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/UNO/LEDs.h | 2 +- .../Drivers/Board/{ => AVR8}/USBFOO/Buttons.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/USBFOO/LEDS.h | 2 +- .../Drivers/Board/{ => AVR8}/USBKEY/Buttons.h | 2 +- .../Board/{ => AVR8}/USBKEY/Dataflash.h | 0 .../Board/{ => AVR8}/USBKEY/Joystick.h | 2 +- LUFA/Drivers/Board/{ => AVR8}/USBKEY/LEDs.h | 2 +- .../Board/{ => AVR8}/USBTINYMKII/Buttons.h | 2 +- .../Board/{ => AVR8}/USBTINYMKII/LEDs.h | 2 +- .../Board/{ => AVR8}/XPLAIN/Dataflash.h | 3 +- LUFA/Drivers/Board/{ => AVR8}/XPLAIN/LEDs.h | 2 +- LUFA/Drivers/Board/Buttons.h | 32 ++++++------ LUFA/Drivers/Board/Dataflash.h | 14 +++--- LUFA/Drivers/Board/Joystick.h | 12 ++--- LUFA/Drivers/Board/LEDs.h | 50 +++++++++---------- .../Drivers/Board/{ => UC3}/EVK1101/Buttons.h | 5 +- .../Board/{ => UC3}/EVK1101/Joystick.h | 4 +- LUFA/Drivers/Board/{ => UC3}/EVK1101/LEDs.h | 4 +- LUFA/ManPages/ChangeLog.txt | 1 + 57 files changed, 109 insertions(+), 113 deletions(-) rename LUFA/Drivers/Board/{ => AVR8}/ADAFRUITU4/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/ATAVRUSBRF01/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/ATAVRUSBRF01/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BENITO/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BENITO/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BLACKCAT/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/BUI/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BUMBLEB/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BUMBLEB/Joystick.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/BUMBLEB/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/CULV3/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/CULV3/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/EVK527/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/EVK527/Dataflash.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/EVK527/Joystick.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/EVK527/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/JMDBU2/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/JMDBU2/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/MAXIMUS/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/MICROSIN162/Buttons.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/MICROSIN162/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/MINIMUS/Buttons.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/MINIMUS/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/OLIMEX162/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/OLIMEX162/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/RZUSBSTICK/LEDs.h (99%) rename LUFA/Drivers/Board/{ => AVR8}/SPARKFUN8U2/LEDs.h (95%) rename LUFA/Drivers/Board/{ => AVR8}/STK525/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK525/Dataflash.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK525/Joystick.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK525/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK526/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK526/Dataflash.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK526/Joystick.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/STK526/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/TEENSY/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/UDIP/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/UDIP/LEDs.h (99%) rename LUFA/Drivers/Board/{ => AVR8}/UNO/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBFOO/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBFOO/LEDS.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBKEY/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBKEY/Dataflash.h (100%) rename LUFA/Drivers/Board/{ => AVR8}/USBKEY/Joystick.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBKEY/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBTINYMKII/Buttons.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/USBTINYMKII/LEDs.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/XPLAIN/Dataflash.h (98%) rename LUFA/Drivers/Board/{ => AVR8}/XPLAIN/LEDs.h (98%) rename LUFA/Drivers/Board/{ => UC3}/EVK1101/Buttons.h (94%) rename LUFA/Drivers/Board/{ => UC3}/EVK1101/Joystick.h (95%) rename LUFA/Drivers/Board/{ => UC3}/EVK1101/LEDs.h (95%) 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 9f5097f17e..125481d0e9 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 daefcdea9e..0c382dfc52 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 10456f1cd9..858b21eec7 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 141f1ed4d2..3e722d62bf 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 596765fee6..790960068c 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 8b322bcf72..42e2788c85 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 d8cf7e7856..aeb757a8b9 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 b4bab86cde..c3860e08a4 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 28b09b49e7..e9ff2f8888 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 c5ecfe87ff..fa53764e05 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 53bf57a0f4..c9153b232d 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 c2af7401a3..86e5c0cff1 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 98c8ce6444..03c51d2e81 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 2f0ad5724c..9a5d985570 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 cab4423ed9..6965301738 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 b7c9e979a1..b24c9bc298 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 4f3581654a..170eaeabdb 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 3c9bdc3b4a..b3847b709c 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 5297d77eda..a19bfe5bf7 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 f41d28192a..46746f8179 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 2fa39fd643..443316be51 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 518db88101..3ea294fd80 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 f921918da4..3dfcb35101 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 33fee16785..32a7511e81 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 971c08a261..9872b9463b 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 af8ff8cef9..ed5c2c191f 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 1d52913111..d4436d35ba 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 7e079f9a43..d67a51df17 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 3d1cffaa53..f1c99651a1 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 c90e7a0d2c..3504d184d1 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 98cbb2fff8..2c81fd48cb 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 2f8b064857..e2000a92e5 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 6688358bed..1d07c9e3e8 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 96063846d3..7c024fb398 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 d8ccab1ec1..b77c691b15 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 9ff3506f05..01818756fb 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 d1fd4192bb..61ae9b8be1 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 8c5fe7d51f..53789038ae 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 66942c8e0c..0205b2dff4 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 da3f5e1a82..21c6a1f2a6 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 d82b76a49c..cb4625836d 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 e495318ec6..018bf6b129 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 b8ae7bc3e3..65f3481786 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 25cfabdf4f..f7bb398735 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 06f98feafe..20cb340541 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 99fbd535b6..00cfd2b437 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 ed4ab6a182..42c0269064 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 75d4a7bc9d..d00bbb6a9e 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 e32c4ebe8f..e4fe21dd0e 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 cb5b7fccc3..9d68739af4 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 7b8941695e..35b989dec3 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 628f2587bc..ac7716b43a 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 4165694613..909c3127a1 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 - #include - - #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 790f1823a4..ea20c677d4 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 - - #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 ddb460795c..4c7ad5db5e 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 - - #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 99445153c3..237710d984 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