Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable...

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

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index b1475d2..762142c 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -62,6 +62,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r

+               #define __INCLUDE_FROM_DATAFLASH_H\r

                #define INCLUDE_FROM_DATAFLASH_H\r
        #endif\r
 \r
                #define INCLUDE_FROM_DATAFLASH_H\r
        #endif\r
 \r


@@ -150,8 +151,8 @@
                        }\r
 \r
                /* Includes: */\r
                        }\r
 \r
                /* Includes: */\r

-                       #if !defined(BOARD)\r
-                               #error BOARD must be set in makefile to a value specified in BoardTypes.h.\r
+                       #if (BOARD == BOARD_NONE)\r
+                               #error The Board Buttons driver cannot be used if the makefile BOARD option is not set.\r

                        #elif (BOARD == BOARD_USBKEY)\r
                                #include "USBKEY/Dataflash.h"\r
                        #elif (BOARD == BOARD_STK525)\r
                        #elif (BOARD == BOARD_USBKEY)\r
                                #include "USBKEY/Dataflash.h"\r
                        #elif (BOARD == BOARD_STK525)\r