Move DHCP negotiation timer into the DHCP connection application state structure...

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

diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
index d793d30..a0e09c7 100644 (file)
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
@@ -39,6 +39,11 @@
 /** \ingroup Group_Dataflash\r
  *  @defgroup Group_Dataflash_XPLAIN XPLAIN\r
  *\r
 /** \ingroup Group_Dataflash\r
  *  @defgroup Group_Dataflash_XPLAIN XPLAIN\r
  *\r

+ *  Board specific Dataflash driver header for the XPLAIN.\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 "AT45DB642D.h"\r
 \r
        /* Preprocessor Checks: */\r
                #include "AT45DB642D.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


@@ -70,9 +75,9 @@
                        #define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK\r
 \r
                        /** Mask for the first dataflash chip selected. */\r
                        #define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK\r
 \r
                        /** Mask for the first dataflash chip selected. */\r

-                       #define DATAFLASH_CHIP1                      (1 << 5)\r
+                       #define DATAFLASH_CHIP1                      0\r

 \r
 \r

-                       #if BOAD == XPLAIN_REV1\r
+                       #if (BOARD == BOARD_XPLAIN_REV1)\r

                                #define DATAFLASH_PAGE_SIZE              256\r
 \r
                                #define DATAFLASH_PAGES                  2048                                                   \r
                                #define DATAFLASH_PAGE_SIZE              256\r
 \r
                                #define DATAFLASH_PAGES                  2048                                                   \r


@@ -111,9 +116,7 @@
                         *  \param[in] BufferByte   Address within the dataflash's buffer\r
                         */\r
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)\r
                         *  \param[in] BufferByte   Address within the dataflash's buffer\r
                         */\r
                        static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)\r

-                       {       \r
-                               PageAddress >>= 1;\r
-                               \r
+                       {\r

                                Dataflash_SendByte(PageAddress >> 5);\r
                                Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));\r
                                Dataflash_SendByte(BufferByte);\r
                                Dataflash_SendByte(PageAddress >> 5);\r
                                Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));\r
                                Dataflash_SendByte(BufferByte);\r