Move out Dataflash IC command constants headers into the general LUFA/Drivers/Misc/ directory rather than duplicating them inside the individual board driver folders.

10 files changed, 213 insertions, 560 deletions

diff --git a/LUFA/Drivers/Board/EVK527/Dataflash.h b/LUFA/Drivers/Board/EVK527/Dataflash.h
index e9629e06d..40608473a 100644
--- a/LUFA/Drivers/Board/EVK527/Dataflash.h
+++ b/LUFA/Drivers/Board/EVK527/Dataflash.h
@@ -52,7 +52,7 @@
 #define __DATAFLASH_EVK527_H__
 
 	/* Includes: */
-		#include "AT45DB321C.h"
+		#include "../../Misc/AT45DB321C.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK525/AT45DB321C.h b/LUFA/Drivers/Board/STK525/AT45DB321C.h
deleted file mode 100644
index 074fc37df..000000000
--- a/LUFA/Drivers/Board/STK525/AT45DB321C.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel STK525.
- *
- *  Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel STK525.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash_STK525
- *  \defgroup Group_Dataflash_STK525_AT45DB321C AT45DB321C
- *
- *  Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel STK525.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_CMDS_H__
-#define __DATAFLASH_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			//@{
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			//@}
-
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-			/** \name Dataflash Commands */
-			//@{
-			#define DF_CMD_GETSTATUS                        0xD7
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0xE8
-			#define DF_CMD_BUFF1READ_LF                     0xD4
-			#define DF_CMD_BUFF2READ_LF                     0xD6
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0xCF})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0xCF
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			//@}
-
-#endif
-
-/** @} */
-
diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/STK525/Dataflash.h
index ec3246c5e..089170994 100644
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/STK525/Dataflash.h
@@ -52,7 +52,7 @@
 #define __DATAFLASH_STK525_H__
 
 	/* Includes: */
-		#include "AT45DB321C.h"
+		#include "../../Misc/AT45DB321C.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK526/AT45DB642D.h b/LUFA/Drivers/Board/STK526/AT45DB642D.h
deleted file mode 100644
index 10344d4e9..000000000
--- a/LUFA/Drivers/Board/STK526/AT45DB642D.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel STK526.
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel STK526.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash_STK526
- *  \defgroup Group_Dataflash_STK526_AT45DB642D AT45DB642D
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel STK526.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_CMDS_H__
-#define __DATAFLASH_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			//@{
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			#define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
-			//@}
-
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-			/** \name Dataflash Commands */
-			//@{
-			#define DF_CMD_GETSTATUS                        0xD7
-			#define DF_CMD_POWERDOWN                        0xB9
-			#define DF_CMD_WAKEUP                           0xAB
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0x03
-			#define DF_CMD_BUFF1READ_LF                     0xD1
-			#define DF_CMD_BUFF2READ_LF                     0xD3
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-			#define DF_CMD_SECTORERASE                      0x7C
-
-			#define DF_CMD_CHIPERASE                        ((char[]){0xC7, 0x94, 0x80, 0x9A})
-			#define DF_CMD_CHIPERASE_BYTE1                  0xC7
-			#define DF_CMD_CHIPERASE_BYTE2                  0x94
-			#define DF_CMD_CHIPERASE_BYTE3                  0x80
-			#define DF_CMD_CHIPERASE_BYTE4                  0x9A
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0x9A})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0x9A
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			//@}
-
-#endif
-
-/** @} */
-
diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/STK526/Dataflash.h
index b0ceecd64..b5c33340a 100644
--- a/LUFA/Drivers/Board/STK526/Dataflash.h
+++ b/LUFA/Drivers/Board/STK526/Dataflash.h
@@ -52,7 +52,7 @@
 #define __DATAFLASH_STK526_H__
 
 	/* Includes: */
-		#include "AT45DB642D.h"
+		#include "../../Misc/AT45DB642D.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/USBKEY/AT45DB642D.h b/LUFA/Drivers/Board/USBKEY/AT45DB642D.h
deleted file mode 100644
index f09a7b533..000000000
--- a/LUFA/Drivers/Board/USBKEY/AT45DB642D.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel USBKEY.
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel USBKEY.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash_USBKEY
- *  \defgroup Group_Dataflash_USBKEY_AT45DB642D AT45DB642D
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel USBKEY.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_CMDS_H__
-#define __DATAFLASH_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			//@{
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			#define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
-			//@}
-
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-			/** \name Dataflash Commands */
-			//@{
-			#define DF_CMD_GETSTATUS                        0xD7
-			#define DF_CMD_POWERDOWN                        0xB9
-			#define DF_CMD_WAKEUP                           0xAB
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0x03
-			#define DF_CMD_BUFF1READ_LF                     0xD1
-			#define DF_CMD_BUFF2READ_LF                     0xD3
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-			#define DF_CMD_SECTORERASE                      0x7C
-
-			#define DF_CMD_CHIPERASE                        ((char[]){0xC7, 0x94, 0x80, 0x9A})
-			#define DF_CMD_CHIPERASE_BYTE1                  0xC7
-			#define DF_CMD_CHIPERASE_BYTE2                  0x94
-			#define DF_CMD_CHIPERASE_BYTE3                  0x80
-			#define DF_CMD_CHIPERASE_BYTE4                  0x9A
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0x9A})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0x9A
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			//@}
-
-#endif
-
-/** @} */
-
diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/USBKEY/Dataflash.h
index 892cfcfe3..26711178f 100644
--- a/LUFA/Drivers/Board/USBKEY/Dataflash.h
+++ b/LUFA/Drivers/Board/USBKEY/Dataflash.h
@@ -52,7 +52,7 @@
 #define __DATAFLASH_USBKEY_H__
 
 	/* Includes: */
