Update MediaController project to remove the Record usage (not often needed) and...

[pub/USBasp.git] / LUFA / Drivers / Board / Dataflash.h

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 4ed77a3..9d68739 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -119,10 +119,7 @@
 #define __DATAFLASH_H__
 
        /* Macros: */
 #define __DATAFLASH_H__
 
        /* Macros: */

-       #if !defined(__DOXYGEN__)

                #define __INCLUDE_FROM_DATAFLASH_H
                #define __INCLUDE_FROM_DATAFLASH_H

-               #define INCLUDE_FROM_DATAFLASH_H
-       #endif

 
        /* Includes: */
        #include "../../Common/Common.h"
 
        /* Includes: */
        #include "../../Common/Common.h"


@@ -238,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)
                        #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)
                        #elif (BOARD == BOARD_STK525)

-                               #include "STK525/Dataflash.h"
+                               #include "AVR8/STK525/Dataflash.h"

                        #elif (BOARD == BOARD_STK526)
                        #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)
                        #elif (BOARD == BOARD_EVK527)

-                               #include "EVK527/Dataflash.h"
+                               #include "AVR8/EVK527/Dataflash.h"

                        #else
                                #include "Board/Dataflash.h"
                        #endif
                        #else
                                #include "Board/Dataflash.h"
                        #endif