Revert changes made for the partial port to the AVR32 architecture.

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

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index dfd8cd6..762142c 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -127,7 +127,7 @@
                        static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)\r
                        {\r
                        static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)\r
                        {\r

-                               return SPI_Transfer(Byte);\r
+                               return SPI_TransferByte(Byte);\r

                        }\r
 \r
                        /** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.\r
                        }\r
 \r
                        /** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.\r


@@ -137,7 +137,7 @@
                        static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Dataflash_SendByte(const uint8_t Byte)\r
                        {\r
                        static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Dataflash_SendByte(const uint8_t Byte)\r
                        {\r

-                               SPI_Send(Byte);\r
+                               SPI_SendByte(Byte);\r

                        }\r
                        \r
                        /** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.\r
                        }\r
                        \r
                        /** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.\r


@@ -147,7 +147,7 @@
                        static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;\r
                        static inline uint8_t Dataflash_ReceiveByte(void)\r
                        {\r
                        static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;\r
                        static inline uint8_t Dataflash_ReceiveByte(void)\r
                        {\r

-                               return SPI_Receive();\r
+                               return SPI_ReceiveByte();\r

                        }\r
 \r
                /* Includes: */\r
                        }\r
 \r
                /* Includes: */\r


@@ -167,8 +167,6 @@
                                #include "EVK527/Dataflash.h"\r
                        #elif (BOARD == BOARD_USER)\r
                                #include "Board/Dataflash.h"\r
                                #include "EVK527/Dataflash.h"\r
                        #elif (BOARD == BOARD_USER)\r
                                #include "Board/Dataflash.h"\r

-                       #elif (BOARD = BOARD_EVK1101)\r
-                               #include "EVK1101/Dataflash.h"\r

                        #else\r
                                #error The selected board does not contain a dataflash IC.\r
                        #endif\r
                        #else\r
                                #error The selected board does not contain a dataflash IC.\r
                        #endif\r