-		#include "AT45DB642D.h"
+		#include "../../Misc/AT45DB642D.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
index 065145280..d5c7527a1 100644
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
@@ -52,7 +52,7 @@
 #define __DATAFLASH_XPLAIN_H__
 
 	/* Includes: */
-		#include "AT45DB642D.h"
+		#include "../../Misc/AT45DB642D.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/EVK527/AT45DB321C.h b/LUFA/Drivers/Misc/AT45DB321C.h
index 8d36ae3f4..e2b4fd2c4 100644
--- a/LUFA/Drivers/Board/EVK527/AT45DB321C.h
+++ b/LUFA/Drivers/Misc/AT45DB321C.h
@@ -1,105 +1,99 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel EVK527.
- *
- *  Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel EVK527.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash_EVK527
- *  \defgroup Group_Dataflash_EVK527_AT45DB321C AT45DB321C
- *
- *  Board specific Dataflash commands header for the AT45DB321C as mounted on the Atmel EVK527.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_CMDS_H__
-#define __DATAFLASH_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			//@{
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			//@}
-
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-			/** \name Dataflash Commands */
-			//@{
-			#define DF_CMD_GETSTATUS                        0xD7
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0xE8
-			#define DF_CMD_BUFF1READ_LF                     0xD4
-			#define DF_CMD_BUFF2READ_LF                     0xD6
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0xCF})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0xCF
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			//@}
-
-#endif
-
-/** @} */
-
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2011.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+*/

+

+/*

+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, distribute, and sell this

+  software and its documentation for any purpose is hereby granted

+  without fee, provided that the above copyright notice appear in

+  all copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *  \brief Dataflash command constants for the the Atmel AT45DB321C Dataflash IC

+ *

+ *  Dataflash command constants for the Atmel AT45DB321C Dataflash IC.

+ */

+

+/** \ingroup Group_AT45DB321C

+ *  \defgroup Group_AT45DB321C AT45DB321C Commands

+ *

+ *  Dataflash command constants for the Atmel AT45DB321C Dataflash IC.

+ *

+ *  @{

+ */

+

+#ifndef __AT45DB321C_CMDS_H__

+#define __AT45DB321C_CMDS_H__

+

+	/* Public Interface - May be used in end-application: */

+		/* Macros: */

+			/** \name Dataflash Status Values */

+			//@{

+			#define DF_STATUS_READY                         (1 << 7)

+			#define DF_STATUS_COMPMISMATCH                  (1 << 6)

+			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)

+			//@}

+

+			#define DF_MANUFACTURER_ATMEL                   0x1F

+

+			/** \name Dataflash Commands */

+			//@{

+			#define DF_CMD_GETSTATUS                        0xD7

+

+			#define DF_CMD_MAINMEMTOBUFF1                   0x53

+			#define DF_CMD_MAINMEMTOBUFF2                   0x55

+			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60

+			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61

+			#define DF_CMD_AUTOREWRITEBUFF1                 0x58

+			#define DF_CMD_AUTOREWRITEBUFF2                 0x59

+

+			#define DF_CMD_MAINMEMPAGEREAD                  0xD2

+			#define DF_CMD_CONTARRAYREAD_LF                 0xE8

+			#define DF_CMD_BUFF1READ_LF                     0xD4

+			#define DF_CMD_BUFF2READ_LF                     0xD6

+

+			#define DF_CMD_BUFF1WRITE                       0x84

+			#define DF_CMD_BUFF2WRITE                       0x87

+			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83

+			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86

+			#define DF_CMD_BUFF1TOMAINMEM                   0x88

+			#define DF_CMD_BUFF2TOMAINMEM                   0x89

+			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82

+			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85

+

+			#define DF_CMD_PAGEERASE                        0x81

+			#define DF_CMD_BLOCKERASE                       0x50

+

+			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0xCF})

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0xCF

+

+			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F

+			//@}

+

+#endif

+

+/** @} */

+

