Added reliability patches to the AVRISP-MKII Clone project's ISP and PDI/TPI protocol...

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

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 4ed77a3..ff71e6f 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -66,7 +66,7 @@
  *  application.
  *
  *  \code
  *  application.
  *
  *  \code

- *      // Initialise the SPI and board Dataflash drivers before first use
+ *      // Initialize the SPI and board Dataflash drivers before first use

  *      SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |
  *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
  *      Dataflash_Init();
  *      SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |
  *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
  *      Dataflash_Init();


@@ -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"


@@ -149,7 +146,7 @@
                        #define DATAFLASH_CHIP_MASK(index)      __GET_DATAFLASH_MASK(index)
 
                /* Inline Functions: */
                        #define DATAFLASH_CHIP_MASK(index)      __GET_DATAFLASH_MASK(index)
 
                /* Inline Functions: */

-                       /** Initialises the dataflash driver so that commands and data may be sent to an attached dataflash IC.
+                       /** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.

                         *
                         *  \note The microcontroller's SPI driver must be initialized before any of the dataflash commands are used.
                         */
                         *
                         *  \note The microcontroller's SPI driver must be initialized before any of the dataflash commands are used.
                         */


@@ -179,7 +176,7 @@
                         *  are deselected.
                         *
                         *  \param[in] PageAddress  Address of the page to manipulate, ranging from
                         *  are deselected.
                         *
                         *  \param[in] PageAddress  Address of the page to manipulate, ranging from

-                        *                          ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
+                        *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).

                         */
                        static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress);
 
                         */
                        static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress);
 


@@ -194,7 +191,7 @@
                        static inline void Dataflash_WaitWhileBusy(void);
 
                        /** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
                        static inline void Dataflash_WaitWhileBusy(void);
 
                        /** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with

-                        *  dataflash commands which require a complete 24-byte address.
+                        *  dataflash commands which require a complete 24-bit address.

                         *
                         *  \param[in] PageAddress  Page address within the selected dataflash IC
                         *  \param[in] BufferByte   Address within the dataflash's buffer
                         *
                         *  \param[in] PageAddress  Page address within the selected dataflash IC
                         *  \param[in] BufferByte   Address within the dataflash's buffer


@@ -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