More AVR32 achitecture ports.

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

diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/STK525/Dataflash.h
index ad6875a..f541edb 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/STK525/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


@@ -39,6 +39,11 @@
 /** \ingroup Group_Dataflash\r
  *  @defgroup Group_Dataflash_STK525 STK525\r
  *\r
 /** \ingroup Group_Dataflash\r
  *  @defgroup Group_Dataflash_STK525 STK525\r
  *\r

+ *  Board specific Dataflash driver header for the STK525.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver\r
+ *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
+ *\r

  *  @{\r
  */\r
 \r
  *  @{\r
  */\r
 \r


@@ -49,7 +54,7 @@
                #include "AT45DB321C.h"         \r
 \r
        /* Preprocessor Checks: */\r
                #include "AT45DB321C.h"         \r
 \r
        /* Preprocessor Checks: */\r

-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r

                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
 \r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
 \r


@@ -106,8 +111,8 @@
                         */\r
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)\r
                        {       \r
                         */\r
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)\r
                        {       \r

-                               Dataflash_SendByte(PageAddress >> 5);\r
-                               Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));\r
+                               Dataflash_SendByte(PageAddress >> 6);\r
+                               Dataflash_SendByte((PageAddress << 2) | (BufferByte >> 8));\r

                                Dataflash_SendByte(BufferByte);\r
                        }\r
                        \r
                                Dataflash_SendByte(BufferByte);\r
                        }\r
                        \r