diff --git a/LUFA/Drivers/Board/XPLAIN/AT45DB642D.h b/LUFA/Drivers/Misc/AT45DB642D.h
index 0fbb380a2..5984fc4ea 100644
--- a/LUFA/Drivers/Board/XPLAIN/AT45DB642D.h
+++ b/LUFA/Drivers/Misc/AT45DB642D.h
@@ -1,115 +1,109 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2011.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *  \brief Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel XPLAIN.
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel XPLAIN.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash_XPLAIN
- *  \defgroup Group_Dataflash_XPLAIN_AT45DB642D AT45DB642D
- *
- *  Board specific Dataflash commands header for the AT45DB642D as mounted on the Atmel XPLAIN.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_CMDS_H__
-#define __DATAFLASH_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			//@{
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			#define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
-			//@}
-
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-			/** \name Dataflash Commands */
-			//@{
-			#define DF_CMD_GETSTATUS                        0xD7
-			#define DF_CMD_POWERDOWN                        0xB9
-			#define DF_CMD_WAKEUP                           0xAB
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0x03
-			#define DF_CMD_BUFF1READ_LF                     0xD1
-			#define DF_CMD_BUFF2READ_LF                     0xD3
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-			#define DF_CMD_SECTORERASE                      0x7C
-
-			#define DF_CMD_CHIPERASE                        ((char[]){0xC7, 0x94, 0x80, 0x9A})
-			#define DF_CMD_CHIPERASE_BYTE1                  0xC7
-			#define DF_CMD_CHIPERASE_BYTE2                  0x94
-			#define DF_CMD_CHIPERASE_BYTE3                  0x80
-			#define DF_CMD_CHIPERASE_BYTE4                  0x9A
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0x9A})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0x9A
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			//@}
-
-#endif
-
-/** @} */
-
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2011.

+

+  dean [at] fourwalledcubicle [dot] com

+           www.lufa-lib.org

+*/

+

+/*

+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

+

+  Permission to use, copy, modify, distribute, and sell this

+  software and its documentation for any purpose is hereby granted

+  without fee, provided that the above copyright notice appear in

+  all copies and that both that the copyright notice and this

+  permission notice and warranty disclaimer appear in supporting

+  documentation, and that the name of the author not be used in

+  advertising or publicity pertaining to distribution of the

+  software without specific, written prior permission.

+

+  The author disclaim all warranties with regard to this

+  software, including all implied warranties of merchantability

+  and fitness.  In no event shall the author be liable for any

+  special, indirect or consequential damages or any damages

+  whatsoever resulting from loss of use, data or profits, whether

+  in an action of contract, negligence or other tortious action,

+  arising out of or in connection with the use or performance of

+  this software.

+*/

+

+/** \file

+ *  \brief Dataflash command constants for the the Atmel AT45DB642D Dataflash IC

+ *

+ *  Dataflash command constants for the Atmel AT45DB642D Dataflash IC.

+ */

+

+/** \ingroup Group_AT45DB642D

+ *  \defgroup Group_AT45DB642D AT45DB642D Commands

+ *

+ *  Dataflash command constants for the Atmel AT45DB642D Dataflash IC.

+ *

+ *  @{

+ */

+

+#ifndef __AT45DB642D_CMDS_H__

+#define __AT45DB642D_CMDS_H__

+

+	/* Public Interface - May be used in end-application: */

+		/* Macros: */

+			/** \name Dataflash Status Values */

+			//@{

+			#define DF_STATUS_READY                         (1 << 7)

+			#define DF_STATUS_COMPMISMATCH                  (1 << 6)

+			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)

+			#define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)

+			//@}

+

+			#define DF_MANUFACTURER_ATMEL                   0x1F

+

+			/** \name Dataflash Commands */

+			//@{

+			#define DF_CMD_GETSTATUS                        0xD7

+			#define DF_CMD_POWERDOWN                        0xB9

+			#define DF_CMD_WAKEUP                           0xAB

+

+			#define DF_CMD_MAINMEMTOBUFF1                   0x53

+			#define DF_CMD_MAINMEMTOBUFF2                   0x55

+			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60

+			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61

+			#define DF_CMD_AUTOREWRITEBUFF1                 0x58

+			#define DF_CMD_AUTOREWRITEBUFF2                 0x59

+

+			#define DF_CMD_MAINMEMPAGEREAD                  0xD2

+			#define DF_CMD_CONTARRAYREAD_LF                 0x03

+			#define DF_CMD_BUFF1READ_LF                     0xD1

+			#define DF_CMD_BUFF2READ_LF                     0xD3

+

+			#define DF_CMD_BUFF1WRITE                       0x84

+			#define DF_CMD_BUFF2WRITE                       0x87

+			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83

+			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86

+			#define DF_CMD_BUFF1TOMAINMEM                   0x88

+			#define DF_CMD_BUFF2TOMAINMEM                   0x89

+			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82

+			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85

+

+			#define DF_CMD_PAGEERASE                        0x81

+			#define DF_CMD_BLOCKERASE                       0x50

+			#define DF_CMD_SECTORERASE                      0x7C

+

+			#define DF_CMD_CHIPERASE                        ((char[]){0xC7, 0x94, 0x80, 0x9A})

+			#define DF_CMD_CHIPERASE_BYTE1                  0xC7

+			#define DF_CMD_CHIPERASE_BYTE2                  0x94

+			#define DF_CMD_CHIPERASE_BYTE3                  0x80

+			#define DF_CMD_CHIPERASE_BYTE4                  0x9A

+

+			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0x9A})

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F

+			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0x9A

+

+			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F

+			//@}

+

+#endif

+

+/** @} */

+